fix bugs

1. Delete configuration of field in source code(for testing before).
2. Delete configuration which is not necessory in pom

Issue-ID: DCAEGEN2-2640
Signed-off-by: Kai Lu <lukai@chinamobile.com>
Change-Id: I9695da9b8b1724905c854aa66ad3d7729fc26498

diff --git a/components/kpi-computation-ms/pom.xml b/components/kpi-computation-ms/pom.xml
index 535b458..e9e315e 100644 (file)
--- 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 9408514..930e631 100644 (file)
--- 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 {