summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Venkatesh Kumar <vv770d@att.com>2021-02-25 03:20:32 +0000
committerGerrit Code Review <gerrit@onap.org>2021-02-25 03:20:32 +0000
commit0923950a6fe2cc082a6768ab97859fb1117c5ad5 (patch)
tree7bda520ceeba48a8c3e3249fe2aba57231d46b1c
parentab9404be5da01c8840549b3d539c18cf79518d90 (diff)
parentd900241bdc399b828d115d057c16c36f43d16d36 (diff)
Merge "fix bugs"1.0.0-kpi-computation-ms
-rw-r--r--components/kpi-computation-ms/pom.xml3
-rw-r--r--components/kpi-computation-ms/src/main/java/org/onap/dcaegen2/kpi/models/Configuration.java6
2 files changed, 1 insertions, 8 deletions
diff --git a/components/kpi-computation-ms/pom.xml b/components/kpi-computation-ms/pom.xml
index 535b4587..e9e315eb 100644
--- a/components/kpi-computation-ms/pom.xml
+++ b/components/kpi-computation-ms/pom.xml
@@ -334,9 +334,8 @@
<include>${project.artifactId}-${project.version}.jar</include>
</resource>
<resource>
- <targetPath>/app</targetPath>
+ <targetPath>/app</targetPath>
<directory>${project.basedir}</directory>
- <include>entry.sh</include>
</resource>
</resources>
diff --git a/components/kpi-computation-ms/src/main/java/org/onap/dcaegen2/kpi/models/Configuration.java b/components/kpi-computation-ms/src/main/java/org/onap/dcaegen2/kpi/models/Configuration.java
index 94085146..930e631c 100644
--- a/components/kpi-computation-ms/src/main/java/org/onap/dcaegen2/kpi/models/Configuration.java
+++ b/components/kpi-computation-ms/src/main/java/org/onap/dcaegen2/kpi/models/Configuration.java
@@ -239,12 +239,6 @@ public class Configuration {
}.getType();
dmaapServers = new Gson().fromJson(servers, listType);
- port = jsonObject.get("mongo.port").getAsInt();
- host = jsonObject.get("mongo.host").getAsString();
-// username = jsonObject.get("mongo.username").getAsString();
-// password = jsonObject.get("mongo.password").getAsString();
- databasename = jsonObject.get("mongo.databasename").getAsString();
-
if (jsonObject.get("aafUsername") == null) {
aafUsername = null;
} else {