1 files changed, 9 insertions, 4 deletions
diff --git a/src/main/java/org/onap/aai/spike/service/SpikeService.java b/src/main/java/org/onap/aai/spike/service/SpikeService.java
index 3aa6dfe..8689903 100644
--- a/src/main/java/org/onap/aai/spike/service/SpikeService.java
+++ b/src/main/java/org/onap/aai/spike/service/SpikeService.java
@@ -21,6 +21,7 @@
 package org.onap.aai.spike.service;
 
 import java.util.Timer;
+import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import org.onap.aai.cl.api.Logger;
 import org.onap.aai.cl.eelf.LoggerFactory;
@@ -31,7 +32,11 @@ import org.onap.aai.spike.schema.EdgeRulesLoader;
 import org.onap.aai.spike.schema.OXMModelLoader;
 import org.onap.aai.spike.util.SpikeConstants;
 import org.onap.aai.spike.util.SpikeProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
 
+@Component
 public class SpikeService {
 
     private EventConsumer consumer;
@@ -39,12 +44,14 @@ public class SpikeService {
     private static Logger logger = LoggerFactory.getInstance().getLogger(SpikeService.class.getName());
     private Timer timer;
 
-    public SpikeService(EventConsumer consumer, EventPublisher publisher) {
+    @Autowired
+    public SpikeService(@Qualifier("dmaapEventConsumer") EventConsumer consumer,
+            @Qualifier("dmaapEventPublisher") EventPublisher publisher) {
         this.consumer = consumer;
         this.publisher = publisher;
     }
 
-
+    @PostConstruct
     public void startup() throws Exception {
 
         // Load models
@@ -68,8 +75,6 @@ public class SpikeService {
     protected void preShutdown() {
         logger.info(SpikeMsgs.SPIKE_SERVICE_STARTED_SUCCESSFULLY, consumer.getClass().getName());
         timer.cancel();
-
-
     }
 
 }