http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java index 3ee05a2..8575f30 100644 --- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java +++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/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.core.tabletserver.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"); @@ -69,15 +42,12 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca private static final org.apache.thrift.protocol.TField SCAN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("scanId", org.apache.thrift.protocol.TType.I64, (short)14); private static final org.apache.thrift.protocol.TField CLASS_LOADER_CONTEXT_FIELD_DESC = new org.apache.thrift.protocol.TField("classLoaderContext", org.apache.thrift.protocol.TType.STRING, (short)15); - 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 tableId; // required + public java.lang.String client; // required + public java.lang.String user; // required + public java.lang.String tableId; // required public long age; // required public long idleTime; // required /** @@ -91,12 +61,12 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca */ public ScanState state; // required public org.apache.accumulo.core.data.thrift.TKeyExtent extent; // required - public List<org.apache.accumulo.core.data.thrift.TColumn> columns; // required - public List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList; // required - public Map<String,Map<String,String>> ssio; // required - public List<ByteBuffer> authorizations; // required + public java.util.List<org.apache.accumulo.core.data.thrift.TColumn> columns; // required + public java.util.List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList; // required + public java.util.Map<java.lang.String,java.util.Map<java.lang.String,java.lang.String>> ssio; // required + public java.util.List<java.nio.ByteBuffer> authorizations; // required public long scanId; // optional - public String classLoaderContext; // required + public java.lang.String classLoaderContext; // 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 { @@ -123,10 +93,10 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca SCAN_ID((short)14, "scanId"), CLASS_LOADER_CONTEXT((short)15, "classLoaderContext"); - 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); } } @@ -175,21 +145,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; } @@ -198,7 +168,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -209,9 +179,9 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca private static final int __SCANID_ISSET_ID = 2; private byte __isset_bitfield = 0; private static final _Fields optionals[] = {_Fields.SCAN_ID}; - 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, @@ -247,7 +217,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.CLASS_LOADER_CONTEXT, new org.apache.thrift.meta_data.FieldMetaData("classLoaderContext", 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(ActiveScan.class, metaDataMap); } @@ -255,19 +225,19 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca } public ActiveScan( - String client, - String user, - String tableId, + java.lang.String client, + java.lang.String user, + java.lang.String tableId, long age, long idleTime, ScanType type, ScanState state, org.apache.accumulo.core.data.thrift.TKeyExtent extent, - List<org.apache.accumulo.core.data.thrift.TColumn> columns, - List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList, - Map<String,Map<String,String>> ssio, - List<ByteBuffer> authorizations, - String classLoaderContext) + java.util.List<org.apache.accumulo.core.data.thrift.TColumn> columns, + java.util.List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList, + java.util.Map<java.lang.String,java.util.Map<java.lang.String,java.lang.String>> ssio, + java.util.List<java.nio.ByteBuffer> authorizations, + java.lang.String classLoaderContext) { this(); this.client = client; @@ -313,36 +283,36 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca this.extent = new org.apache.accumulo.core.data.thrift.TKeyExtent(other.extent); } if (other.isSetColumns()) { - List<org.apache.accumulo.core.data.thrift.TColumn> __this__columns = new ArrayList<org.apache.accumulo.core.data.thrift.TColumn>(other.columns.size()); + java.util.List<org.apache.accumulo.core.data.thrift.TColumn> __this__columns = new java.util.ArrayList<org.apache.accumulo.core.data.thrift.TColumn>(other.columns.size()); for (org.apache.accumulo.core.data.thrift.TColumn other_element : other.columns) { __this__columns.add(new org.apache.accumulo.core.data.thrift.TColumn(other_element)); } this.columns = __this__columns; } if (other.isSetSsiList()) { - List<org.apache.accumulo.core.data.thrift.IterInfo> __this__ssiList = new ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(other.ssiList.size()); + java.util.List<org.apache.accumulo.core.data.thrift.IterInfo> __this__ssiList = new java.util.ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(other.ssiList.size()); for (org.apache.accumulo.core.data.thrift.IterInfo other_element : other.ssiList) { __this__ssiList.add(new org.apache.accumulo.core.data.thrift.IterInfo(other_element)); } this.ssiList = __this__ssiList; } if (other.isSetSsio()) { - Map<String,Map<String,String>> __this__ssio = new HashMap<String,Map<String,String>>(other.ssio.size()); - for (Map.Entry<String, Map<String,String>> other_element : other.ssio.entrySet()) { + java.util.Map<java.lang.String,java.util.Map<java.lang.String,java.lang.String>> __this__ssio = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.String>>(other.ssio.size()); + for (java.util.Map.Entry<java.lang.String, java.util.Map<java.lang.String,java.lang.String>> other_element : other.ssio.entrySet()) { - String other_element_key = other_element.getKey(); - Map<String,String> other_element_value = other_element.getValue(); + java.lang.String other_element_key = other_element.getKey(); + java.util.Map<java.lang.String,java.lang.String> other_element_value = other_element.getValue(); - String __this__ssio_copy_key = other_element_key; + java.lang.String __this__ssio_copy_key = other_element_key; - Map<String,String> __this__ssio_copy_value = new HashMap<String,String>(other_element_value); + java.util.Map<java.lang.String,java.lang.String> __this__ssio_copy_value = new java.util.HashMap<java.lang.String,java.lang.String>(other_element_value); __this__ssio.put(__this__ssio_copy_key, __this__ssio_copy_value); } this.ssio = __this__ssio; } 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; } this.scanId = other.scanId; @@ -376,11 +346,11 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca this.classLoaderContext = 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; } @@ -400,11 +370,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; } @@ -424,11 +394,11 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca } } - public String getTableId() { + public java.lang.String getTableId() { return this.tableId; } - public ActiveScan setTableId(String tableId) { + public ActiveScan setTableId(java.lang.String tableId) { this.tableId = tableId; return this; } @@ -459,16 +429,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() { @@ -482,16 +452,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); } /** @@ -592,16 +562,16 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca public void addToColumns(org.apache.accumulo.core.data.thrift.TColumn elem) { if (this.columns == null) { - this.columns = new ArrayList<org.apache.accumulo.core.data.thrift.TColumn>(); + this.columns = new java.util.ArrayList<org.apache.accumulo.core.data.thrift.TColumn>(); } this.columns.add(elem); } - public List<org.apache.accumulo.core.data.thrift.TColumn> getColumns() { + public java.util.List<org.apache.accumulo.core.data.thrift.TColumn> getColumns() { return this.columns; } - public ActiveScan setColumns(List<org.apache.accumulo.core.data.thrift.TColumn> columns) { + public ActiveScan setColumns(java.util.List<org.apache.accumulo.core.data.thrift.TColumn> columns) { this.columns = columns; return this; } @@ -631,16 +601,16 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca public void addToSsiList(org.apache.accumulo.core.data.thrift.IterInfo elem) { if (this.ssiList == null) { - this.ssiList = new ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(); + this.ssiList = new java.util.ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(); } this.ssiList.add(elem); } - public List<org.apache.accumulo.core.data.thrift.IterInfo> getSsiList() { + public java.util.List<org.apache.accumulo.core.data.thrift.IterInfo> getSsiList() { return this.ssiList; } - public ActiveScan setSsiList(List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList) { + public ActiveScan setSsiList(java.util.List<org.apache.accumulo.core.data.thrift.IterInfo> ssiList) { this.ssiList = ssiList; return this; } @@ -664,18 +634,18 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca return (this.ssio == null) ? 0 : this.ssio.size(); } - public void putToSsio(String key, Map<String,String> val) { + public void putToSsio(java.lang.String key, java.util.Map<java.lang.String,java.lang.String> val) { if (this.ssio == null) { - this.ssio = new HashMap<String,Map<String,String>>(); + this.ssio = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.String>>(); } this.ssio.put(key, val); } - public Map<String,Map<String,String>> getSsio() { + public java.util.Map<java.lang.String,java.util.Map<java.lang.String,java.lang.String>> getSsio() { return this.ssio; } - public ActiveScan setSsio(Map<String,Map<String,String>> ssio) { + public ActiveScan setSsio(java.util.Map<java.lang.String,java.util.Map<java.lang.String,java.lang.String>> ssio) { this.ssio = ssio; return this; } @@ -699,22 +669,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; } @@ -745,23 +715,23 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca } public void unsetScanId() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SCANID_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SCANID_ISSET_ID); } /** Returns true if field scanId is set (has been assigned a value) and false otherwise */ public boolean isSetScanId() { - return EncodingUtils.testBit(__isset_bitfield, __SCANID_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SCANID_ISSET_ID); } public void setScanIdIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SCANID_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SCANID_ISSET_ID, value); } - public String getClassLoaderContext() { + public java.lang.String getClassLoaderContext() { return this.classLoaderContext; } - public ActiveScan setClassLoaderContext(String classLoaderContext) { + public ActiveScan setClassLoaderContext(java.lang.String classLoaderContext) { this.classLoaderContext = classLoaderContext; return this; } @@ -781,13 +751,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; @@ -795,7 +765,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; @@ -803,7 +773,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca if (value == null) { unsetTableId(); } else { - setTableId((String)value); + setTableId((java.lang.String)value); } break; @@ -811,7 +781,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; @@ -819,7 +789,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; @@ -851,7 +821,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca if (value == null) { unsetColumns(); } else { - setColumns((List<org.apache.accumulo.core.data.thrift.TColumn>)value); + setColumns((java.util.List<org.apache.accumulo.core.data.thrift.TColumn>)value); } break; @@ -859,7 +829,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca if (value == null) { unsetSsiList(); } else { - setSsiList((List<org.apache.accumulo.core.data.thrift.IterInfo>)value); + setSsiList((java.util.List<org.apache.accumulo.core.data.thrift.IterInfo>)value); } break; @@ -867,7 +837,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca if (value == null) { unsetSsio(); } else { - setSsio((Map<String,Map<String,String>>)value); + setSsio((java.util.Map<java.lang.String,java.util.Map<java.lang.String,java.lang.String>>)value); } break; @@ -875,7 +845,7 @@ 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; @@ -883,7 +853,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca if (value == null) { unsetScanId(); } else { - setScanId((Long)value); + setScanId((java.lang.Long)value); } break; @@ -891,14 +861,14 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca if (value == null) { unsetClassLoaderContext(); } else { - setClassLoaderContext((String)value); + setClassLoaderContext((java.lang.String)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case CLIENT: return getClient(); @@ -943,13 +913,13 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca return getClassLoaderContext(); } - 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) { @@ -982,11 +952,11 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca case CLASS_LOADER_CONTEXT: return isSetClassLoaderContext(); } - 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) @@ -997,6 +967,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(); @@ -1129,79 +1101,61 @@ 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_tableId = true && (isSetTableId()); - list.add(present_tableId); - if (present_tableId) - list.add(tableId); - - 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_ssiList = true && (isSetSsiList()); - list.add(present_ssiList); - if (present_ssiList) - list.add(ssiList); - - boolean present_ssio = true && (isSetSsio()); - list.add(present_ssio); - if (present_ssio) - list.add(ssio); - - boolean present_authorizations = true && (isSetAuthorizations()); - list.add(present_authorizations); - if (present_authorizations) - list.add(authorizations); - - boolean present_scanId = true && (isSetScanId()); - list.add(present_scanId); - if (present_scanId) - list.add(scanId); - - boolean present_classLoaderContext = true && (isSetClassLoaderContext()); - list.add(present_classLoaderContext); - if (present_classLoaderContext) - list.add(classLoaderContext); - - 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 + ((isSetTableId()) ? 131071 : 524287); + if (isSetTableId()) + hashCode = hashCode * 8191 + tableId.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 + ((isSetSsiList()) ? 131071 : 524287); + if (isSetSsiList()) + hashCode = hashCode * 8191 + ssiList.hashCode(); + + hashCode = hashCode * 8191 + ((isSetSsio()) ? 131071 : 524287); + if (isSetSsio()) + hashCode = hashCode * 8191 + ssio.hashCode(); + + hashCode = hashCode * 8191 + ((isSetAuthorizations()) ? 131071 : 524287); + if (isSetAuthorizations()) + hashCode = hashCode * 8191 + authorizations.hashCode(); + + hashCode = hashCode * 8191 + ((isSetScanId()) ? 131071 : 524287); + if (isSetScanId()) + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(scanId); + + hashCode = hashCode * 8191 + ((isSetClassLoaderContext()) ? 131071 : 524287); + if (isSetClassLoaderContext()) + hashCode = hashCode * 8191 + classLoaderContext.hashCode(); + + return hashCode; } @Override @@ -1212,7 +1166,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; } @@ -1222,7 +1176,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; } @@ -1232,7 +1186,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca return lastComparison; } } - lastComparison = Boolean.valueOf(isSetTableId()).compareTo(other.isSetTableId()); + lastComparison = java.lang.Boolean.valueOf(isSetTableId()).compareTo(other.isSetTableId()); if (lastComparison != 0) { return lastComparison; } @@ -1242,7 +1196,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; } @@ -1252,7 +1206,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; } @@ -1262,7 +1216,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; } @@ -1272,7 +1226,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; } @@ -1282,7 +1236,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; } @@ -1292,7 +1246,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; } @@ -1302,7 +1256,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca return lastComparison; } } - lastComparison = Boolean.valueOf(isSetSsiList()).compareTo(other.isSetSsiList()); + lastComparison = java.lang.Boolean.valueOf(isSetSsiList()).compareTo(other.isSetSsiList()); if (lastComparison != 0) { return lastComparison; } @@ -1312,7 +1266,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca return lastComparison; } } - lastComparison = Boolean.valueOf(isSetSsio()).compareTo(other.isSetSsio()); + lastComparison = java.lang.Boolean.valueOf(isSetSsio()).compareTo(other.isSetSsio()); if (lastComparison != 0) { return lastComparison; } @@ -1322,7 +1276,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; } @@ -1332,7 +1286,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca return lastComparison; } } - lastComparison = Boolean.valueOf(isSetScanId()).compareTo(other.isSetScanId()); + lastComparison = java.lang.Boolean.valueOf(isSetScanId()).compareTo(other.isSetScanId()); if (lastComparison != 0) { return lastComparison; } @@ -1342,7 +1296,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca return lastComparison; } } - lastComparison = Boolean.valueOf(isSetClassLoaderContext()).compareTo(other.isSetClassLoaderContext()); + lastComparison = java.lang.Boolean.valueOf(isSetClassLoaderContext()).compareTo(other.isSetClassLoaderContext()); if (lastComparison != 0) { return lastComparison; } @@ -1360,16 +1314,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:"); @@ -1493,7 +1447,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; @@ -1503,13 +1457,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; @@ -1590,7 +1544,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 _list8 = iprot.readListBegin(); - struct.columns = new ArrayList<org.apache.accumulo.core.data.thrift.TColumn>(_list8.size); + struct.columns = new java.util.ArrayList<org.apache.accumulo.core.data.thrift.TColumn>(_list8.size); org.apache.accumulo.core.data.thrift.TColumn _elem9; for (int _i10 = 0; _i10 < _list8.size; ++_i10) { @@ -1609,7 +1563,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 _list11 = iprot.readListBegin(); - struct.ssiList = new ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(_list11.size); + struct.ssiList = new java.util.ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(_list11.size); org.apache.accumulo.core.data.thrift.IterInfo _elem12; for (int _i13 = 0; _i13 < _list11.size; ++_i13) { @@ -1628,17 +1582,17 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { org.apache.thrift.protocol.TMap _map14 = iprot.readMapBegin(); - struct.ssio = new HashMap<String,Map<String,String>>(2*_map14.size); - String _key15; - Map<String,String> _val16; + struct.ssio = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.String>>(2*_map14.size); + java.lang.String _key15; + java.util.Map<java.lang.String,java.lang.String> _val16; for (int _i17 = 0; _i17 < _map14.size; ++_i17) { _key15 = iprot.readString(); { org.apache.thrift.protocol.TMap _map18 = iprot.readMapBegin(); - _val16 = new HashMap<String,String>(2*_map18.size); - String _key19; - String _val20; + _val16 = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map18.size); + java.lang.String _key19; + java.lang.String _val20; for (int _i21 = 0; _i21 < _map18.size; ++_i21) { _key19 = iprot.readString(); @@ -1660,8 +1614,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 _list22 = iprot.readListBegin(); - struct.authorizations = new ArrayList<ByteBuffer>(_list22.size); - ByteBuffer _elem23; + struct.authorizations = new java.util.ArrayList<java.nio.ByteBuffer>(_list22.size); + java.nio.ByteBuffer _elem23; for (int _i24 = 0; _i24 < _list22.size; ++_i24) { _elem23 = iprot.readBinary(); @@ -1769,12 +1723,12 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca oprot.writeFieldBegin(SSIO_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.ssio.size())); - for (Map.Entry<String, Map<String,String>> _iter27 : struct.ssio.entrySet()) + for (java.util.Map.Entry<java.lang.String, java.util.Map<java.lang.String,java.lang.String>> _iter27 : struct.ssio.entrySet()) { oprot.writeString(_iter27.getKey()); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, _iter27.getValue().size())); - for (Map.Entry<String, String> _iter28 : _iter27.getValue().entrySet()) + for (java.util.Map.Entry<java.lang.String, java.lang.String> _iter28 : _iter27.getValue().entrySet()) { oprot.writeString(_iter28.getKey()); oprot.writeString(_iter28.getValue()); @@ -1790,7 +1744,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 _iter29 : struct.authorizations) + for (java.nio.ByteBuffer _iter29 : struct.authorizations) { oprot.writeBinary(_iter29); } @@ -1814,18 +1768,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); } @@ -1914,12 +1868,12 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca if (struct.isSetSsio()) { { oprot.writeI32(struct.ssio.size()); - for (Map.Entry<String, Map<String,String>> _iter32 : struct.ssio.entrySet()) + for (java.util.Map.Entry<java.lang.String, java.util.Map<java.lang.String,java.lang.String>> _iter32 : struct.ssio.entrySet()) { oprot.writeString(_iter32.getKey()); { oprot.writeI32(_iter32.getValue().size()); - for (Map.Entry<String, String> _iter33 : _iter32.getValue().entrySet()) + for (java.util.Map.Entry<java.lang.String, java.lang.String> _iter33 : _iter32.getValue().entrySet()) { oprot.writeString(_iter33.getKey()); oprot.writeString(_iter33.getValue()); @@ -1931,7 +1885,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca if (struct.isSetAuthorizations()) { { oprot.writeI32(struct.authorizations.size()); - for (ByteBuffer _iter34 : struct.authorizations) + for (java.nio.ByteBuffer _iter34 : struct.authorizations) { oprot.writeBinary(_iter34); } @@ -1947,8 +1901,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(14); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(14); if (incoming.get(0)) { struct.client = iprot.readString(); struct.setClientIsSet(true); @@ -1985,7 +1939,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca if (incoming.get(8)) { { org.apache.thrift.protocol.TList _list35 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.columns = new ArrayList<org.apache.accumulo.core.data.thrift.TColumn>(_list35.size); + struct.columns = new java.util.ArrayList<org.apache.accumulo.core.data.thrift.TColumn>(_list35.size); org.apache.accumulo.core.data.thrift.TColumn _elem36; for (int _i37 = 0; _i37 < _list35.size; ++_i37) { @@ -1999,7 +1953,7 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca if (incoming.get(9)) { { org.apache.thrift.protocol.TList _list38 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.ssiList = new ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(_list38.size); + struct.ssiList = new java.util.ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(_list38.size); org.apache.accumulo.core.data.thrift.IterInfo _elem39; for (int _i40 = 0; _i40 < _list38.size; ++_i40) { @@ -2013,17 +1967,17 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca if (incoming.get(10)) { { org.apache.thrift.protocol.TMap _map41 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32()); - struct.ssio = new HashMap<String,Map<String,String>>(2*_map41.size); - String _key42; - Map<String,String> _val43; + struct.ssio = new java.util.HashMap<java.lang.String,java.util.Map<java.lang.String,java.lang.String>>(2*_map41.size); + java.lang.String _key42; + java.util.Map<java.lang.String,java.lang.String> _val43; for (int _i44 = 0; _i44 < _map41.size; ++_i44) { _key42 = iprot.readString(); { org.apache.thrift.protocol.TMap _map45 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - _val43 = new HashMap<String,String>(2*_map45.size); - String _key46; - String _val47; + _val43 = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map45.size); + java.lang.String _key46; + java.lang.String _val47; for (int _i48 = 0; _i48 < _map45.size; ++_i48) { _key46 = iprot.readString(); @@ -2039,8 +1993,8 @@ public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveSca if (incoming.get(11)) { { org.apache.thrift.protocol.TList _list49 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.authorizations = new ArrayList<ByteBuffer>(_list49.size); - ByteBuffer _elem50; + struct.authorizations = new java.util.ArrayList<java.nio.ByteBuffer>(_list49.size); + java.nio.ByteBuffer _elem50; for (int _i51 = 0; _i51 < _list49.size; ++_i51) { _elem50 = iprot.readBinary(); @@ -2060,5 +2014,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() {} }
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionReason.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionReason.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionReason.java index 387908b..5346674 100644 --- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionReason.java +++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionReason.java @@ -15,7 +15,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.10.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -23,11 +23,8 @@ package org.apache.accumulo.core.tabletserver.thrift; -import java.util.Map; -import java.util.HashMap; -import org.apache.thrift.TEnum; -@SuppressWarnings({"unused"}) public enum CompactionReason implements org.apache.thrift.TEnum { +public enum CompactionReason implements org.apache.thrift.TEnum { USER(0), SYSTEM(1), CHOP(2), http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionType.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionType.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionType.java index 9252e3d..6d420b3 100644 --- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionType.java +++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionType.java @@ -15,7 +15,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.10.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -23,11 +23,8 @@ package org.apache.accumulo.core.tabletserver.thrift; -import java.util.Map; -import java.util.HashMap; -import org.apache.thrift.TEnum; -@SuppressWarnings({"unused"}) public enum CompactionType implements org.apache.thrift.TEnum { +public enum CompactionType implements org.apache.thrift.TEnum { MINOR(0), MERGE(1), MAJOR(2), http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java index f35e187..f9081c2 100644 --- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java +++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.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.core.tabletserver.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 ConstraintViolationException extends TException implements org.apache.thrift.TBase<ConstraintViolationException, ConstraintViolationException._Fields>, java.io.Serializable, Cloneable, Comparable<ConstraintViolationException> { +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)") +public class ConstraintViolationException extends org.apache.thrift.TException implements org.apache.thrift.TBase<ConstraintViolationException, ConstraintViolationException._Fields>, java.io.Serializable, Cloneable, Comparable<ConstraintViolationException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ConstraintViolationException"); 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)1); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new ConstraintViolationExceptionStandardSchemeFactory()); - schemes.put(TupleScheme.class, new ConstraintViolationExceptionTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ConstraintViolationExceptionStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ConstraintViolationExceptionTupleSchemeFactory(); - public List<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary> violationSummaries; // required + public java.util.List<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary> violationSummaries; // 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 { VIOLATION_SUMMARIES((short)1, "violationSummaries"); - 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 ConstraintViolationException extends TException implements org.apac */ 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,19 +87,19 @@ public class ConstraintViolationException extends TException implements org.apac 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.VIOLATION_SUMMARIES, new org.apache.thrift.meta_data.FieldMetaData("violationSummaries", 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, org.apache.accumulo.core.data.thrift.TConstraintViolationSummary.class)))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ConstraintViolationException.class, metaDataMap); } @@ -137,7 +107,7 @@ public class ConstraintViolationException extends TException implements org.apac } public ConstraintViolationException( - List<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary> violationSummaries) + java.util.List<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary> violationSummaries) { this(); this.violationSummaries = violationSummaries; @@ -148,7 +118,7 @@ public class ConstraintViolationException extends TException implements org.apac */ public ConstraintViolationException(ConstraintViolationException other) { if (other.isSetViolationSummaries()) { - List<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary> __this__violationSummaries = new ArrayList<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary>(other.violationSummaries.size()); + java.util.List<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary> __this__violationSummaries = new java.util.ArrayList<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary>(other.violationSummaries.size()); for (org.apache.accumulo.core.data.thrift.TConstraintViolationSummary other_element : other.violationSummaries) { __this__violationSummaries.add(new org.apache.accumulo.core.data.thrift.TConstraintViolationSummary(other_element)); } @@ -175,16 +145,16 @@ public class ConstraintViolationException extends TException implements org.apac public void addToViolationSummaries(org.apache.accumulo.core.data.thrift.TConstraintViolationSummary elem) { if (this.violationSummaries == null) { - this.violationSummaries = new ArrayList<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary>(); + this.violationSummaries = new java.util.ArrayList<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary>(); } this.violationSummaries.add(elem); } - public List<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary> getViolationSummaries() { + public java.util.List<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary> getViolationSummaries() { return this.violationSummaries; } - public ConstraintViolationException setViolationSummaries(List<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary> violationSummaries) { + public ConstraintViolationException setViolationSummaries(java.util.List<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary> violationSummaries) { this.violationSummaries = violationSummaries; return this; } @@ -204,43 +174,43 @@ public class ConstraintViolationException extends TException implements org.apac } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case VIOLATION_SUMMARIES: if (value == null) { unsetViolationSummaries(); } else { - setViolationSummaries((List<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary>)value); + setViolationSummaries((java.util.List<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary>)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case VIOLATION_SUMMARIES: return getViolationSummaries(); } - 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 VIOLATION_SUMMARIES: return isSetViolationSummaries(); } - 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 ConstraintViolationException) @@ -251,6 +221,8 @@ public class ConstraintViolationException extends TException implements org.apac public boolean equals(ConstraintViolationException that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_violationSummaries = true && this.isSetViolationSummaries(); boolean that_present_violationSummaries = true && that.isSetViolationSummaries(); @@ -266,14 +238,13 @@ public class ConstraintViolationException extends TException implements org.apac @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - 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(); - return list.hashCode(); + return hashCode; } @Override @@ -284,7 +255,7 @@ public class ConstraintViolationException extends TException implements org.apac int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetViolationSummaries()).compareTo(other.isSetViolationSummaries()); + lastComparison = java.lang.Boolean.valueOf(isSetViolationSummaries()).compareTo(other.isSetViolationSummaries()); if (lastComparison != 0) { return lastComparison; } @@ -302,16 +273,16 @@ public class ConstraintViolationException extends TException implements org.apac } 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("ConstraintViolationException("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("ConstraintViolationException("); boolean first = true; sb.append("violationSummaries:"); @@ -338,7 +309,7 @@ public class ConstraintViolationException extends TException implements org.apac } } - 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) { @@ -346,13 +317,13 @@ public class ConstraintViolationException extends TException implements org.apac } } - private static class ConstraintViolationExceptionStandardSchemeFactory implements SchemeFactory { + private static class ConstraintViolationExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public ConstraintViolationExceptionStandardScheme getScheme() { return new ConstraintViolationExceptionStandardScheme(); } } - private static class ConstraintViolationExceptionStandardScheme extends StandardScheme<ConstraintViolationException> { + private static class ConstraintViolationExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<ConstraintViolationException> { public void read(org.apache.thrift.protocol.TProtocol iprot, ConstraintViolationException struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -368,7 +339,7 @@ public class ConstraintViolationException extends TException implements org.apac if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list0 = iprot.readListBegin(); - struct.violationSummaries = new ArrayList<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary>(_list0.size); + struct.violationSummaries = new java.util.ArrayList<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary>(_list0.size); org.apache.accumulo.core.data.thrift.TConstraintViolationSummary _elem1; for (int _i2 = 0; _i2 < _list0.size; ++_i2) { @@ -416,18 +387,18 @@ public class ConstraintViolationException extends TException implements org.apac } - private static class ConstraintViolationExceptionTupleSchemeFactory implements SchemeFactory { + private static class ConstraintViolationExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public ConstraintViolationExceptionTupleScheme getScheme() { return new ConstraintViolationExceptionTupleScheme(); } } - private static class ConstraintViolationExceptionTupleScheme extends TupleScheme<ConstraintViolationException> { + private static class ConstraintViolationExceptionTupleScheme extends org.apache.thrift.scheme.TupleScheme<ConstraintViolationException> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, ConstraintViolationException 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.isSetViolationSummaries()) { optionals.set(0); } @@ -445,12 +416,12 @@ public class ConstraintViolationException extends TException implements org.apac @Override public void read(org.apache.thrift.protocol.TProtocol prot, ConstraintViolationException 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)) { { org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.violationSummaries = new ArrayList<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary>(_list5.size); + struct.violationSummaries = new java.util.ArrayList<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary>(_list5.size); org.apache.accumulo.core.data.thrift.TConstraintViolationSummary _elem6; for (int _i7 = 0; _i7 < _list5.size; ++_i7) { @@ -464,5 +435,9 @@ public class ConstraintViolationException extends TException implements org.apac } } + 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/tabletserver/thrift/IteratorConfig.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java index 21fd63c..5eca0e9 100644 --- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java +++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.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.core.tabletserver.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 IteratorConfig implements org.apache.thrift.TBase<IteratorConfig, IteratorConfig._Fields>, java.io.Serializable, Cloneable, Comparable<IteratorConfig> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IteratorConfig"); 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)1); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new IteratorConfigStandardSchemeFactory()); - schemes.put(TupleScheme.class, new IteratorConfigTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new IteratorConfigStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new IteratorConfigTupleSchemeFactory(); - public List<TIteratorSetting> iterators; // required + public java.util.List<TIteratorSetting> 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 { ITERATORS((short)1, "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); } } @@ -94,21 +64,21 @@ public class IteratorConfig implements org.apache.thrift.TBase<IteratorConfig, I */ 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,19 +87,19 @@ public class IteratorConfig implements org.apache.thrift.TBase<IteratorConfig, I 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.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, TIteratorSetting.class)))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(IteratorConfig.class, metaDataMap); } @@ -137,7 +107,7 @@ public class IteratorConfig implements org.apache.thrift.TBase<IteratorConfig, I } public IteratorConfig( - List<TIteratorSetting> iterators) + java.util.List<TIteratorSetting> iterators) { this(); this.iterators = iterators; @@ -148,7 +118,7 @@ public class IteratorConfig implements org.apache.thrift.TBase<IteratorConfig, I */ public IteratorConfig(IteratorConfig other) { if (other.isSetIterators()) { - List<TIteratorSetting> __this__iterators = new ArrayList<TIteratorSetting>(other.iterators.size()); + java.util.List<TIteratorSetting> __this__iterators = new java.util.ArrayList<TIteratorSetting>(other.iterators.size()); for (TIteratorSetting other_element : other.iterators) { __this__iterators.add(new TIteratorSetting(other_element)); } @@ -175,16 +145,16 @@ public class IteratorConfig implements org.apache.thrift.TBase<IteratorConfig, I public void addToIterators(TIteratorSetting elem) { if (this.iterators == null) { - this.iterators = new ArrayList<TIteratorSetting>(); + this.iterators = new java.util.ArrayList<TIteratorSetting>(); } this.iterators.add(elem); } - public List<TIteratorSetting> getIterators() { + public java.util.List<TIteratorSetting> getIterators() { return this.iterators; } - public IteratorConfig setIterators(List<TIteratorSetting> iterators) { + public IteratorConfig setIterators(java.util.List<TIteratorSetting> iterators) { this.iterators = iterators; return this; } @@ -204,43 +174,43 @@ public class IteratorConfig implements org.apache.thrift.TBase<IteratorConfig, I } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case ITERATORS: if (value == null) { unsetIterators(); } else { - setIterators((List<TIteratorSetting>)value); + setIterators((java.util.List<TIteratorSetting>)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case ITERATORS: 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) { 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 IteratorConfig) @@ -251,6 +221,8 @@ public class IteratorConfig implements org.apache.thrift.TBase<IteratorConfig, I public boolean equals(IteratorConfig that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_iterators = true && this.isSetIterators(); boolean that_present_iterators = true && that.isSetIterators(); @@ -266,14 +238,13 @@ public class IteratorConfig implements org.apache.thrift.TBase<IteratorConfig, I @Override public int hashCode() { - List<Object> list = new ArrayList<Object>(); + int hashCode = 1; - 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 @@ -284,7 +255,7 @@ public class IteratorConfig implements org.apache.thrift.TBase<IteratorConfig, I int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetIterators()).compareTo(other.isSetIterators()); + lastComparison = java.lang.Boolean.valueOf(isSetIterators()).compareTo(other.isSetIterators()); if (lastComparison != 0) { return lastComparison; } @@ -302,16 +273,16 @@ public class IteratorConfig implements org.apache.thrift.TBase<IteratorConfig, I } 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("IteratorConfig("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("IteratorConfig("); boolean first = true; sb.append("iterators:"); @@ -338,7 +309,7 @@ public class IteratorConfig implements org.apache.thrift.TBase<IteratorConfig, I } } - 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) { @@ -346,13 +317,13 @@ public class IteratorConfig implements org.apache.thrift.TBase<IteratorConfig, I } } - private static class IteratorConfigStandardSchemeFactory implements SchemeFactory { + private static class IteratorConfigStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public IteratorConfigStandardScheme getScheme() { return new IteratorConfigStandardScheme(); } } - private static class IteratorConfigStandardScheme extends StandardScheme<IteratorConfig> { + private static class IteratorConfigStandardScheme extends org.apache.thrift.scheme.StandardScheme<IteratorConfig> { public void read(org.apache.thrift.protocol.TProtocol iprot, IteratorConfig struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -368,7 +339,7 @@ public class IteratorConfig implements org.apache.thrift.TBase<IteratorConfig, I if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list98 = iprot.readListBegin(); - struct.iterators = new ArrayList<TIteratorSetting>(_list98.size); + struct.iterators = new java.util.ArrayList<TIteratorSetting>(_list98.size); TIteratorSetting _elem99; for (int _i100 = 0; _i100 < _list98.size; ++_i100) { @@ -416,18 +387,18 @@ public class IteratorConfig implements org.apache.thrift.TBase<IteratorConfig, I } - private static class IteratorConfigTupleSchemeFactory implements SchemeFactory { + private static class IteratorConfigTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public IteratorConfigTupleScheme getScheme() { return new IteratorConfigTupleScheme(); } } - private static class IteratorConfigTupleScheme extends TupleScheme<IteratorConfig> { + private static class IteratorConfigTupleScheme extends org.apache.thrift.scheme.TupleScheme<IteratorConfig> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, IteratorConfig 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.isSetIterators()) { optionals.set(0); } @@ -445,12 +416,12 @@ public class IteratorConfig implements org.apache.thrift.TBase<IteratorConfig, I @Override public void read(org.apache.thrift.protocol.TProtocol prot, IteratorConfig 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)) { { org.apache.thrift.protocol.TList _list103 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.iterators = new ArrayList<TIteratorSetting>(_list103.size); + struct.iterators = new java.util.ArrayList<TIteratorSetting>(_list103.size); TIteratorSetting _elem104; for (int _i105 = 0; _i105 < _list103.size; ++_i105) { @@ -464,5 +435,9 @@ public class IteratorConfig implements org.apache.thrift.TBase<IteratorConfig, I } } + 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() {} }