Merge of new rebased code

[appc.git] / appc-event-listener / appc-event-listener-bundle / src / main / java / org / openecomp / appc / listener / LCM / impl / ListenerImpl.java

diff --git a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/impl/ListenerImpl.java b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/impl/ListenerImpl.java
index dd877e9..408e97a 100644 (file)
--- a/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/impl/ListenerImpl.java
+++ b/appc-event-listener/appc-event-listener-bundle/src/main/java/org/openecomp/appc/listener/LCM/impl/ListenerImpl.java
@@ -46,17 +46,20 @@ public class ListenerImpl extends AbstractListener {
 
     private long startTime = 0;
 
+    private final ProviderOperations providerOperations;
+
     public ListenerImpl(ListenerProperties props) {
         super(props);
 
         String url = props.getProperty("provider.url");
         LOG.info("DMaaP Provider Endpoint: " + url);
-        ProviderOperations.setUrl(url);
+        providerOperations = new ProviderOperations();
+        providerOperations.setUrl(url);
 
         // Set Basic Auth
         String user = props.getProperty("provider.user");
         String pass = props.getProperty("provider.pass");
-        ProviderOperations.setAuthentication(user, pass);
+        providerOperations.setAuthentication(user, pass);
     }
 
     @Override
@@ -91,7 +94,7 @@ public class ListenerImpl extends AbstractListener {
                             if (isValid(incoming)) {
                                 LOG.info(String.format("Adding DMaaP message to pool queue [%s]", requestIdWithSubId));
                                 try {
-                                    executor.execute(new WorkerImpl(incoming.getRpcName(),incoming.getBody(), dmaap));
+                                    executor.execute(new WorkerImpl(incoming, dmaap, providerOperations));
                                 } catch (RejectedExecutionException rejectEx) {
                                     LOG.error("Task Rejected: ", rejectEx);
                                 }