From 59e2cb0714953e91f5a6c29c58fb935f44975442 Mon Sep 17 00:00:00 2001 From: Kate Hsuan Date: Fri, 10 May 2019 15:15:59 +0800 Subject: [PATCH] Bug fix 1. Fix DB config JSON and config format. Issue-ID: DCAEGEN2-1437 Change-Id: I3bf0778c61811cc636099d2dbd118fec49d72625 Signed-off-by: Kate Hsuan --- .../main/java/org/onap/datalake/feeder/controller/DbController.java | 4 ++-- .../java/org/onap/datalake/feeder/controller/domain/DbConfig.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) 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; -- 2.16.6