From: Kate Hsuan <kate.hsuan@qct.io>
Date: Fri, 10 May 2019 07:15:59 +0000 (+0800)
Subject: Bug fix
X-Git-Tag: 2.0.0~140
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=59e2cb0714953e91f5a6c29c58fb935f44975442;p=dcaegen2%2Fservices.git

Bug fix

1. Fix DB config JSON and config format.

Issue-ID: DCAEGEN2-1437

Change-Id: I3bf0778c61811cc636099d2dbd118fec49d72625
Signed-off-by: Kate Hsuan <kate.hsuan@qct.io>
---

diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/DbController.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/DbController.java
index 7ee0e0ae..7e364332 100644
--- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/DbController.java
+++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/DbController.java
@@ -108,7 +108,7 @@ public class DbController {
 			newdb.setEnabled(dbConfig.isEnabled());
 			newdb.setLogin(dbConfig.getLogin());
 			newdb.setPass(dbConfig.getPassword());
-			newdb.setEncrypt(false);
+			newdb.setEncrypt(dbConfig.isEncrypt());
 
 			if(!dbConfig.getName().equals("Elecsticsearch") || !dbConfig.getName().equals("Druid"))
 			{
@@ -172,7 +172,7 @@ public class DbController {
 			oldDb.setEnabled(dbConfig.isEnabled());
 			oldDb.setLogin(dbConfig.getLogin());
 			oldDb.setPass(dbConfig.getPassword());
-			oldDb.setEncrypt(false);
+			oldDb.setEncrypt(dbConfig.isEncrypt());
 
 			if(!oldDb.getName().equals("Elecsticsearch") || !oldDb.getName().equals("Druid"))
 			{
diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/domain/DbConfig.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/domain/DbConfig.java
index 10aaba8c..557b545c 100644
--- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/domain/DbConfig.java
+++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/domain/DbConfig.java
@@ -38,6 +38,7 @@ public class DbConfig {
     private boolean enabled;
     private String login;
     private String password;
+    private boolean encrypt;
     private String database;
     private int port;
     private String poperties;