X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=aai-core%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fdmaap%2FAAIDmaapEventJMSConsumer.java;fp=aai-core%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fdmaap%2FAAIDmaapEventJMSConsumer.java;h=49cc0e90c68850faf26bf0cc50806e89d5eeaae5;hb=f626a9868b89d7ce928504c131d3d4109accc947;hp=5e28b3afcc97cb9a22ee6b48eb6d279cf66596f0;hpb=75370173d19e97967d34b3c117f1e3c0820c2553;p=aai%2Faai-common.git

diff --git a/aai-core/src/main/java/org/onap/aai/dmaap/AAIDmaapEventJMSConsumer.java b/aai-core/src/main/java/org/onap/aai/dmaap/AAIDmaapEventJMSConsumer.java
index 5e28b3af..49cc0e90 100644
--- a/aai-core/src/main/java/org/onap/aai/dmaap/AAIDmaapEventJMSConsumer.java
+++ b/aai-core/src/main/java/org/onap/aai/dmaap/AAIDmaapEventJMSConsumer.java
@@ -21,26 +21,24 @@ package org.onap.aai.dmaap;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
+import java.util.Objects;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.TextMessage;
 import org.apache.log4j.MDC;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.onap.aai.config.SpringContextAware;
 import org.onap.aai.logging.LogFormatTools;
 import org.onap.aai.logging.LoggingContext;
 import org.onap.aai.logging.LoggingContext.LoggingField;
 import org.onap.aai.logging.LoggingContext.StatusCode;
-import org.springframework.context.ApplicationContext;
 import org.springframework.core.env.Environment;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.web.client.RestTemplate;
 
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.TextMessage;
-
 public class AAIDmaapEventJMSConsumer implements MessageListener {
 
 	private static final EELFLogger LOGGER = EELFManager.getInstance().getLogger(AAIDmaapEventJMSConsumer.class);
@@ -51,14 +49,13 @@ public class AAIDmaapEventJMSConsumer implements MessageListener {
 
 	private Environment environment;
 
-	public AAIDmaapEventJMSConsumer() {
-        ApplicationContext applicationContext  = SpringContextAware.getApplicationContext();
-
-        if(applicationContext != null){
-			restTemplate = (RestTemplate) applicationContext.getBean("dmaapRestTemplate");
-			httpHeaders  = (HttpHeaders) applicationContext.getBean("dmaapHeaders");
-			environment  = applicationContext.getEnvironment();
-		}
+	public AAIDmaapEventJMSConsumer(Environment environment, RestTemplate restTemplate, HttpHeaders httpHeaders) {
+		Objects.nonNull(environment);
+		Objects.nonNull(restTemplate);
+		Objects.nonNull(httpHeaders);
+		this.environment = environment;
+		this.restTemplate = restTemplate;
+		this.httpHeaders = httpHeaders;
 	}
 
 	@Override