From fc5c07705edc4dcb7083b39116a43844bb6a1490 Mon Sep 17 00:00:00 2001
From: Ravindra Bakkamanthala <rb7147@att.com>
Date: Mon, 5 Jun 2017 22:42:02 -0400
Subject: Fixed the Policy API issues and Bugfixes

Change-Id: I6e8b54442421b6ebd0ff88426fc6e5f3a36b0690
Signed-off-by: Ravindra Bakkamanthala <rb7147@att.com>
---
 .../pap/xacml/rest/components/ActionPolicy.java    | 23 +++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/ActionPolicy.java')

diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/ActionPolicy.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/ActionPolicy.java
index 1884aab62..45ef01f6e 100644
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/ActionPolicy.java
+++ b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/ActionPolicy.java
@@ -328,8 +328,7 @@ public class ActionPolicy extends Policy {
 
 		// Add JSON_URL Assignment:
 		String actionBody = getActionPolicyDict(comboDictValue).getBody();
-		if (!actionBody.equals(null)) {
-		//if(!(actionBody==null || "".equals(actionBody))){
+		if (actionBody != null) {
 			AttributeAssignmentExpressionType assignmentJsonURL = new AttributeAssignmentExpressionType();
 			assignmentJsonURL.setAttributeId(BODY_ATTRIBUTEID);
 			assignmentJsonURL.setCategory(CATEGORY_RESOURCE);
@@ -342,7 +341,7 @@ public class ActionPolicy extends Policy {
 			obligation.getAttributeAssignmentExpression().add(assignmentJsonURL);
 		}
 
-		if(!getActionPolicyDict(comboDictValue).getHeader().equals(null)){
+		if(getActionPolicyDict(comboDictValue).getHeader() != null){
 			String headerVal = getActionPolicyDict(comboDictValue).getHeader();
 			if(headerVal != null && !headerVal.equals("")){
 				// parse it on : to get number of headers
@@ -484,21 +483,23 @@ public class ActionPolicy extends Policy {
 	
 	private Map<String,String> createDropDownMap(){
 		JPAUtils jpaUtils = null;
+		Map<String, String> dropDownMap = new HashMap<>();
 		try {
 			jpaUtils = JPAUtils.getJPAUtilsInstance(XACMLPapServlet.getEmf());
 		} catch (Exception e) {
 			LOGGER.error("Exception Occured"+e);
 		}
-		Map<Datatype, List<FunctionDefinition>> functionMap = jpaUtils.getFunctionDatatypeMap();
-		Map<String, String> dropDownMap = new HashMap<>();
-		for (Datatype id : functionMap.keySet()) {
-			List<FunctionDefinition> functionDefinitions = (List<FunctionDefinition>) functionMap
-					.get(id);
-			for (FunctionDefinition functionDef : functionDefinitions) {
-				dropDownMap.put(functionDef.getShortname(),functionDef.getXacmlid());
+		if(jpaUtils != null){
+			Map<Datatype, List<FunctionDefinition>> functionMap = jpaUtils.getFunctionDatatypeMap();
+			
+			for (Datatype id : functionMap.keySet()) {
+				List<FunctionDefinition> functionDefinitions = (List<FunctionDefinition>) functionMap
+						.get(id);
+				for (FunctionDefinition functionDef : functionDefinitions) {
+					dropDownMap.put(functionDef.getShortname(),functionDef.getXacmlid());
+				}
 			}
 		}
-		
 		return dropDownMap;
 	}
 	
-- 
cgit 1.2.3-korg