Fixed the Policy API issues and Bugfixes

[policy/engine.git] / ECOMP-PAP-REST / src / main / java / org / openecomp / policy / pap / xacml / rest / components / AutoPushPolicy.java

diff --git a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/AutoPushPolicy.java b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/AutoPushPolicy.java
index 4d48593..b658483 100644 (file)
--- a/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/AutoPushPolicy.java
+++ b/ECOMP-PAP-REST/src/main/java/org/openecomp/policy/pap/xacml/rest/components/AutoPushPolicy.java
@@ -72,7 +72,7 @@ public class AutoPushPolicy {
         * @param papEngine
         */
        public Set<StdPDPGroup> checkGroupsToPush(String policyToCreateUpdate, PAPPolicyEngine papEngine) {
-               Set<StdPDPGroup> changedGroups= new HashSet<StdPDPGroup>();
+               Set<StdPDPGroup> changedGroups= new HashSet<>();
                // Check if the file has been modified. then re-load the properties file. 
                newModified = propFile.lastModified();
                try {
@@ -135,10 +135,8 @@ public class AutoPushPolicy {
                StdPDPPolicy policy = new StdPDPPolicy(policyId, true, policyName, null);
                //Get the current policies from the Group and Add the new one
         Set<PDPPolicy> currentPoliciesInGroup = pdpGroup.getPolicies();
-        Set<PDPPolicy> policies = new HashSet<PDPPolicy>();
-        if(policy!=null){
-                       policies.add(policy);
-               }
+        Set<PDPPolicy> policies = new HashSet<>();
+               policies.add(policy);
         pdpGroup.copyPolicyToFile(policyId, new FileInputStream(Paths.get(policyToCreateUpdate).toFile()));
         //If the selected policy is in the group we must remove it because the name is default
                Iterator<PDPPolicy> policyIterator = policies.iterator();