Re-introduce Spring XML based configuration

This is to retain existing Spring XML based configuration in the
microservice and continue to support switching message bus
implementations through the existing beans XML file resource.

The Java based configuration, though feasible, introduced complexity.
We are going to take the pragmatic approach of handling topic password
de-obfuscation centrally in the event-client.

Change-Id: I1c0ed92cdc155a5d848f94dafedb6c69af88b681
Issue-ID: AAI-1388
Signed-off-by: Michael Arrastia <MArrasti@amdocs.com>

1 files changed, 1 insertions, 9 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 8689903..de6332a 100644
--- a/src/main/java/org/onap/aai/spike/service/SpikeService.java
+++ b/src/main/java/org/onap/aai/spike/service/SpikeService.java
@@ -21,7 +21,6 @@
 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;
@@ -32,11 +31,7 @@ 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;
@@ -44,14 +39,11 @@ public class SpikeService {
     private static Logger logger = LoggerFactory.getInstance().getLogger(SpikeService.class.getName());
     private Timer timer;
 
-    @Autowired
-    public SpikeService(@Qualifier("dmaapEventConsumer") EventConsumer consumer,
-            @Qualifier("dmaapEventPublisher") EventPublisher publisher) {
+    public SpikeService(EventConsumer consumer, EventPublisher publisher) {
         this.consumer = consumer;
         this.publisher = publisher;
     }
 
-    @PostConstruct
     public void startup() throws Exception {
 
         // Load models