You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by zj...@apache.org on 2015/01/16 19:31:26 UTC
[13/25] 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/533e551e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/533e551e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/533e551e
Branch: refs/heads/YARN-2928
Commit: 533e551eb42af188535aeb0ab35f8ebf150a0da1
Parents: db51548
Author: Akira Ajisaka <aa...@apache.org>
Authored: Thu Jan 15 21:27:39 2015 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Thu Jan 15 21:27:39 2015 +0900
----------------------------------------------------------------------
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/533e551e/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/533e551e/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 + "\"");
}