http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java index 2ba7674..3384e00 100644 --- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java +++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java @@ -48,7 +48,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@SuppressWarnings("all") public class TabletClientService { +@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class TabletClientService { public interface Iface extends org.apache.accumulo.core.client.impl.thrift.ClientService.Iface { @@ -4336,7 +4336,7 @@ import org.slf4j.LoggerFactory; public long readaheadThreshold; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)11, "tinfo"), CREDENTIALS((short)1, "credentials"), EXTENT((short)2, "extent"), @@ -6034,7 +6034,7 @@ import org.slf4j.LoggerFactory; public TooManyFilesException tmfe; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short)0, "success"), SEC((short)1, "sec"), NSTE((short)2, "nste"), @@ -6695,7 +6695,7 @@ import org.slf4j.LoggerFactory; public long scanID; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)2, "tinfo"), SCAN_ID((short)1, "scanID"); @@ -7156,7 +7156,7 @@ import org.slf4j.LoggerFactory; public TooManyFilesException tmfe; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short)0, "success"), NSSI((short)1, "nssi"), NSTE((short)2, "nste"), @@ -7817,7 +7817,7 @@ import org.slf4j.LoggerFactory; public long scanID; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)2, "tinfo"), SCAN_ID((short)1, "scanID"); @@ -8286,7 +8286,7 @@ import org.slf4j.LoggerFactory; public boolean waitForWrites; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)8, "tinfo"), CREDENTIALS((short)1, "credentials"), BATCH((short)2, "batch"), @@ -9681,7 +9681,7 @@ import org.slf4j.LoggerFactory; public org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short)0, "success"), SEC((short)1, "sec"); @@ -10142,7 +10142,7 @@ import org.slf4j.LoggerFactory; public long scanID; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)2, "tinfo"), SCAN_ID((short)1, "scanID"); @@ -10599,7 +10599,7 @@ import org.slf4j.LoggerFactory; public NoSuchScanIDException nssi; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short)0, "success"), NSSI((short)1, "nssi"); @@ -11060,7 +11060,7 @@ import org.slf4j.LoggerFactory; public long scanID; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)2, "tinfo"), SCAN_ID((short)1, "scanID"); @@ -11515,7 +11515,7 @@ import org.slf4j.LoggerFactory; public NoSuchScanIDException nssi; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { NSSI((short)1, "nssi"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -11873,7 +11873,7 @@ import org.slf4j.LoggerFactory; public org.apache.accumulo.core.security.thrift.TCredentials credentials; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)2, "tinfo"), CREDENTIALS((short)1, "credentials"); @@ -12337,7 +12337,7 @@ import org.slf4j.LoggerFactory; public org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short)0, "success"), SEC((short)1, "sec"); @@ -12797,7 +12797,7 @@ import org.slf4j.LoggerFactory; public List<org.apache.accumulo.core.data.thrift.TMutation> mutations; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)1, "tinfo"), UPDATE_ID((short)2, "updateID"), KEY_EXTENT((short)3, "keyExtent"), @@ -13509,7 +13509,7 @@ import org.slf4j.LoggerFactory; public long updateID; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)2, "tinfo"), UPDATE_ID((short)1, "updateID"); @@ -13966,7 +13966,7 @@ import org.slf4j.LoggerFactory; public NoSuchScanIDException nssi; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short)0, "success"), NSSI((short)1, "nssi"); @@ -14431,7 +14431,7 @@ import org.slf4j.LoggerFactory; public org.apache.accumulo.core.data.thrift.TMutation mutation; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)4, "tinfo"), CREDENTIALS((short)1, "credentials"), KEY_EXTENT((short)2, "keyExtent"), @@ -15103,7 +15103,7 @@ import org.slf4j.LoggerFactory; public ConstraintViolationException cve; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SEC((short)1, "sec"), NSTE((short)2, "nste"), CVE((short)3, "cve"); @@ -15665,7 +15665,7 @@ import org.slf4j.LoggerFactory; public String tableID; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)1, "tinfo"), CREDENTIALS((short)2, "credentials"), AUTHORIZATIONS((short)3, "authorizations"), @@ -16374,7 +16374,7 @@ import org.slf4j.LoggerFactory; public org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short)0, "success"), SEC((short)1, "sec"); @@ -16839,7 +16839,7 @@ import org.slf4j.LoggerFactory; public List<String> symbols; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)1, "tinfo"), SESS_ID((short)2, "sessID"), MUTATIONS((short)3, "mutations"), @@ -17626,7 +17626,7 @@ import org.slf4j.LoggerFactory; public NoSuchScanIDException nssi; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short)0, "success"), NSSI((short)1, "nssi"); @@ -18136,7 +18136,7 @@ import org.slf4j.LoggerFactory; public long sessID; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)1, "tinfo"), SESS_ID((short)2, "sessID"); @@ -18589,7 +18589,7 @@ import org.slf4j.LoggerFactory; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { ; private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -18839,7 +18839,7 @@ import org.slf4j.LoggerFactory; public long sessID; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)1, "tinfo"), SESS_ID((short)2, "sessID"); @@ -19302,7 +19302,7 @@ import org.slf4j.LoggerFactory; public boolean setTime; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)3, "tinfo"), CREDENTIALS((short)1, "credentials"), TID((short)4, "tid"), @@ -20143,7 +20143,7 @@ import org.slf4j.LoggerFactory; public org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short)0, "success"), SEC((short)1, "sec"); @@ -20657,7 +20657,7 @@ import org.slf4j.LoggerFactory; public ByteBuffer splitPoint; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)4, "tinfo"), CREDENTIALS((short)1, "credentials"), EXTENT((short)2, "extent"), @@ -21333,7 +21333,7 @@ import org.slf4j.LoggerFactory; public NotServingTabletException nste; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SEC((short)1, "sec"), NSTE((short)2, "nste"); @@ -21795,7 +21795,7 @@ import org.slf4j.LoggerFactory; public org.apache.accumulo.core.data.thrift.TKeyExtent extent; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)5, "tinfo"), CREDENTIALS((short)1, "credentials"), LOCK((short)4, "lock"), @@ -22466,7 +22466,7 @@ import org.slf4j.LoggerFactory; public boolean save; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)5, "tinfo"), CREDENTIALS((short)1, "credentials"), LOCK((short)4, "lock"), @@ -23235,7 +23235,7 @@ import org.slf4j.LoggerFactory; public ByteBuffer endRow; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)4, "tinfo"), CREDENTIALS((short)1, "credentials"), LOCK((short)3, "lock"), @@ -24117,7 +24117,7 @@ import org.slf4j.LoggerFactory; public org.apache.accumulo.core.data.thrift.TKeyExtent extent; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)1, "tinfo"), CREDENTIALS((short)2, "credentials"), LOCK((short)3, "lock"), @@ -24786,7 +24786,7 @@ import org.slf4j.LoggerFactory; public org.apache.accumulo.core.data.thrift.TKeyExtent extent; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)1, "tinfo"), CREDENTIALS((short)2, "credentials"), LOCK((short)3, "lock"), @@ -25459,7 +25459,7 @@ import org.slf4j.LoggerFactory; public ByteBuffer endRow; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)1, "tinfo"), CREDENTIALS((short)2, "credentials"), LOCK((short)3, "lock"), @@ -26337,7 +26337,7 @@ import org.slf4j.LoggerFactory; public org.apache.accumulo.core.security.thrift.TCredentials credentials; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)3, "tinfo"), CREDENTIALS((short)1, "credentials"); @@ -26801,7 +26801,7 @@ import org.slf4j.LoggerFactory; public org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short)0, "success"), SEC((short)1, "sec"); @@ -27264,7 +27264,7 @@ import org.slf4j.LoggerFactory; public String tableId; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)3, "tinfo"), CREDENTIALS((short)1, "credentials"), TABLE_ID((short)2, "tableId"); @@ -27826,7 +27826,7 @@ import org.slf4j.LoggerFactory; public org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short)0, "success"), SEC((short)1, "sec"); @@ -28336,7 +28336,7 @@ import org.slf4j.LoggerFactory; public org.apache.accumulo.core.security.thrift.TCredentials credentials; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)2, "tinfo"), CREDENTIALS((short)1, "credentials"); @@ -28800,7 +28800,7 @@ import org.slf4j.LoggerFactory; public org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short)0, "success"), SEC((short)1, "sec"); @@ -29263,7 +29263,7 @@ import org.slf4j.LoggerFactory; public String lock; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)3, "tinfo"), CREDENTIALS((short)1, "credentials"), LOCK((short)2, "lock"); @@ -29823,7 +29823,7 @@ import org.slf4j.LoggerFactory; public org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SEC((short)1, "sec"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -30183,7 +30183,7 @@ import org.slf4j.LoggerFactory; public String lock; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)3, "tinfo"), CREDENTIALS((short)1, "credentials"), LOCK((short)2, "lock"); @@ -30745,7 +30745,7 @@ import org.slf4j.LoggerFactory; public org.apache.accumulo.core.security.thrift.TCredentials credentials; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)2, "tinfo"), CREDENTIALS((short)1, "credentials"); @@ -31209,7 +31209,7 @@ import org.slf4j.LoggerFactory; public org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short)0, "success"), SEC((short)1, "sec"); @@ -31719,7 +31719,7 @@ import org.slf4j.LoggerFactory; public org.apache.accumulo.core.security.thrift.TCredentials credentials; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)2, "tinfo"), CREDENTIALS((short)1, "credentials"); @@ -32183,7 +32183,7 @@ import org.slf4j.LoggerFactory; public org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException sec; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { SUCCESS((short)0, "success"), SEC((short)1, "sec"); @@ -32695,7 +32695,7 @@ import org.slf4j.LoggerFactory; public List<String> filenames; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { TINFO((short)1, "tinfo"), CREDENTIALS((short)2, "credentials"), FILENAMES((short)3, "filenames");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java index 8989fe5..310d3b6 100644 --- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java +++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java @@ -48,7 +48,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@SuppressWarnings("all") public class TabletStats implements org.apache.thrift.TBase<TabletStats, TabletStats._Fields>, java.io.Serializable, Cloneable, Comparable<TabletStats> { +@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class TabletStats implements org.apache.thrift.TBase<TabletStats, TabletStats._Fields>, java.io.Serializable, Cloneable, Comparable<TabletStats> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TabletStats"); private static final org.apache.thrift.protocol.TField EXTENT_FIELD_DESC = new org.apache.thrift.protocol.TField("extent", org.apache.thrift.protocol.TType.STRUCT, (short)1); @@ -76,7 +76,7 @@ import org.slf4j.LoggerFactory; public long splitCreationTime; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { EXTENT((short)1, "extent"), MAJORS((short)2, "majors"), MINORS((short)3, "minors"), http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java index cc4c3e8..203597a 100644 --- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java +++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java @@ -48,7 +48,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@SuppressWarnings("all") public class TooManyFilesException extends TException implements org.apache.thrift.TBase<TooManyFilesException, TooManyFilesException._Fields>, java.io.Serializable, Cloneable, Comparable<TooManyFilesException> { +@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class TooManyFilesException extends TException implements org.apache.thrift.TBase<TooManyFilesException, TooManyFilesException._Fields>, java.io.Serializable, Cloneable, Comparable<TooManyFilesException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TooManyFilesException"); private static final org.apache.thrift.protocol.TField EXTENT_FIELD_DESC = new org.apache.thrift.protocol.TField("extent", org.apache.thrift.protocol.TType.STRUCT, (short)1); @@ -62,7 +62,7 @@ import org.slf4j.LoggerFactory; public org.apache.accumulo.core.data.thrift.TKeyExtent extent; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { EXTENT((short)1, "extent"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/core/src/main/scripts/generate-thrift.sh ---------------------------------------------------------------------- diff --git a/core/src/main/scripts/generate-thrift.sh b/core/src/main/scripts/generate-thrift.sh index ee5bb8e..8c2a623 100755 --- a/core/src/main/scripts/generate-thrift.sh +++ b/core/src/main/scripts/generate-thrift.sh @@ -26,23 +26,23 @@ # INCLUDED_MODULES should be an array that includes other Maven modules with src/main/thrift directories # Use INCLUDED_MODULES=(-) in calling scripts that require no other modules # ======================================================================================================================== -[ -z $REQUIRED_THRIFT_VERSION ] && REQUIRED_THRIFT_VERSION='0.9.1' -[ -z $INCLUDED_MODULES ] && INCLUDED_MODULES=(../trace) -[ -z $BASE_OUTPUT_PACKAGE ] && BASE_OUTPUT_PACKAGE='org.apache.accumulo.core' -[ -z $PACKAGES_TO_GENERATE ] && PACKAGES_TO_GENERATE=(gc master tabletserver security client.impl data) -[ -z $BUILD_DIR ] && BUILD_DIR='target' -[ -z $LANGUAGES_TO_GENERATE ] && LANGUAGES_TO_GENERATE=(java) -[ -z $FINAL_DIR ] && FINAL_DIR='src/main' +[[ -z $REQUIRED_THRIFT_VERSION ]] && REQUIRED_THRIFT_VERSION='0.9.1' +[[ -z $INCLUDED_MODULES ]] && INCLUDED_MODULES=(../trace) +[[ -z $BASE_OUTPUT_PACKAGE ]] && BASE_OUTPUT_PACKAGE='org.apache.accumulo.core' +[[ -z $PACKAGES_TO_GENERATE ]] && PACKAGES_TO_GENERATE=(gc master tabletserver security client.impl data) +[[ -z $BUILD_DIR ]] && BUILD_DIR='target' +[[ -z $LANGUAGES_TO_GENERATE ]] && LANGUAGES_TO_GENERATE=(java) +[[ -z $FINAL_DIR ]] && FINAL_DIR='src/main' # ======================================================================================================================== fail() { - echo $@ + echo "$@" exit 1 } # Test to see if we have thrift installed -VERSION=$(thrift -version 2>/dev/null | grep -F "${REQUIRED_THRIFT_VERSION}" | wc -l) -if [ "$VERSION" -ne 1 ] ; then +VERSION=$(thrift -version 2>/dev/null | grep -F "${REQUIRED_THRIFT_VERSION}" | wc -l | sed -e 's/^ *//' -e 's/ *$//') +if [[ "${VERSION}" != '1' ]] ; then # Nope: bail echo "****************************************************" echo "*** thrift is not available" @@ -65,15 +65,17 @@ THRIFT_ARGS="${THRIFT_ARGS} -o $BUILD_DIR" mkdir -p $BUILD_DIR rm -rf $BUILD_DIR/gen-java for f in src/main/thrift/*.thrift; do - thrift ${THRIFT_ARGS} --gen java $f || fail unable to generate java thrift classes - thrift ${THRIFT_ARGS} --gen py $f || fail unable to generate python thrift classes - thrift ${THRIFT_ARGS} --gen rb $f || fail unable to generate ruby thrift classes - thrift ${THRIFT_ARGS} --gen cpp $f || fail unable to generate cpp thrift classes + thrift ${THRIFT_ARGS} --gen java "$f" || fail unable to generate java thrift classes + thrift ${THRIFT_ARGS} --gen py "$f" || fail unable to generate python thrift classes + thrift ${THRIFT_ARGS} --gen rb "$f" || fail unable to generate ruby thrift classes + thrift ${THRIFT_ARGS} --gen cpp "$f" || fail unable to generate cpp thrift classes done # For all generated thrift code, suppress all warnings and add the LICENSE header -find $BUILD_DIR/gen-java -name '*.java' -print0 | xargs -0 sed -i.orig -e 's/public class /@SuppressWarnings("all") public class /' -find $BUILD_DIR/gen-java -name '*.java' -print0 | xargs -0 sed -i.orig -e 's/public enum /@SuppressWarnings("all") public enum /' +cs='@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"})' +es='@SuppressWarnings({"unused"})' +find $BUILD_DIR/gen-java -name '*.java' -print0 | xargs -0 sed -i.orig -e 's/\(public class [A-Z]\)/'"$cs"' \1/' +find $BUILD_DIR/gen-java -name '*.java' -print0 | xargs -0 sed -i.orig -e 's/\(public enum [A-Z]\)/'"$es"' \1/' for lang in "${LANGUAGES_TO_GENERATE[@]}"; do case $lang in @@ -109,10 +111,10 @@ for lang in "${LANGUAGES_TO_GENERATE[@]}"; do continue ;; esac - - for file in ${FILE_SUFFIX[@]}; do + + for file in "${FILE_SUFFIX[@]}"; do for f in $(find $BUILD_DIR/gen-$lang -name "*$file"); do - cat - $f >${f}-with-license <<EOF + cat - "$f" > "${f}-with-license" <<EOF ${PREFIX}${LINE_NOTATION} Licensed to the Apache Software Foundation (ASF) under one or more ${LINE_NOTATION} contributor license agreements. See the NOTICE file distributed with ${LINE_NOTATION} this work for additional information regarding copyright ownership. @@ -135,7 +137,7 @@ done # For every generated java file, compare it with the version-controlled one, and copy the ones that have changed into place for d in "${PACKAGES_TO_GENERATE[@]}"; do for lang in "${LANGUAGES_TO_GENERATE[@]}"; do - case $lang in + case "$lang" in cpp) SDIR="${BUILD_DIR}/gen-$lang/" DDIR="${FINAL_DIR}/cpp/" @@ -161,11 +163,11 @@ for d in "${PACKAGES_TO_GENERATE[@]}"; do ;; esac mkdir -p "$DDIR" - for file in ${FILE_SUFFIX[@]}; do - for f in `find $SDIR -name *$file`; do - DEST="$DDIR/`basename $f`" + for file in "${FILE_SUFFIX[@]}"; do + for f in $(find $SDIR -name *$file); do + DEST="$DDIR/$(basename $f)" if ! cmp -s "${f}-with-license" "${DEST}" ; then - echo cp -f "${f}-with-license" "${DEST}" + echo cp -f "${f}-with-license" "${DEST}" cp -f "${f}-with-license" "${DEST}" || fail unable to copy files to java workspace fi done http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3389795..9249a5b 100644 --- a/pom.xml +++ b/pom.xml @@ -118,6 +118,8 @@ <accumulo.release.version>${project.version}</accumulo.release.version> <!-- bouncycastle version for test dependencies --> <bouncycastle.version>1.50</bouncycastle.version> + <!-- findbugs-maven-plugin won't work on jdk8 or later; set to 3.0.0 or newer --> + <findbugs.version>2.5.5</findbugs.version> <!-- surefire/failsafe plugin option --> <forkCount>1</forkCount> <!-- overwritten in profiles hadoop-1 or hadoop-2 --> @@ -499,7 +501,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> - <version>2.5.5</version> + <version>${findbugs.version}</version> <configuration> <xmlOutput>true</xmlOutput> <effort>Max</effort> @@ -1141,7 +1143,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> - <version>2.5.3</version> + <version>${findbugs.version}</version> <configuration> <excludeFilterFile>contrib/findbugs-exclude.xml</excludeFilterFile> <findbugsXmlOutput>true</findbugsXmlOutput> http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloException.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloException.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloException.java index 0be034c..724a92e 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloException.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloException.java @@ -48,7 +48,7 @@ import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@SuppressWarnings("all") public class AccumuloException extends TException implements org.apache.thrift.TBase<AccumuloException, AccumuloException._Fields>, java.io.Serializable, Cloneable, Comparable<AccumuloException> { +@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class AccumuloException extends TException implements org.apache.thrift.TBase<AccumuloException, AccumuloException._Fields>, java.io.Serializable, Cloneable, Comparable<AccumuloException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AccumuloException"); private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -62,7 +62,7 @@ import org.slf4j.LoggerFactory; public String msg; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ - @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { + public enum _Fields implements org.apache.thrift.TFieldIdEnum { MSG((short)1, "msg"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();