From 424f11a46dee42ddeb5918693405a7c808206f9f Mon Sep 17 00:00:00 2001 From: Chia-Ping Tsai Date: Tue, 27 Jun 2017 11:34:31 +0800 Subject: [PATCH] HBASE-18268 Eliminate the findbugs warnings for hbase-client --- .../main/java/org/apache/hadoop/hbase/HColumnDescriptor.java | 10 ++++++---- .../main/java/org/apache/hadoop/hbase/HTableDescriptor.java | 8 ++++---- .../java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java | 2 ++ .../src/main/java/org/apache/hadoop/hbase/util/PoolMap.java | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java index 94899e339f..9292633704 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java @@ -1177,13 +1177,14 @@ public class HColumnDescriptor implements WritableComparable boolean hasConfigKeys = false; // print all reserved keys first - for (ImmutableBytesWritable k : values.keySet()) { + for (Map.Entry entry : values.entrySet()) { + ImmutableBytesWritable k = entry.getKey(); if (!RESERVED_KEYWORDS.contains(k)) { hasConfigKeys = true; continue; } String key = Bytes.toString(k.get()); - String value = Bytes.toStringBinary(values.get(k).get()); + String value = Bytes.toStringBinary(entry.getValue().get()); if (printDefaults || !DEFAULT_VALUES.containsKey(key) || !DEFAULT_VALUES.get(key).equalsIgnoreCase(value)) { @@ -1200,12 +1201,13 @@ public class HColumnDescriptor implements WritableComparable s.append(HConstants.METADATA).append(" => "); s.append('{'); boolean printComma = false; - for (ImmutableBytesWritable k : values.keySet()) { + for (Map.Entry entry : values.entrySet()) { + ImmutableBytesWritable k = entry.getKey(); if (RESERVED_KEYWORDS.contains(k)) { continue; } String key = Bytes.toString(k.get()); - String value = Bytes.toStringBinary(values.get(k).get()); + String value = Bytes.toStringBinary(entry.getValue().get()); if (printComma) { s.append(", "); } diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java index ba0c1264ed..fbb93768ff 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java @@ -957,7 +957,8 @@ public class HTableDescriptor implements WritableComparable { // step 1: set partitioning and pruning Set reservedKeys = new TreeSet(); Set userKeys = new TreeSet(); - for (ImmutableBytesWritable k : values.keySet()) { + for (Map.Entry entry : values.entrySet()) { + ImmutableBytesWritable k = entry.getKey(); if (k == null || k.get() == null) continue; String key = Bytes.toString(k.get()); // in this section, print out reserved keywords + coprocessor info @@ -966,7 +967,7 @@ public class HTableDescriptor implements WritableComparable { continue; } // only print out IS_ROOT/IS_META if true - String value = Bytes.toString(values.get(k).get()); + String value = Bytes.toString(entry.getValue().get()); if (key.equalsIgnoreCase(IS_ROOT) || key.equalsIgnoreCase(IS_META)) { if (Boolean.valueOf(value) == false) continue; } @@ -1175,8 +1176,7 @@ public class HTableDescriptor implements WritableComparable { result = families.size() - other.families.size(); } if (result == 0 && families.size() != other.families.size()) { - result = Integer.valueOf(families.size()).compareTo( - Integer.valueOf(other.families.size())); + result = Integer.compare(families.size(), other.families.size()); } if (result == 0) { for (Iterator it = families.values().iterator(), diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java index 634c101e54..a110b8dc6d 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java @@ -101,6 +101,8 @@ public abstract class AbstractRpcClient implements RpcC private static final ScheduledExecutorService IDLE_CONN_SWEEPER = Executors .newScheduledThreadPool(1, Threads.newDaemonThreadFactory("Idle-Rpc-Conn-Sweeper")); + @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="MS_MUTABLE_COLLECTION_PKGPROTECT", + justification="the rest of the system which live in the different package can use") protected final static Map> TOKEN_HANDLERS = new HashMap<>(); static { diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/util/PoolMap.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/util/PoolMap.java index b683fcc9e4..67aaffd877 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/util/PoolMap.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/util/PoolMap.java @@ -210,7 +210,7 @@ public class PoolMap implements Map { } } } - return null; + return entries; } protected interface Pool { -- 2.11.0 (Apple Git-81)