Junit Test Cases & Raptors

Issue-ID: PORTAL-273. PORTAL-301
Covered JUNITS for sdk modules and RAPTOR reports fixes

Change-Id: Ifaf3bf06f0ec123051a791cc8e7f10662f97a525
Signed-off-by: Kishore Reddy, Gujja (kg811t) <kg811t@research.att.com>

1 files changed, 24 insertions, 22 deletions

diff --git a/ecomp-sdk/epsdk-aaf/src/main/java/org/onap/portalsdk/external/authorization/service/UserApiServiceImpl.java b/ecomp-sdk/epsdk-aaf/src/main/java/org/onap/portalsdk/external/authorization/service/UserApiServiceImpl.java
index 8425f7da..fb320c17 100644
--- a/ecomp-sdk/epsdk-aaf/src/main/java/org/onap/portalsdk/external/authorization/service/UserApiServiceImpl.java
+++ b/ecomp-sdk/epsdk-aaf/src/main/java/org/onap/portalsdk/external/authorization/service/UserApiServiceImpl.java
@@ -33,7 +33,7 @@
  *
  * ============LICENSE_END============================================
  *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * 
  */
 package org.onap.portalsdk.external.authorization.service;
 
@@ -207,28 +207,30 @@ public class UserApiServiceImpl implements UserApiService {
 							role.setPriority(Integer.valueOf(roleDesc.getPriority()));
 						}
 					}
-					for (ExternalAccessPerms extPerm : roleDesc.getPermissions()) {
-						RoleFunction roleFunction = new RoleFunction();
-						roleFunction.setCode(extPerm.getInstance());
-						roleFunction.setAction(extPerm.getAction());
-						if (extPerm.getDescription() != null
-								&& EcompExternalAuthUtils.checkNameSpaceMatching(extPerm.getType(), namespace)) {
-							roleFunction.setName(extPerm.getDescription());
-						} else if (extPerm.getDescription() == null
-								&& EcompExternalAuthUtils.checkNameSpaceMatching(extPerm.getType(), namespace)) {
-							roleFunction.setName(extPerm.getType().substring(namespace.length() + 1) + "|"
-									+ extPerm.getInstance() + "|" + extPerm.getAction());
-						} else if (extPerm.getDescription() == null
-								&& !EcompExternalAuthUtils.checkNameSpaceMatching(extPerm.getType(), namespace)) {
-							roleFunction.setName(
-									extPerm.getType() + "|" + extPerm.getInstance() + "|" + extPerm.getAction());
+					if (roleDesc.getPermissions() != null) {
+						for (ExternalAccessPerms extPerm : roleDesc.getPermissions()) {
+							RoleFunction roleFunction = new RoleFunction();
+							roleFunction.setCode(extPerm.getInstance());
+							roleFunction.setAction(extPerm.getAction());
+							if (extPerm.getDescription() != null
+									&& EcompExternalAuthUtils.checkNameSpaceMatching(extPerm.getType(), namespace)) {
+								roleFunction.setName(extPerm.getDescription());
+							} else if (extPerm.getDescription() == null
+									&& EcompExternalAuthUtils.checkNameSpaceMatching(extPerm.getType(), namespace)) {
+								roleFunction.setName(extPerm.getType().substring(namespace.length() + 1) + "|"
+										+ extPerm.getInstance() + "|" + extPerm.getAction());
+							} else if (extPerm.getDescription() == null
+									&& !EcompExternalAuthUtils.checkNameSpaceMatching(extPerm.getType(), namespace)) {
+								roleFunction.setName(
+										extPerm.getType() + "|" + extPerm.getInstance() + "|" + extPerm.getAction());
+							}
+							if (EcompExternalAuthUtils.checkNameSpaceMatching(extPerm.getType(), namespace)) {
+								roleFunction.setType(extPerm.getType().substring(namespace.length() + 1));
+							} else {
+								roleFunction.setType(extPerm.getType());
+							}
+							roleFunctions.add(roleFunction);
 						}
-						if (EcompExternalAuthUtils.checkNameSpaceMatching(extPerm.getType(), namespace)) {
-							roleFunction.setType(extPerm.getType().substring(namespace.length() + 1));
-						} else {
-							roleFunction.setType(extPerm.getType());
-						}
-						roleFunctions.add(roleFunction);
 					}
 				}
 				role.setRoleFunctions(roleFunctions);