X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=ONAP-PAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2Fmodel%2FRemoveGroupPolicy.java;h=b83db1f0748edf0de68af36a1cb691f887edd68e;hp=d05a1ab6eaab2b4f9b7ef01ba1ce571dcf6de5e1;hb=1e61676b77dd09659027b8984f050df7e8538526;hpb=1bfd18f999cda39a7b27bef8972864aafe59aecb

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 d05a1ab6e..b83db1f07 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
@@ -2,14 +2,14 @@
  * ============LICENSE_START=======================================================
  * ONAP-PAP-REST
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,85 +20,101 @@
 
 package org.onap.policy.pap.xacml.rest.model;
 
+import com.att.research.xacml.api.pap.PDPPolicy;
+
 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;
 
-import com.att.research.xacml.api.pap.PDPPolicy;
-
 public class RemoveGroupPolicy {
 
-	
-	//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) {
+    // Container from where we are fetching the policies
+    private static PDPPolicyContainer policyContainer;
+
+    private StdPDPGroup updatedObject;
+    private final StdPDPGroup group;
+    private boolean isSaved = false;
+
+    /**
+     * Instantiates a new removes the group policy.
+     *
+     * @param group the group
+     */
+    public RemoveGroupPolicy(StdPDPGroup group) {
+
+        this.group = group;
+
+    }
+
+    /**
+     * Prepare to remove.
+     */
+    public void prepareToRemove() {
+        if (this.group == null) {
+            return;
+        }
+        setRemoveGroupPolicy(new PDPPolicyContainer(group));
+    }
+
+    /**
+     * Removes the policy.
+     *
+     * @param policy the policy
+     */
+    public void removePolicy(PDPPolicy policy) {
+        RemoveGroupPolicy.policyContainer.removeItem(policy);
+        this.doSave();
+        this.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;
-	}
+    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;
+    }
+
+    /**
+     * Gets the group.
+     *
+     * @return the group
+     */
+    public StdPDPGroup getGroup() {
+        return group;
+    }
 
 }