Refactor AAA.checkUser()

Change-Id: Idd767a3bb1808b0b7f3fd248e403a88d4c2f4de5
Signed-off-by: Gary Wu <gary.wu1@huawei.com>

diff --git a/nemo-impl/src/main/java/org/opendaylight/nemo/user/advancedquery/AdvancedQuery.java b/nemo-impl/src/main/java/org/opendaylight/nemo/user/advancedquery/AdvancedQuery.java
index 5e746c24d7aa0f738450b4a0d27c5b5a096796c6..e0b5d70a0553f295b6476ae979f28d8792505370 100644 (file)
--- a/nemo-impl/src/main/java/org/opendaylight/nemo/user/advancedquery/AdvancedQuery.java
+++ b/nemo-impl/src/main/java/org/opendaylight/nemo/user/advancedquery/AdvancedQuery.java
@@ -66,7 +66,7 @@ public class AdvancedQuery
         String errorInfo = null;\r
         List<QueryCondition> queryConditionList = null;\r
 \r
-        errorInfo = aaa.CheckUser(input.getUserId(),input.getUserName(),input.getUserPassword(),input.getUserRole());\r
+        errorInfo = aaa.checkUser(input);\r
 \r
         if (errorInfo != null)\r
         {\r

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 a1a4753e59433dc044048d019cc2aa3601e94cc1..e9b959b9323e48cfcb809681717587f9fcce20b6 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
@@ -12,6 +12,7 @@ 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.common.rev151010.UserPassword;\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.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
@@ -29,7 +30,11 @@ public class AAA {
         this.tenantManage = tenantManage;\r
     }\r
 \r
-    public String CheckUser(UserId userId, UserName userName, UserPassword userPassword, UserRoleName userRoleName)\r
+    public String checkUser(UserInstance user) {\r
+        return checkUser(user.getUserId(), user.getUserName(), user.getUserPassword(), user.getUserRole());\r
+    }\r
+\r
+    private String checkUser(UserId userId, UserName userName, UserPassword userPassword, UserRoleName userRoleName)\r
     {\r
         tenantManage.fetchUsers();\r
         List<User> userList = tenantManage.getUsersList();\r

diff --git a/nemo-impl/src/main/java/org/opendaylight/nemo/user/transactionmanager/TransactionBegin.java b/nemo-impl/src/main/java/org/opendaylight/nemo/user/transactionmanager/TransactionBegin.java
index b0f7eb243136cb28c96222de5d69ba84e1ad738d..c8ed4e26dbc2b8165fa10a06746fbe6c9aca7d2b 100644 (file)
--- a/nemo-impl/src/main/java/org/opendaylight/nemo/user/transactionmanager/TransactionBegin.java
+++ b/nemo-impl/src/main/java/org/opendaylight/nemo/user/transactionmanager/TransactionBegin.java
@@ -18,7 +18,7 @@ public class TransactionBegin {
     public String transactionbegin(AAA aaa,BeginTransactionInput input)\r
     {\r
         String errorInfo = null;\r
-        errorInfo = aaa.CheckUser(input.getUserId(),input.getUserName(),input.getUserPassword(),input.getUserRole());\r
+        errorInfo = aaa.checkUser(input);\r
         return errorInfo;\r
     }\r
 }\r

diff --git a/nemo-impl/src/main/java/org/opendaylight/nemo/user/transactionmanager/TransactionEnd.java b/nemo-impl/src/main/java/org/opendaylight/nemo/user/transactionmanager/TransactionEnd.java
index c4f2f7ba17454be9c1594275b80019239c678fab..910cbf3b8adcb4024836140fe4be4579e6f05547 100644 (file)
--- a/nemo-impl/src/main/java/org/opendaylight/nemo/user/transactionmanager/TransactionEnd.java
+++ b/nemo-impl/src/main/java/org/opendaylight/nemo/user/transactionmanager/TransactionEnd.java
@@ -17,7 +17,7 @@ public class TransactionEnd {
     public String transactionend(AAA aaa,EndTransactionInput input)\r
     {\r
         String errorInfo = null;\r
-        errorInfo = aaa.CheckUser(input.getUserId(),input.getUserName(),input.getUserPassword(),input.getUserRole());\r
+        errorInfo = aaa.checkUser(input);\r
         return errorInfo;\r
     }\r
 }\r

diff --git a/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/languagestyle/LanguageIntent.java b/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/languagestyle/LanguageIntent.java
index 670d1b5f210f133d24300969fd9122b2ba2be30b..1f226e2c7a83ae179e3b859492a8c42b55cc191b 100644 (file)
--- a/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/languagestyle/LanguageIntent.java
+++ b/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/languagestyle/LanguageIntent.java
@@ -27,7 +27,7 @@ public class LanguageIntent {
 \r
         String errorInfo = null;\r
 \r
-        errorInfo = aaa.CheckUser(languageStyleNemoRequestInput.getUserId(),languageStyleNemoRequestInput.getUserName(),languageStyleNemoRequestInput.getUserPassword(),languageStyleNemoRequestInput.getUserRole());\r
+        errorInfo = aaa.checkUser(languageStyleNemoRequestInput);\r
         if (errorInfo !=null)\r
         {\r
            return errorInfo;\r

diff --git a/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/structurestyle/deleteintent/DeleteIntent.java b/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/structurestyle/deleteintent/DeleteIntent.java
index 1eaba1bfbb4c1f3915b808d16115a7cc51257e1d..03fb29e3c4a17d917d1f3ec8a9297f571c282a0e 100644 (file)
--- a/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/structurestyle/deleteintent/DeleteIntent.java
+++ b/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/structurestyle/deleteintent/DeleteIntent.java
@@ -47,7 +47,7 @@ public class DeleteIntent {
     {\r
         String errorInfo = null;\r
 \r
-        errorInfo = aaa.CheckUser(styleNemoDeleteInput.getUserId(),styleNemoDeleteInput.getUserName(),styleNemoDeleteInput.getUserPassword(),styleNemoDeleteInput.getUserRole());\r
+        errorInfo = aaa.checkUser(styleNemoDeleteInput);\r
 \r
         if (errorInfo != null)\r
         {\r

diff --git a/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/structurestyle/updateintent/UpdateIntent.java b/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/structurestyle/updateintent/UpdateIntent.java
index 1a34b9b7fd4c75f998dd5a012f81f19232709b67..ea9a7f1f5aac282958c50ae3cb1a028d27b67b13 100644 (file)
--- a/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/structurestyle/updateintent/UpdateIntent.java
+++ b/nemo-impl/src/main/java/org/opendaylight/nemo/user/vnspacemanager/structurestyle/updateintent/UpdateIntent.java
@@ -47,7 +47,7 @@ public class UpdateIntent {
 \r
         String erroInfo = null;\r
 \r
-        erroInfo = aaa.CheckUser(structureStyleNemoUpdateInput.getUserId(),structureStyleNemoUpdateInput.getUserName(),structureStyleNemoUpdateInput.getUserPassword(),structureStyleNemoUpdateInput.getUserRole());\r
+        erroInfo = aaa.checkUser(structureStyleNemoUpdateInput);\r
 \r
         if (erroInfo != null)\r
         {\r

diff --git a/nemo-impl/src/test/java/org/opendaylight/nemo/user/tenantmanager/AAATest.java b/nemo-impl/src/test/java/org/opendaylight/nemo/user/tenantmanager/AAATest.java
index 976f58870716ba00439cff7eca88b7188badf83b..98f669a0dc4f0cc056123f10c124699c68a22f04 100644 (file)
--- a/nemo-impl/src/test/java/org/opendaylight/nemo/user/tenantmanager/AAATest.java
+++ b/nemo-impl/src/test/java/org/opendaylight/nemo/user/tenantmanager/AAATest.java
@@ -22,10 +22,7 @@ import junit.framework.TestCase;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.common.rev151010.UserId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.common.rev151010.UserName;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.common.rev151010.UserPassword;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.common.rev151010.UserRoleName;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.user.rev151010.UserInstance;
 
 /**
  * Created by zhangmeng on 2015/11/20.
@@ -33,31 +30,25 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.com
 public class AAATest extends TestCase {
     private AAA aaa;
     private TenantManage tenantManage;
-    private UserId userId;
-    private UserName userName;
-    private UserPassword userPassword;
-    private UserRoleName userRoleName;
+    private UserInstance userInstance;
 
     @Before
     public void setUp() throws Exception {
         tenantManage = mock(TenantManage.class);
         aaa = new AAA(tenantManage);
 
-        userId = mock(UserId.class);
-        userName = mock(UserName.class);
-        userPassword = mock(UserPassword.class);
-        userRoleName = mock(UserRoleName.class);
+        userInstance = mock(UserInstance.class);
     }
 
     @Test
     public void testCheckUser() throws Exception {
         doNothing().when(tenantManage).fetchUsers();
         when(tenantManage.getUsersList()).thenReturn(null);
-        String acutal = aaa.CheckUser(userId, userName, userPassword, userRoleName);
+        String acutal = aaa.checkUser(userInstance);
         String expected = "The user is not exist.";
         verify(tenantManage).fetchUsers();
         verify(tenantManage).getUsersList();
         Assert.assertNotNull(aaa);
         Assert.assertEquals(expected,acutal);
     }
-}
\ No newline at end of file
+}

diff --git a/nemo-impl/src/test/java/org/opendaylight/nemo/user/transactionmanager/TransactionBeginTest.java b/nemo-impl/src/test/java/org/opendaylight/nemo/user/transactionmanager/TransactionBeginTest.java
index ed8642c2e4c184e0e7de4539f1e51e5c73ff7783..ca5eeeacefad37c516a95c19856ef005d0234150 100644 (file)
--- a/nemo-impl/src/test/java/org/opendaylight/nemo/user/transactionmanager/TransactionBeginTest.java
+++ b/nemo-impl/src/test/java/org/opendaylight/nemo/user/transactionmanager/TransactionBeginTest.java
@@ -23,11 +23,8 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.nemo.user.tenantmanager.AAA;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.common.rev151010.UserId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.common.rev151010.UserName;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.common.rev151010.UserPassword;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.common.rev151010.UserRoleName;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.intent.rev151010.BeginTransactionInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.user.rev151010.UserInstance;
 
 /**
  * Created by zhangmeng on 2015/11/20.
@@ -43,10 +40,9 @@ public class TransactionBeginTest extends TestCase {
     public void testTransactionbegin() throws Exception {
         AAA aaa = mock(AAA.class);
         BeginTransactionInput input = mock(BeginTransactionInput.class);
-        when(aaa.CheckUser(any(UserId.class),any(UserName.class),any(UserPassword.class),any(UserRoleName.class)))
-                .thenReturn(new String("test"));
+        when(aaa.checkUser(any(UserInstance.class))).thenReturn(new String("test"));
         String flag = transactionBegin.transactionbegin(aaa,input);
-        verify(aaa).CheckUser(any(UserId.class),any(UserName.class),any(UserPassword.class),any(UserRoleName.class));
+        verify(aaa).checkUser(any(UserInstance.class));
         Assert.assertEquals("test",flag);
     }
 }
\ No newline at end of file

diff --git a/nemo-impl/src/test/java/org/opendaylight/nemo/user/transactionmanager/TransactionEndTest.java b/nemo-impl/src/test/java/org/opendaylight/nemo/user/transactionmanager/TransactionEndTest.java
index bf4308ab0c1fdd1d96d32c472cb54b2dc772e083..6aec7b9e7ec1e7b300f484c73e844fca051e1a32 100644 (file)
--- a/nemo-impl/src/test/java/org/opendaylight/nemo/user/transactionmanager/TransactionEndTest.java
+++ b/nemo-impl/src/test/java/org/opendaylight/nemo/user/transactionmanager/TransactionEndTest.java
@@ -23,11 +23,8 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.nemo.user.tenantmanager.AAA;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.common.rev151010.UserId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.common.rev151010.UserName;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.common.rev151010.UserPassword;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.common.rev151010.UserRoleName;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.intent.rev151010.EndTransactionInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.user.rev151010.UserInstance;
 /**
  * Created by zhangmeng on 2015/11/20.
  */
@@ -42,10 +39,9 @@ public class TransactionEndTest extends TestCase {
     public void testTransactionend() throws Exception {
         AAA aaa = mock(AAA.class);
         EndTransactionInput input = mock(EndTransactionInput.class);
-        when(aaa.CheckUser(any(UserId.class),any(UserName.class),any(UserPassword.class),any(UserRoleName.class)))
-                .thenReturn(new String("test"));
+        when(aaa.checkUser(any(UserInstance.class))).thenReturn(new String("test"));
         String flag = transactionEnd.transactionend(aaa,input);
-        verify(aaa).CheckUser(any(UserId.class),any(UserName.class),any(UserPassword.class),any(UserRoleName.class));
+        verify(aaa).checkUser(any(UserInstance.class));
         Assert.assertEquals("test", flag);
     }
-}
\ No newline at end of file
+}