diff options
author | 2017-05-23 14:56:12 -0400 | |
---|---|---|
committer | 2017-05-23 16:49:56 -0400 | |
commit | 87c95be02a8a4d77e165dede90777e811b59dcae (patch) | |
tree | 4712199fc3520b530dda0c4d3b074c327df547f2 /ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications | |
parent | 7e547eaa55920dfbc9691eab33bb728395b50cf2 (diff) |
Commit includes ControlLoopPolicy API and bugfixes
Change-Id: I3e18bb8b4c31a0d908bb0cff4c85e2a3fb450a63
Signed-off-by: Ravindra Bakkamanthala <rb7147@att.com>
Diffstat (limited to 'ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications')
3 files changed, 7 insertions, 9 deletions
diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications/ManualNotificationUpdateThread.java b/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications/ManualNotificationUpdateThread.java index 1acc18eb0..27d6b6f76 100644 --- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications/ManualNotificationUpdateThread.java +++ b/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications/ManualNotificationUpdateThread.java @@ -97,7 +97,7 @@ public class ManualNotificationUpdateThread implements Runnable { String consumerTopic = aURL.getHost() + aURL.getPort() + "UpdateRequest"; SendMessage(consumerTopic, "Starting-Topic"); - final LinkedList<String> urlList = new LinkedList<String> (); + final LinkedList<String> urlList = new LinkedList<> (); for ( String u : clusterList.split ( "," ) ){ urlList.add ( u ); } @@ -151,7 +151,7 @@ public class ManualNotificationUpdateThread implements Runnable { String consumerTopic = XACMLProperties.getProperty(XACMLRestProperties.PROP_NOTIFICATION_TOPIC).trim(); SendMessage(consumerTopic, "Starting-Topic"); - dmaapList = new ArrayList<String>(); + dmaapList = new ArrayList<>(); for ( String u : dmaapServers.split ( "," ) ){ dmaapList.add ( u ); } 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 4c933776c..ed2fbd1f4 100644 --- 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){ diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications/NotificationServer.java b/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications/NotificationServer.java index cb1cf9f03..136f22268 100644 --- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications/NotificationServer.java +++ b/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/notifications/NotificationServer.java @@ -140,10 +140,8 @@ public class NotificationServer { } catch (MalformedURLException e1) { LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error creating the UEB publisher" + e1.getMessage()); - e1.printStackTrace(); } catch (GeneralSecurityException e1) { LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error creating the UEB publisher" + e1.getMessage()); - e1.printStackTrace(); } try { @@ -189,7 +187,7 @@ public class NotificationServer { if(dmaapServers.contains(",")) { dmaapList = new ArrayList<String>(Arrays.asList(dmaapServers.split("\\s*,\\s*"))); } else { - dmaapList = new ArrayList<String>(); + dmaapList = new ArrayList<>(); dmaapList.add(dmaapServers); } |