Fix for Push/Unpush Policy On GUI

[policy/engine.git] / POLICY-SDK-APP / src / main / java / org / onap / policy / controller / AutoPushController.java

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 b26709f..dc342ee 100644 (file)
--- 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
@@ -58,7 +58,7 @@ import org.onap.policy.rest.adapter.AutoPushTabAdapter;
 import org.onap.policy.rest.dao.CommonClassDao;
 import org.onap.policy.rest.jpa.PolicyEntity;
 import org.onap.policy.rest.jpa.PolicyVersion;
-import org.onap.policy.rest.util.PDPPolicyContainer;
+import org.onap.policy.rest.util.PdpPolicyContainer;
 import org.onap.policy.utils.PolicyUtils;
 import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.onap.policy.xacml.api.pap.OnapPDPGroup;
@@ -84,7 +84,7 @@ public class AutoPushController extends RestrictedBaseController {
     CommonClassDao commonClassDao;
 
     private PDPGroupContainer container;
-    private PDPPolicyContainer policyContainer;
+    private PdpPolicyContainer policyContainer;
     private PolicyController policyController;
     protected List<OnapPDPGroup> groups = Collections.synchronizedList(new ArrayList<>());
 
@@ -293,7 +293,7 @@ public class AutoPushController extends RestrictedBaseController {
                         }
                         // copy policy to PAP
                         try {
-                            controller.getPapEngine().copyPolicy(selectedPolicy, (StdPDPGroup) pdpDestinationGroupId);
+                            controller.getPapEngine().copyPolicy(selectedPolicy, (StdPDPGroup) pdpDestinationGroupId, userId);
                         } catch (PAPException e) {
                             logger.error("Exception Occured" + e);
                             return null;
@@ -377,7 +377,7 @@ public class AutoPushController extends RestrictedBaseController {
             logger.info(
                     "**********************************************************************************************");
 
-            policyContainer = new PDPPolicyContainer(group);
+            policyContainer = new PdpPolicyContainer(group);
             if (removePolicyData.size() > 0) {
                 IntStream.range(0, removePolicyData.size()).mapToObj(i -> removePolicyData.get(i).toString())
                         .forEach(polData -> this.policyContainer.removeItem(polData));
@@ -390,7 +390,7 @@ public class AutoPushController extends RestrictedBaseController {
                 updatedGroupObject.setPipConfigs(group.getPipConfigs());
                 updatedGroupObject.setStatus(group.getStatus());
                 updatedGroupObject.setOperation("delete");
-                this.container.updateGroup(updatedGroupObject);
+                this.container.updateGroup(updatedGroupObject, userId);
             }
 
             response.setContentType(PolicyUtils.APPLICATION_JSON);