Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 70532200CEE for ; Tue, 8 Aug 2017 04:50:19 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6EA4F1669C7; Tue, 8 Aug 2017 02:50:19 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B29611669C1 for ; Tue, 8 Aug 2017 04:50:18 +0200 (CEST) Received: (qmail 26244 invoked by uid 500); 8 Aug 2017 02:50:17 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 26235 invoked by uid 99); 8 Aug 2017 02:50:17 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Aug 2017 02:50:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9C0A2F3263; Tue, 8 Aug 2017 02:50:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chia7712@apache.org To: commits@hbase.apache.org Message-Id: <0bc67a430228464fabe460c67362c9dd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-18315 Eliminate the findbugs warnings for hbase-rest Date: Tue, 8 Aug 2017 02:50:17 +0000 (UTC) archived-at: Tue, 08 Aug 2017 02:50:19 -0000 Repository: hbase Updated Branches: refs/heads/branch-2 501176d40 -> 18d29e479 HBASE-18315 Eliminate the findbugs warnings for hbase-rest Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/18d29e47 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/18d29e47 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/18d29e47 Branch: refs/heads/branch-2 Commit: 18d29e4794dd669fdde3520518979b9023daea79 Parents: 501176d Author: Chia-Ping Tsai Authored: Tue Aug 8 10:47:15 2017 +0800 Committer: Chia-Ping Tsai Committed: Tue Aug 8 10:47:15 2017 +0800 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/rest/RESTServer.java | 3 --- .../hadoop/hbase/rest/model/NamespacesInstanceModel.java | 11 ++++++----- 2 files changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/18d29e47/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java ---------------------------------------------------------------------- diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java index 5c43287..eb3fc26 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java @@ -125,9 +125,6 @@ public class RESTServer implements Constants { static void addCSRFFilter(ServletContextHandler ctxHandler, Configuration conf) { restCSRFEnabled = conf.getBoolean(REST_CSRF_ENABLED_KEY, REST_CSRF_ENABLED_DEFAULT); if (restCSRFEnabled) { - Set restCsrfMethodsToIgnore = new HashSet<>(); - restCsrfMethodsToIgnore.addAll(getTrimmedStringList(conf, - REST_CSRF_METHODS_TO_IGNORE_KEY, REST_CSRF_METHODS_TO_IGNORE_DEFAULT)); Map restCsrfParams = RestCsrfPreventionFilter .getFilterParams(conf, "hbase.rest-csrf."); FilterHolder holder = new FilterHolder(); http://git-wip-us.apache.org/repos/asf/hbase/blob/18d29e47/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesInstanceModel.java ---------------------------------------------------------------------- diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesInstanceModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesInstanceModel.java index bcc1581..b18fd63 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesInstanceModel.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesInstanceModel.java @@ -129,11 +129,11 @@ public class NamespacesInstanceModel implements Serializable, ProtobufMessageHan sb.append(namespaceName); sb.append("\'"); if(properties != null){ - for(String key: properties.keySet()){ + for (Map.Entry entry : properties.entrySet()) { sb.append(", "); - sb.append(key); + sb.append(entry.getKey()); sb.append(" => '"); - sb.append(properties.get(key)); + sb.append(entry.getValue()); sb.append("\'"); } } @@ -145,10 +145,11 @@ public class NamespacesInstanceModel implements Serializable, ProtobufMessageHan public byte[] createProtobufOutput() { NamespaceProperties.Builder builder = NamespaceProperties.newBuilder(); if(properties != null){ - for(String key: properties.keySet()){ + for (Map.Entry entry : properties.entrySet()) { + String key = entry.getKey(); NamespaceProperties.Property.Builder property = NamespaceProperties.Property.newBuilder(); property.setKey(key); - property.setValue(properties.get(key)); + property.setValue(entry.getValue()); builder.addProps(property); } }