| commit | 59e2cb0714953e91f5a6c29c58fb935f44975442 | [log] [tgz] |
|---|---|---|
| author | Kate Hsuan <kate.hsuan@qct.io> | Fri May 10 15:15:59 2019 +0800 |
| committer | Kate Hsuan <kate.hsuan@qct.io> | Fri May 10 15:15:59 2019 +0800 |
| tree | 8a5b09edd198f6d9fca3e9b39917fbe0e0708cfc | |
| parent | 7d574c189d55b4cba4b6bd757c5b0a7f4a306345 [diff] |
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 7ee0e0a..7e36433 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 @@ 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 @@ 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 10aaba8..557b545 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 @@ private boolean enabled; private String login; private String password; + private boolean encrypt; private String database; private int port; private String poperties;