X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-PAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2Fmodel%2FRemoveGroupPolicy.java;h=2d98b820d6203ada015a83e7c2e6d9dd102a40cc;hb=4068da123ee33b532b4b52f15545c76a978f977e;hp=7645535b03987e8124b45b2d2b248d551de3184a;hpb=073cc188efe9abb4c010cf674e34e2cf46ef1c52;p=policy%2Fengine.git

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/model/RemoveGroupPolicy.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/model/RemoveGroupPolicy.java
index 7645535b0..2d98b820d 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/model/RemoveGroupPolicy.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/model/RemoveGroupPolicy.java
@@ -24,6 +24,7 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.onap.policy.rest.util.PDPPolicyContainer;
 import org.onap.policy.xacml.api.pap.OnapPDPGroup;
 import org.onap.policy.xacml.std.pap.StdPDPGroup;
 
@@ -31,72 +32,74 @@ import com.att.research.xacml.api.pap.PDPPolicy;
 
 public class RemoveGroupPolicy {
 
-	
-	//Container from where we are fetching the policies
-	private static PDPPolicyContainer policyContainer;
-		
-	private final RemoveGroupPolicy self = this;
-	private StdPDPGroup updatedObject;
-	private final StdPDPGroup group;
-	private boolean isSaved = false;
-	
-	public RemoveGroupPolicy(StdPDPGroup group) {
-		
-		this.group = group;
-		
-	}
-	
-	public void prepareToRemove(PDPPolicy policy) {
-		
-		if (this.group == null) {
-			return;
-		}
-
-		RemoveGroupPolicy.policyContainer = new PDPPolicyContainer(group);
-
-		RemoveGroupPolicy.policyContainer.removeItem(policy);
-									
-		self.doSave();
-		
-		self.isSaved = true;
-		
-	}
-	
-	@SuppressWarnings("unchecked")
-	protected void doSave() {
-		if (this.group == null) {
-			return;
-		}
-		
-		//StdPDPGroup pdpGroup = (StdPDPGroup) group;
-		StdPDPGroup updatedGroupObject = new StdPDPGroup(
-				group.getId(), 
-				group.isDefaultGroup(), 
-				group.getName(), 
-				group.getDescription(), 
-				null);
-		
-		// replace the original set of Policies with the set from the container (possibly modified by the user)
-		Set<PDPPolicy> changedPolicies = new HashSet<>();
-		changedPolicies.addAll((Collection<PDPPolicy>) RemoveGroupPolicy.policyContainer.getItemIds());
-		updatedGroupObject.setPolicies(changedPolicies);
-		updatedGroupObject.setOnapPdps(this.group.getOnapPdps());
-		
-		// replace the original set of PIP Configs with the set from the container
-		updatedGroupObject.setPipConfigs(this.group.getPipConfigs());
-		
-		// copy those things that the user cannot change from the original to the new object
-		updatedGroupObject.setStatus(this.group.getStatus());
-		
-		this.updatedObject = updatedGroupObject;			
-	}
-	
-	public boolean isRemoved() {
-		return this.isSaved;
-	}
-		
-	public OnapPDPGroup getUpdatedObject() {
-		return this.updatedObject;
-	}
+
+    //Container from where we are fetching the policies
+    private static PDPPolicyContainer policyContainer;
+
+    private RemoveGroupPolicy self = this;
+    private StdPDPGroup updatedObject;
+    private final StdPDPGroup group;
+    private boolean isSaved = false;
+
+    public RemoveGroupPolicy(StdPDPGroup group) {
+
+        this.group = group;
+
+    }
+
+    public void prepareToRemove(PDPPolicy policy) {
+
+        if (this.group == null) {
+            return;
+        }
+        setRemoveGroupPolicy(new PDPPolicyContainer(group));
+
+        RemoveGroupPolicy.policyContainer.removeItem(policy);
+
+        self.doSave();
+
+        self.isSaved = true;
+
+    }
+
+    private static void setRemoveGroupPolicy(PDPPolicyContainer pdpPolicyContainer) {
+        RemoveGroupPolicy.policyContainer = pdpPolicyContainer;
+    }
+
+    @SuppressWarnings("unchecked")
+    protected void doSave() {
+        if (this.group == null) {
+            return;
+        }
+
+        StdPDPGroup updatedGroupObject = new StdPDPGroup(
+                group.getId(),
+                group.isDefaultGroup(),
+                group.getName(),
+                group.getDescription(),
+                null);
+
+        // replace the original set of Policies with the set from the container (possibly modified by the user)
+        Set<PDPPolicy> changedPolicies = new HashSet<>();
+        changedPolicies.addAll((Collection<PDPPolicy>) RemoveGroupPolicy.policyContainer.getItemIds());
+        updatedGroupObject.setPolicies(changedPolicies);
+        updatedGroupObject.setOnapPdps(this.group.getOnapPdps());
+
+        // replace the original set of PIP Configs with the set from the container
+        updatedGroupObject.setPipConfigs(this.group.getPipConfigs());
+
+        // copy those things that the user cannot change from the original to the new object
+        updatedGroupObject.setStatus(this.group.getStatus());
+
+        this.updatedObject = updatedGroupObject;
+    }
+
+    public boolean isRemoved() {
+        return this.isSaved;
+    }
+
+    public OnapPDPGroup getUpdatedObject() {
+        return this.updatedObject;
+    }
 
 }