Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5E740173B8 for ; Tue, 20 Jan 2015 17:44:25 +0000 (UTC) Received: (qmail 17112 invoked by uid 500); 20 Jan 2015 17:44:13 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 16778 invoked by uid 500); 20 Jan 2015 17:44:13 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 15365 invoked by uid 99); 20 Jan 2015 17:44:12 -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, 20 Jan 2015 17:44:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7114EE0844; Tue, 20 Jan 2015 17:44:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zhz@apache.org To: common-commits@hadoop.apache.org Date: Tue, 20 Jan 2015 17:44:25 -0000 Message-Id: <0549c129986f4d9f9f30e949eac03b3e@git.apache.org> In-Reply-To: <065e9952e2284f8ab86ecad51922ca0c@git.apache.org> References: <065e9952e2284f8ab86ecad51922ca0c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [16/44] hadoop git commit: YARN-3005. [JDK7] Use switch statement for String instead of if-else statement in RegistrySecurity.java (Contributed by Kengo Seki) YARN-3005. [JDK7] Use switch statement for String instead of if-else statement in RegistrySecurity.java (Contributed by Kengo Seki) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6f0d9f42 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6f0d9f42 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6f0d9f42 Branch: refs/heads/HDFS-EC Commit: 6f0d9f4245b70a2debc55c91fe73f40c09e91a42 Parents: acf951c Author: Akira Ajisaka Authored: Thu Jan 15 21:27:39 2015 +0900 Committer: Zhe Zhang Committed: Tue Jan 20 09:43:09 2015 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../registry/client/impl/zk/RegistrySecurity.java | 13 ++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6f0d9f42/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 5716b50..a87b41e 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -80,6 +80,9 @@ Release 2.7.0 - UNRELEASED IMPROVEMENTS + YARN-3005. [JDK7] Use switch statement for String instead of if-else + statement in RegistrySecurity.java (Kengo Seki via aajisaka) + YARN-2950. Change message to mandate, not suggest JS requirement on UI. (Dustin Cote via harsh) http://git-wip-us.apache.org/repos/asf/hadoop/blob/6f0d9f42/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java index d3c2d15..1c75e43 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistrySecurity.java @@ -192,14 +192,17 @@ public class RegistrySecurity extends AbstractService { String auth = conf.getTrimmed(KEY_REGISTRY_CLIENT_AUTH, REGISTRY_CLIENT_AUTH_ANONYMOUS); - // TODO JDK7 SWITCH - if (REGISTRY_CLIENT_AUTH_KERBEROS.equals(auth)) { + switch (auth) { + case REGISTRY_CLIENT_AUTH_KERBEROS: access = AccessPolicy.sasl; - } else if (REGISTRY_CLIENT_AUTH_DIGEST.equals(auth)) { + break; + case REGISTRY_CLIENT_AUTH_DIGEST: access = AccessPolicy.digest; - } else if (REGISTRY_CLIENT_AUTH_ANONYMOUS.equals(auth)) { + break; + case REGISTRY_CLIENT_AUTH_ANONYMOUS: access = AccessPolicy.anon; - } else { + break; + default: throw new ServiceStateException(E_UNKNOWN_AUTHENTICATION_MECHANISM + "\"" + auth + "\""); }