Move XML based Spring configuration to Java

- The original externalised Spring XML-based configuration deployed to:
    /opt/app/spike-service/dynamic/conf/spike-beans.xml
  has been replaced with Spring Java based configuration.
- Event consumer and publisher configuration is now in property files.
  This now allows obfuscation of passwords.
- Bean creation now allows pre-processing the topic properties.
  For example, the password can now be de-obfuscated before it is
  passed into the bean constructor.

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

1 files changed, 4 insertions, 4 deletions

diff --git a/src/main/java/org/onap/aai/spike/SpikeApplication.java b/src/main/java/org/onap/aai/spike/SpikeApplication.java
index e031de3..33760de 100644
--- a/src/main/java/org/onap/aai/spike/SpikeApplication.java
+++ b/src/main/java/org/onap/aai/spike/SpikeApplication.java
@@ -1,9 +1,9 @@
 /**
- * ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017-2018 European Software Marketing Ltd.
+ * Copyright © 2017-2018 Amdocs
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,13 +25,13 @@ import org.eclipse.jetty.util.security.Password;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-import org.springframework.context.annotation.ImportResource;
+import org.springframework.context.annotation.Import;
 
 /**
  * Spike service Spring Boot Application
  */
 @SpringBootApplication
-@ImportResource({"file:${SERVICE_BEANS}/*.xml"})
+@Import({ EventConsumerConfiguration.class, EventPublisherConfiguration.class })
 public class SpikeApplication extends SpringBootServletInitializer {
 
     public static void main(String[] args) {