X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fcontroller%2FAutoPushController.java;h=9ade81d1777b0c95cd91d0dd18cad10e24fbaa68;hb=b65e96826d7339ce29ddb73e3ed6775bd4f54753;hp=c1468e36527f40eaab9ba7c2b3793e76d19240eb;hpb=80f072f60509ef3a35369a60857fe05f6c2a993a;p=policy%2Fengine.git

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AutoPushController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AutoPushController.java
index c1468e365..9ade81d17 100644
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AutoPushController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AutoPushController.java
@@ -47,6 +47,7 @@ import org.onap.policy.common.logging.flexlogger.FlexLogger;
 import org.onap.policy.common.logging.flexlogger.Logger;
 import org.onap.policy.model.PDPGroupContainer;
 import org.onap.policy.model.PDPPolicyContainer;
+import org.onap.policy.model.Roles;
 import org.onap.policy.rest.adapter.AutoPushTabAdapter;
 import org.onap.policy.rest.dao.CommonClassDao;
 import org.onap.policy.rest.jpa.PolicyEntity;
@@ -55,10 +56,9 @@ import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.onap.policy.xacml.api.pap.OnapPDPGroup;
 import org.onap.policy.xacml.std.pap.StdPDPGroup;
 import org.onap.policy.xacml.std.pap.StdPDPPolicy;
-import org.openecomp.policy.model.Roles;
-import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
-import org.openecomp.portalsdk.core.web.support.JsonMessage;
-import org.openecomp.portalsdk.core.web.support.UserUtils;
+import org.onap.portalsdk.core.controller.RestrictedBaseController;
+import org.onap.portalsdk.core.web.support.JsonMessage;
+import org.onap.portalsdk.core.web.support.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
@@ -120,7 +120,7 @@ public class AutoPushController extends RestrictedBaseController{
 		try{
 			Set<String> scopes = null;
 			List<String> roles = null;
-			data = new ArrayList<Object>();
+			data = new ArrayList<>();
 			String userId = UserUtils.getUserSession(request).getOrgUserId();
 			Map<String, Object> model = new HashMap<>();
 			ObjectMapper mapper = new ObjectMapper();
@@ -187,6 +187,12 @@ public class AutoPushController extends RestrictedBaseController{
 			this.container = new PDPGroupContainer(controller.getPapEngine());
 			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 			JsonNode root = mapper.readTree(request.getReader());
+			
+			String userId = UserUtils.getUserSession(request).getOrgUserId();
+			logger.info("****************************************Logging UserID while Pushing  Policy to PDP Group*****************************************");
+			logger.info("UserId:  " + userId + "Push Policy Data:  "+ root.get("pushTabData").toString());
+			logger.info("***********************************************************************************************************************************");
+			
 			AutoPushTabAdapter adapter = mapper.readValue(root.get("pushTabData").toString(), AutoPushTabAdapter.class);
 			for (Object pdpGroupId :  adapter.getPdpDatas()) {
 				LinkedHashMap<?, ?> selectedPDP = (LinkedHashMap<?, ?>)pdpGroupId;
@@ -224,7 +230,7 @@ public class AutoPushController extends RestrictedBaseController{
 					String id = name;
 					if (id.endsWith(".xml")) {
 						id = id.replace(".xml", "");
-						id = id.substring(0, id.lastIndexOf("."));
+						id = id.substring(0, id.lastIndexOf('.'));
 					}
 					
 					// Default policy to be Root policy; user can change to deferred
@@ -342,13 +348,19 @@ public class AutoPushController extends RestrictedBaseController{
 			ObjectMapper mapper = new ObjectMapper();
 			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 			JsonNode root = mapper.readTree(request.getReader());  
-			StdPDPGroup group = (StdPDPGroup)mapper.readValue(root.get("activePdpGroup").toString(), StdPDPGroup.class);
+			StdPDPGroup group = mapper.readValue(root.get("activePdpGroup").toString(), StdPDPGroup.class);
 			JsonNode removePolicyData = root.get("data");
+			
+			String userId = UserUtils.getUserSession(request).getOrgUserId();
+			logger.info("****************************************Logging UserID while Removing Policy from PDP Group*****************************************");
+			logger.info("UserId:  " + userId + "PDP Group Data:  "+ root.get("activePdpGroup").toString() + "Remove Policy Data: "+root.get("data"));
+			logger.info("***********************************************************************************************************************************");
+			
 			policyContainer = new PDPPolicyContainer(group);
 			if(removePolicyData.size() > 0){
 				for(int i = 0 ; i < removePolicyData.size(); i++){
-					String data = removePolicyData.get(i).toString();
-					this.policyContainer.removeItem(data);
+					String polData = removePolicyData.get(i).toString();
+					this.policyContainer.removeItem(polData);
 				}
 				Set<PDPPolicy> changedPolicies = new HashSet<>();
 				changedPolicies.addAll((Collection<PDPPolicy>) this.policyContainer.getItemIds());
@@ -383,4 +395,4 @@ public class AutoPushController extends RestrictedBaseController{
 		return null;
 	}
 
-}
\ No newline at end of file
+}