Refactor TenantManage

[nemo.git] / nemo-impl / src / main / java / org / opendaylight / nemo / user / tenantmanager / AAA.java

diff --git a/nemo-impl/src/main/java/org/opendaylight/nemo/user/tenantmanager/AAA.java b/nemo-impl/src/main/java/org/opendaylight/nemo/user/tenantmanager/AAA.java
index e9b959b9323e48cfcb809681717587f9fcce20b6..51e693e035fbef15188a3c56a21cc467491d01a8 100644 (file)
--- a/nemo-impl/src/main/java/org/opendaylight/nemo/user/tenantmanager/AAA.java
+++ b/nemo-impl/src/main/java/org/opendaylight/nemo/user/tenantmanager/AAA.java
@@ -7,6 +7,8 @@
  */\r
 package org.opendaylight.nemo.user.tenantmanager;\r
 \r
+import java.util.Map;\r
+\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.common.rev151010.UserId;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.common.rev151010.UserName;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.common.rev151010.UserPassword;\r
@@ -14,8 +16,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.com
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.intent.rev151010.users.User;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.user.rev151010.UserInstance;\r
 \r
-import java.util.List;\r
-\r
 /**\r
  * Created by z00293636 on 2015/8/29.\r
  */\r
@@ -37,39 +37,19 @@ public class AAA {
     private String checkUser(UserId userId, UserName userName, UserPassword userPassword, UserRoleName userRoleName)\r
     {\r
         tenantManage.fetchUsers();\r
-        List<User> userList = tenantManage.getUsersList();\r
+        final Map<UserId, User> users = tenantManage.getUsers();\r
         String errorInfo = null;\r
-        Boolean userexist = false;\r
-\r
-       if (userList != null)\r
-        {\r
-            for (User user : userList)\r
-            {\r
-                if (user.getUserId().equals(userId))\r
-                {\r
-                    userexist = true;\r
-                    if (!user.getUserName().equals(userName))\r
-                    {\r
-                        errorInfo = "The user name is not right.";\r
-                        break;\r
-                    }\r
-                    else if (!user.getUserPassword().equals(userPassword))\r
-                    {\r
-                        errorInfo = "The password is not right.";\r
-                        break;\r
-                    }\r
-                    else if (!user.getUserRole().equals(userRoleName))\r
-                    {\r
-                        errorInfo = "The role is not right.";\r
-                        break;\r
-                    }\r
-                }\r
-             }\r
-\r
-        }\r
-\r
-        if (!userexist)\r
-        {\r
+        final User user = users.get(userId);\r
+\r
+        if (users.containsKey(userId) && user != null) {\r
+            if (!user.getUserName().equals(userName)) {\r
+                errorInfo = "The user name is not right.";\r
+            } else if (!user.getUserPassword().equals(userPassword)) {\r
+                errorInfo = "The password is not right.";\r
+            } else if (!user.getUserRole().equals(userRoleName)) {\r
+                errorInfo = "The role is not right.";\r
+            }\r
+        } else {\r
             errorInfo = "The user is not exist.";\r
         }\r
         return errorInfo;\r