Commit includes ControlLoopPolicy API and bugfixes

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

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 fe295eb..136f222 100644 (file)
--- 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 {
@@ -158,15 +156,12 @@ public class NotificationServer {
                        // to succeed before giving up. If any messages are unsent after that time,
                        // they're returned to your app. You could, for example, persist to disk
                        // and try again later.
-                       final List stuck = pub.close ( 20, TimeUnit.SECONDS );
+                       final List<?> stuck = pub.close ( 20, TimeUnit.SECONDS );
                        
-                       if ( stuck.size () > 0 )
-                       {
-                               System.err.println ( stuck.size() + " messages unsent" );
-                       }
-                       else
-                       {
-                               System.out.println ( "Clean exit; all messages sent: " + notification );
+                       if ( stuck.size () > 0 ){
+                               LOGGER.error( stuck.size() + " messages unsent" );
+                       }else{
+                               LOGGER.info( "Clean exit; all messages sent: " + notification );
                        }
                        
                } else if (propNotificationType.equals("dmaap")) {
@@ -192,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);
                                }