Refactor TenantManage

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

diff --git a/nemo-impl/src/main/java/org/opendaylight/nemo/user/tenantmanager/RegisterUser.java b/nemo-impl/src/main/java/org/opendaylight/nemo/user/tenantmanager/RegisterUser.java
index d598b020f6b9baa27adedca3ac312cc5502bbe3f..5dbf6a04aa6339b94ee925ee331fbca2a3da845b 100644 (file)
--- a/nemo-impl/src/main/java/org/opendaylight/nemo/user/tenantmanager/RegisterUser.java
+++ b/nemo-impl/src/main/java/org/opendaylight/nemo/user/tenantmanager/RegisterUser.java
@@ -7,21 +7,19 @@
  */\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.UserRoleName;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.intent.rev151010.RegisterUserInput;\r
 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.user.roles.UserRole;\r
 \r
-import java.util.List;\r
-\r
 /**\r
  * Created by z00293636 on 2015/9/20.\r
  */\r
 public class RegisterUser {\r
-    private TenantManage tenantManage;\r
-    private List<UserRole> userRoleList;\r
-    private List<User> usersList;\r
+    private final TenantManage tenantManage;\r
 \r
     public RegisterUser(TenantManage tenantManage)\r
     {\r
@@ -33,19 +31,19 @@ public class RegisterUser {
         String errorInfo = null;\r
 \r
         tenantManage.fetchUserRoles();\r
-        userRoleList = tenantManage.getUserRoleList();\r
+        Map<UserRoleName, UserRole> userRoles = tenantManage.getUserRoles();\r
         tenantManage.fetchUsers();\r
-        usersList = tenantManage.getUsersList();\r
+        Map<UserId, User> users = tenantManage.getUsers();\r
 \r
-        if (userRoleList == null)\r
+        if (userRoles.isEmpty())\r
         {\r
             errorInfo = "There are no roles be defined.";\r
         }\r
         else\r
         {\r
-            if (IfRoleExist(input.getUserRole()))\r
+            if (userRoles.containsKey(input.getUserRole()))\r
             {\r
-                if (usersList != null && IfUserHasRegistered(input.getUserId()))\r
+                if (users.containsKey(input.getUserId()))\r
                 {\r
                     errorInfo = "The user has been registered.";\r
                 }\r
@@ -61,32 +59,5 @@ public class RegisterUser {
         }\r
         return errorInfo;\r
     }\r
-    private boolean IfRoleExist(UserRoleName userRoleName){\r
-        Boolean roleExist = false;\r
-\r
-        for (UserRole userRole : userRoleList)\r
-        {\r
-            if (userRole.getRoleName().equals(userRoleName))\r
-            {\r
-                roleExist = true;\r
-            }\r
-        }\r
-\r
-        return roleExist;\r
-    }\r
-\r
-    private boolean IfUserHasRegistered(UserId userId){\r
-        Boolean userHasRegistered = false;\r
-\r
-        for (User user : usersList)\r
-        {\r
-            if (user.getUserId().equals(userId))\r
-            {\r
-                userHasRegistered = true;\r
-            }\r
-        }\r
-\r
-        return userHasRegistered;\r
-    }\r
 \r
 }\r