diff options
author | Michael Arrastia <MArrasti@amdocs.com> | 2018-07-13 17:00:13 +0100 |
---|---|---|
committer | Michael Arrastia <MArrasti@amdocs.com> | 2018-07-13 17:00:13 +0100 |
commit | f3ebf3538abbf63d8455d42f259f61dfdbf6ad30 (patch) | |
tree | 0a678dd50c7635e1d1e3a3ceca4eb53baf659ea1 /src/main/java/org/onap/aai/spike/service/SpikeService.java | |
parent | 7d3dcdbff807ba1facb84f94ac39ff91bf410b29 (diff) |
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>
Diffstat (limited to 'src/main/java/org/onap/aai/spike/service/SpikeService.java')
-rw-r--r-- | src/main/java/org/onap/aai/spike/service/SpikeService.java | 13 |
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(); - - } } |