From e1c60de96c10831785d6fe8a7e345a89158b5d59 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Mon, 23 Nov 2015 16:36:18 -0800 Subject: [PATCH] Refactor AAA.checkUser() Change-Id: Idd767a3bb1808b0b7f3fd248e403a88d4c2f4de5 Signed-off-by: Gary Wu --- .../user/advancedquery/AdvancedQuery.java | 2 +- .../nemo/user/tenantmanager/AAA.java | 7 ++++++- .../transactionmanager/TransactionBegin.java | 2 +- .../transactionmanager/TransactionEnd.java | 2 +- .../languagestyle/LanguageIntent.java | 2 +- .../deleteintent/DeleteIntent.java | 2 +- .../updateintent/UpdateIntent.java | 2 +- .../nemo/user/tenantmanager/AAATest.java | 19 +++++-------------- .../TransactionBeginTest.java | 10 +++------- .../TransactionEndTest.java | 12 ++++-------- 10 files changed, 24 insertions(+), 36 deletions(-) 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 5e746c2..e0b5d70 100644 --- 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; List queryConditionList = null; - errorInfo = aaa.CheckUser(input.getUserId(),input.getUserName(),input.getUserPassword(),input.getUserRole()); + errorInfo = aaa.checkUser(input); if (errorInfo != null) { 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 a1a4753..e9b959b 100644 --- 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; 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.users.User; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.nemo.user.rev151010.UserInstance; import java.util.List; @@ -29,7 +30,11 @@ public class AAA { this.tenantManage = tenantManage; } - public String CheckUser(UserId userId, UserName userName, UserPassword userPassword, UserRoleName userRoleName) + public String checkUser(UserInstance user) { + return checkUser(user.getUserId(), user.getUserName(), user.getUserPassword(), user.getUserRole()); + } + + private String checkUser(UserId userId, UserName userName, UserPassword userPassword, UserRoleName userRoleName) { tenantManage.fetchUsers(); List userList = tenantManage.getUsersList(); 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 b0f7eb2..c8ed4e2 100644 --- 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) { String errorInfo = null; - errorInfo = aaa.CheckUser(input.getUserId(),input.getUserName(),input.getUserPassword(),input.getUserRole()); + errorInfo = aaa.checkUser(input); return errorInfo; } } 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 c4f2f7b..910cbf3 100644 --- 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) { String errorInfo = null; - errorInfo = aaa.CheckUser(input.getUserId(),input.getUserName(),input.getUserPassword(),input.getUserRole()); + errorInfo = aaa.checkUser(input); return errorInfo; } } 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 670d1b5..1f226e2 100644 --- 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 { String errorInfo = null; - errorInfo = aaa.CheckUser(languageStyleNemoRequestInput.getUserId(),languageStyleNemoRequestInput.getUserName(),languageStyleNemoRequestInput.getUserPassword(),languageStyleNemoRequestInput.getUserRole()); + errorInfo = aaa.checkUser(languageStyleNemoRequestInput); if (errorInfo !=null) { return errorInfo; 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 1eaba1b..03fb29e 100644 --- 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 { { String errorInfo = null; - errorInfo = aaa.CheckUser(styleNemoDeleteInput.getUserId(),styleNemoDeleteInput.getUserName(),styleNemoDeleteInput.getUserPassword(),styleNemoDeleteInput.getUserRole()); + errorInfo = aaa.checkUser(styleNemoDeleteInput); if (errorInfo != null) { 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 1a34b9b..ea9a7f1 100644 --- 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 { String erroInfo = null; - erroInfo = aaa.CheckUser(structureStyleNemoUpdateInput.getUserId(),structureStyleNemoUpdateInput.getUserName(),structureStyleNemoUpdateInput.getUserPassword(),structureStyleNemoUpdateInput.getUserRole()); + erroInfo = aaa.checkUser(structureStyleNemoUpdateInput); if (erroInfo != null) { 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 976f588..98f669a 100644 --- 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 ed8642c..ca5eeea 100644 --- 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 bf4308a..6aec7b9 100644 --- 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 +} -- 2.36.6