[Policy-20] getConfig & Policy resolved blockers

[policy/engine.git] / ECOMP-PDP-REST / src / main / java / org / openecomp / policy / pdp / rest / notifications / NotificationController.java

diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications/NotificationController.java b/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications/NotificationController.java
index 4c93377..a226a3a 100644 (file)
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications/NotificationController.java
+++ b/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications/NotificationController.java
@@ -85,8 +85,8 @@ public class NotificationController {
                boolean updated = false;
                boolean removed = false;
                Notification notification = new Notification();
-               HashSet<Removed> removedPolicies = new HashSet<Removed>();
-               HashSet<Updated> updatedPolicies = new HashSet<Updated>();
+               HashSet<Removed> removedPolicies = new HashSet<>();
+               HashSet<Updated> updatedPolicies = new HashSet<>();
 
                if (oldStatus == null) {
                        oldStatus = newStatus;
@@ -229,7 +229,7 @@ public class NotificationController {
                                while (allOfs.hasNext()) {
                                        AllOf allOf = allOfs.next();
                                        Iterator<Match> matches = allOf.getMatches();
-                                       HashMap<String, String> matchValues = new HashMap<String, String>();
+                                       HashMap<String, String> matchValues = new HashMap<>();
                                        while (matches.hasNext()) {
                                                Match match = matches.next();
                                                LOGGER.info("Attribute Value is: "+ match.getAttributeValue().getValue().toString());
@@ -339,7 +339,7 @@ public class NotificationController {
             if(updated && removed){
                 notification.setNotificationType(NotificationType.BOTH);
                 if(notification.getLoadedPolicies()!=null){
-                    HashSet<Updated> updatedPolicies = new HashSet<Updated>(); 
+                    HashSet<Updated> updatedPolicies = new HashSet<>(); 
                     for(Updated oldUpdatedPolicy: notification.getLoadedPolicies()){
                         Updated updatePolicy = oldUpdatedPolicy;
                         if(notification.getRemovedPolicies()!=null){
@@ -377,7 +377,7 @@ public class NotificationController {
                                delete = true;
                                dir = new File(XACMLProperties.getProperty(XACMLRestProperties.PROP_PDP_WEBAPPS)+File.separator+"Action");
                        }
-                       if(delete && dir!=null){
+                       if(delete){
                                FileFilter fileFilter = new WildcardFileFilter(oldPolicy.getId().substring(0, oldPolicy.getId().lastIndexOf("."))+".*");
                                File[] configFile = dir.listFiles(fileFilter);
                                if(configFile.length==1){
@@ -385,9 +385,7 @@ public class NotificationController {
                                }
                        }
                }catch(Exception e){
-                       LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Couldn't remove the policy/config file " + oldPolicy.getName());
-                       // TODO:EELF Cleanup - Remove LOGGER
-                       //PolicyLogger.error(MessageCodes.ERROR_PROCESS_FLOW, e, "Couldn't remove the policy file " + oldPolicy.getName());
+                       LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Couldn't remove the policy/config file " + oldPolicy.getName() + e);
                }
        }