From fadaccdb8396a178134ef95982e96ed8a5cddc26 Mon Sep 17 00:00:00 2001
From: dhebeha <dhebeha.mj71@wipro.com>
Date: Tue, 13 Oct 2020 21:24:08 +0530
Subject: Fix Issues  - Fix certificate issue for authenticated topic  - Fix
 consumer thread issue

Issue-ID: DCAEGEN2-2485
Signed-off-by: dhebeha <dhebeha.mj71@wipro.com>
Change-Id: I91fe9b1b86579da7142955ac7adaa25ac4bc22e9
---
 .../onap/slice/analysis/ms/models/Configuration.java |  3 +++
 .../slice/analysis/ms/models/MeasurementObject.java  | 20 +++++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

(limited to 'components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models')

diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/Configuration.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/Configuration.java
index 25a80463..8bdbb1a8 100644
--- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/Configuration.java
+++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/Configuration.java
@@ -260,6 +260,9 @@ public class Configuration {
 		 minPercentageChange = jsonObject.get("sliceanalysisms.minPercentageChange").getAsInt();
 		 initialDelaySeconds = jsonObject.get("sliceanalysisms.initialDelaySeconds").getAsLong();
 
+		 aafUsername = jsonObject.get("aafUsername").getAsString();
+		 aafPassword = jsonObject.get("aafPassword").getAsString();
+		 
 		 log.info("configuration from CBS {}", this);
 	 }
 }
diff --git a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/MeasurementObject.java b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/MeasurementObject.java
index 047c9856..b94d75da 100644
--- a/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/MeasurementObject.java
+++ b/components/slice-analysis-ms/src/main/java/org/onap/slice/analysis/ms/models/MeasurementObject.java
@@ -22,6 +22,7 @@
 
 package org.onap.slice.analysis.ms.models;
 
+import java.util.List;
 import java.util.Map;
 
 /** 
@@ -31,6 +32,17 @@ public class MeasurementObject {
 	private String measurementObjectId;
 	private Map<String, Integer> pmData;
 
+	public static int findIndex(String measurementObjectId, List<MeasurementObject> list) {
+		int index = -1;
+		int len = list.size();
+		for(int i=0; i<len ; i++) {
+			if(measurementObjectId.equals(list.get(i).getMeasurementObjectId())) {
+				index = i;
+			}
+		}
+		return index;
+	}
+
 	public String getMeasurementObjectId() {
 		return measurementObjectId;
 	}
@@ -67,9 +79,10 @@ public class MeasurementObject {
 		final int prime = 31;
 		int result = 1;
 		result = prime * result + ((measurementObjectId == null) ? 0 : measurementObjectId.hashCode());
+		result = prime * result + ((pmData == null) ? 0 : pmData.hashCode());
 		return result;
 	}
-	
+
 	@Override
 	public boolean equals(Object obj) {
 		if (this == obj)
@@ -84,6 +97,11 @@ public class MeasurementObject {
 				return false;
 		} else if (!measurementObjectId.equals(other.measurementObjectId))
 			return false;
+		if (pmData == null) {
+			if (other.pmData != null)
+				return false;
+		} else if (!pmData.equals(other.pmData))
+			return false;
 		return true;
 	}
 
-- 
cgit 1.2.3-korg