Fix dependency injection issues in sliceanalysisms1.0.0-slice-analysis-ms

Issue-ID: DCAEGEN2-2451
Signed-off-by: dhebeha <dhebeha.mj71@wipro.com>
Change-Id: I557c06f2e817ed8bdfe3b9c0540a19a8ceaaab52

3 files changed, 18 insertions, 19 deletions

diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/MLMessageProcessor.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/MLMessageProcessor.java
index bee7b30e..84ff3715 100644
--- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/MLMessageProcessor.java
+++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/MLMessageProcessor.java
@@ -24,15 +24,13 @@ package org.onap.slice.analysis.ms.service;
 import java.util.List;
 import java.util.Map;
 
-import javax.annotation.PostConstruct;
-
 import org.onap.slice.analysis.ms.configdb.IConfigDbService;
 import org.onap.slice.analysis.ms.models.CUModel;
 import org.onap.slice.analysis.ms.models.MLOutputModel;
 import org.onap.slice.analysis.ms.models.policy.AdditionalProperties;
-import org.onap.slice.analysis.ms.utils.BeanUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
@@ -40,18 +38,15 @@ import org.springframework.stereotype.Component;
  * Process the message sent by ML service and sends notification to policy
  */
 @Component
-@Scope("Prototype")
+@Scope("prototype")
 public class MLMessageProcessor {
 	private static Logger log = LoggerFactory.getLogger(MLMessageProcessor.class);
-
+	
+	@Autowired
 	private IConfigDbService configDbService;
+	
+	@Autowired
 	private PolicyService policyService;
-
-
-	@PostConstruct
-	public void init() {
-		configDbService = BeanUtil.getBean(IConfigDbService.class);
-	}
 	
 	public void processMLMsg(MLOutputModel mlOutputMsg) {
 		String snssai = mlOutputMsg.getSnssai();
diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/PmThread.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/PmThread.java
index d9091b3c..d8bcbf64 100644
--- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/PmThread.java
+++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/PmThread.java
@@ -48,9 +48,9 @@ public class PmThread extends Thread {
 	/**
 	 * parameterized constructor.
 	 */
-	public PmThread(NewPmNotification newPmNotification) {
+	public PmThread() {
 		super();
-		this.newPmNotification = newPmNotification;
+		this.newPmNotification = BeanUtil.getBean(NewPmNotification.class);
 		this.performanceNotificationsRepository = BeanUtil.getBean(PerformanceNotificationsRepository.class);
 		this.pmEventProcessor = BeanUtil.getBean(IPmEventProcessor.class);
 		this.pmDataQueue = BeanUtil.getBean(PmDataQueue.class);
diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/SnssaiSamplesProcessor.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/SnssaiSamplesProcessor.java
index 2e56190f..16fb41ad 100644
--- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/SnssaiSamplesProcessor.java
+++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/service/SnssaiSamplesProcessor.java
@@ -33,9 +33,9 @@ import org.onap.slice.analysis.ms.models.Configuration;
 import org.onap.slice.analysis.ms.models.MeasurementObject;
 import org.onap.slice.analysis.ms.models.SubCounter;
 import org.onap.slice.analysis.ms.models.policy.AdditionalProperties;
-import org.onap.slice.analysis.ms.utils.BeanUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
@@ -43,14 +43,22 @@ import org.springframework.stereotype.Component;
  * This class process the measurement data of an S-NSSAI
  */
 @Component
-@Scope("Prototype")
+@Scope("prototype")
 public class SnssaiSamplesProcessor {
 	private static Logger log = LoggerFactory.getLogger(SnssaiSamplesProcessor.class);
 
+	@Autowired
 	private PolicyService policyService;
+	
+	@Autowired
 	private IConfigDbService configDbService;
+	
+	@Autowired
 	private PmDataQueue pmDataQueue;
+	
+	@Autowired
 	private AverageCalculator averageCalculator;
+	
 	private List<MeasurementObject> snssaiMeasurementList = new ArrayList<>();
 	private Map<String, List<String>> ricToCellMapping = new HashMap<>();
 	private Map<String, Map<String, Integer>> ricToPrbsMapping = new HashMap<>();
@@ -71,10 +79,6 @@ public class SnssaiSamplesProcessor {
 		prbThroughputMapping.put("PrbUsedDl", "dLThptPerSlice");
 		prbThroughputMapping.put("PrbUsedUl", "uLThptPerSlice");
 		minPercentageChange = configuration.getMinPercentageChange();
-		policyService = BeanUtil.getBean(PolicyService.class);
-		configDbService = BeanUtil.getBean(IConfigDbService.class);
-		pmDataQueue = BeanUtil.getBean(PmDataQueue.class);
-		averageCalculator = BeanUtil.getBean(AverageCalculator.class);
 	}
 
 	/**