From a8a31129d5e32fccdbf123a99043b32077453cdf Mon Sep 17 00:00:00 2001 From: Guobiao Mo Date: Thu, 21 Nov 2019 17:06:57 -0800 Subject: Fix UI bugs Issue-ID: DCAEGEN2-1716 Change-Id: I01a5a3c69ff65afde37650e559619723f100e69a Signed-off-by: Guobiao Mo --- .../java/org/onap/datalake/feeder/controller/DbController.java | 8 ++++---- .../feeder/src/main/java/org/onap/datalake/feeder/domain/Db.java | 4 ++-- .../java/org/onap/datalake/feeder/service/db/MongodbService.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'components/datalake-handler/feeder/src/main/java/org') 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 6d43300d..54f46e6f 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 @@ -86,10 +86,10 @@ public class DbController { @GetMapping("/list") @ResponseBody - @ApiOperation(value="Get all dbs by tool") - public List dblistByTool(@RequestParam boolean tool) { + @ApiOperation(value="Get all tools or dbs") + public List dblistByTool(@RequestParam boolean isDb) { log.info("Search dbs by tool start......"); - Iterable dbType = dbTypeRepository.findByTool(tool); + Iterable dbType = dbTypeRepository.findByTool(!isDb); List retDbConfig = new ArrayList<>(); for (DbType item : dbType) { for (Db d : item.getDbs()) { @@ -148,7 +148,7 @@ public class DbController { if(!dbConfig.getName().equals("Elecsticsearch") || dbConfig.getName().equals("Druid")) { - newdb.setDatabase(new String(dbConfig.getDatabase())); + newdb.setDatabase(dbConfig.getDatabase()); } dbRepository.save(newdb); log.info("Db save ....... name: " + dbConfig.getName()); diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/Db.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/Db.java index ff2b87ad..2c235990 100644 --- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/Db.java +++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/Db.java @@ -79,7 +79,7 @@ public class Db { private String database; @Column(name="`encrypt`") - private Boolean encrypt; + private boolean encrypt; @Column(name="`property1`") private String property1; @@ -162,7 +162,7 @@ public class Db { dbConfig.setPort(getPort()); dbConfig.setPass(getPass()); dbConfig.setLogin(getLogin()); - dbConfig.setEncrypt(getEncrypt()); + dbConfig.setEncrypt(isEncrypt()); dbConfig.setEnabled(isEnabled()); dbConfig.setDatabase(getDatabase()); dbConfig.setDbTypeId(getDbType().getId()); diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/db/MongodbService.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/db/MongodbService.java index eb8a3a16..689f83cf 100644 --- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/db/MongodbService.java +++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/service/db/MongodbService.java @@ -106,7 +106,7 @@ public class MongodbService implements DbStoreService { //http://mongodb.github.io/mongo-java-driver/3.0/driver/reference/connecting/ssl/ if (config.isEnableSSL()) { - builder.sslEnabled(Boolean.TRUE.equals(mongodb.getEncrypt()));// getEncrypt() can be null + builder.sslEnabled(Boolean.TRUE.equals(mongodb.isEncrypt()));// getEncrypt() can be null } MongoClientOptions options = builder.build(); List addrs = new ArrayList<>(); @@ -162,7 +162,7 @@ public class MongodbService implements DbStoreService { documents.add(doc); } - String collectionName = effectiveTopic.getName().replaceAll("[^a-zA-Z0-9]", "");//remove - _ . + String collectionName = effectiveTopic.getName().replaceAll("[^a-zA-Z0-9]", "").toLowerCase();//remove - _ . MongoCollection collection = mongoCollectionMap.computeIfAbsent(collectionName, k -> database.getCollection(k)); try { -- cgit 1.2.3-korg