Fix UI bugs

Issue-ID: DCAEGEN2-1716

Change-Id: I01a5a3c69ff65afde37650e559619723f100e69a
Signed-off-by: Guobiao Mo <guobiaomo@chinamobile.com>

6 files changed, 57 insertions, 18 deletions

diff --git a/components/datalake-handler/feeder/src/assembly/scripts/init_db.sql b/components/datalake-handler/feeder/src/assembly/scripts/init_db.sql
index 72892a27..8a914270 100644
--- a/components/datalake-handler/feeder/src/assembly/scripts/init_db.sql
+++ b/components/datalake-handler/feeder/src/assembly/scripts/init_db.sql
@@ -1,3 +1,23 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DATALAKE

+* ================================================================================

+* Copyright 2019 China Mobile

+*=================================================================================

+* Licensed under the Apache License, Version 2.0 (the "License");

+* you may not use this file except in compliance with the License.

+* You may obtain a copy of the License at

+*

+*     http://www.apache.org/licenses/LICENSE-2.0

+*

+* Unless required by applicable law or agreed to in writing, software

+* distributed under the License is distributed on an "AS IS" BASIS,

+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+* See the License for the specific language governing permissions and

+* limitations under the License.

+* ============LICENSE_END=========================================================

+*/

+

 drop DATABASE datalake;

 create database datalake;

 use datalake;

@@ -46,7 +66,7 @@ CREATE TABLE `design_type` (
 

 CREATE TABLE `design` (

   `id` int(11) NOT NULL AUTO_INCREMENT,

-  `body` varchar(255) DEFAULT NULL,

+  `body` text DEFAULT NULL,

   `name` varchar(255) DEFAULT NULL,

   `note` varchar(255) DEFAULT NULL,

   `submitted` bit(1) DEFAULT NULL,

diff --git a/components/datalake-handler/feeder/src/assembly/scripts/init_db_data.sql b/components/datalake-handler/feeder/src/assembly/scripts/init_db_data.sql
index 770c68bf..1328279a 100644
--- a/components/datalake-handler/feeder/src/assembly/scripts/init_db_data.sql
+++ b/components/datalake-handler/feeder/src/assembly/scripts/init_db_data.sql
@@ -1,3 +1,23 @@
+/*

+* ============LICENSE_START=======================================================

+* ONAP : DATALAKE

+* ================================================================================

+* Copyright 2019 China Mobile

+*=================================================================================

+* Licensed under the Apache License, Version 2.0 (the "License");

+* you may not use this file except in compliance with the License.

+* You may obtain a copy of the License at

+*

+*     http://www.apache.org/licenses/LICENSE-2.0

+*

+* Unless required by applicable law or agreed to in writing, software

+* distributed under the License is distributed on an "AS IS" BASIS,

+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+* See the License for the specific language governing permissions and

+* limitations under the License.

+* ============LICENSE_END=========================================================

+*/

+

 INSERT INTO datalake.kafka(

    id

   ,name

@@ -36,14 +56,13 @@ insert into db_type (`id`, `name`, tool) values ('HDFS', 'HDFS', false);
 insert into db_type (`id`, `name`, tool) values ('KIBANA', 'Kibana', true);

 insert into db_type (`id`, `name`, tool) values ('SUPERSET', 'Apache Superset', true);

 

-insert into db (id, db_type_id, enabled, `name`,`host`,`login`,`pass`,`database_name`) values (1, 'CB', true, 'Couchbase 1','dl-couchbase','dl','dl1234','datalake');

-insert into db (id, db_type_id, enabled, `name`,`host`) values (2, 'ES', true, 'Elasticsearch','dl-es');

-insert into db (id, db_type_id, enabled, `name`,`host`,`port`,`database_name`) values (3, 'MONGO', true, 'MongoDB 1','dl-mongodb',27017,'datalake');

-insert into db (id, db_type_id, enabled, `name`,`host`) values (4, 'DRUID', true, 'Druid','dl-druid');

-insert into db (id, db_type_id, enabled, `name`,`host`,`login`) values (5, 'HDFS', true, 'Hadoop Cluster','dl-hdfs','dl');

-insert into db (id, db_type_id, enabled, `name`,`host`) values (6, 'KIBANA', true, 'Kibana demo','dl-es');

-insert into db (id, db_type_id, enabled, `name`,`host`) values (7, 'SUPERSET', true, 'Superset demo','dl-druid');

-

+insert into db (id, db_type_id, enabled, encrypt, `name`,`host`,`login`,`pass`,`database_name`) values (1, 'CB', true, true, 'Couchbase 1','dl-couchbase','dl','dl1234','datalake');

+insert into db (id, db_type_id, enabled, encrypt, `name`,`host`) values (2, 'ES', true, true, 'Elasticsearch','dl-es');

+insert into db (id, db_type_id, enabled, encrypt, `name`,`host`,`port`,`database_name`) values (3, 'MONGO', true, true, 'MongoDB 1','dl-mongodb',27017,'datalake');

+insert into db (id, db_type_id, enabled, encrypt, `name`,`host`) values (4, 'DRUID', true, true, 'Druid','dl-druid');

+insert into db (id, db_type_id, enabled, encrypt, `name`,`host`,`login`) values (5, 'HDFS', true, true, 'Hadoop Cluster','dl-hdfs','dl');

+insert into db (id, db_type_id, enabled, encrypt, `name`,`host`) values (6, 'KIBANA', true, false, 'Kibana demo','dl-es');

+insert into db (id, db_type_id, enabled, encrypt, `name`,`host`) values (7, 'SUPERSET', true, false, 'Superset demo','dl-druid');

 

 insert into topic_name (id) values ('_DL_DEFAULT_');

 insert into topic_name (id) values ('unauthenticated.SEC_FAULT_OUTPUT');

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<DbConfig> dblistByTool(@RequestParam boolean tool) {
+	@ApiOperation(value="Get all tools or dbs")
+	public List<DbConfig> dblistByTool(@RequestParam boolean isDb) {
 		log.info("Search dbs by tool start......");
-		Iterable<DbType> dbType  = dbTypeRepository.findByTool(tool);
+		Iterable<DbType> dbType  = dbTypeRepository.findByTool(!isDb);
 		List<DbConfig> 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<ServerAddress> 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<Document> collection = mongoCollectionMap.computeIfAbsent(collectionName, k -> database.getCollection(k));
 
 		try {
diff --git a/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/domain/DbTest.java b/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/domain/DbTest.java
index 0accf5a8..e1972c52 100644
--- a/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/domain/DbTest.java
+++ b/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/domain/DbTest.java
@@ -84,7 +84,7 @@ public class DbTest {
         assertTrue("root".equals(mongoDB2.getLogin()));
         assertTrue("root123".equals(mongoDB2.getPass()));
         assertTrue("mongoDB2".equals(mongoDB2.getDatabase()));
-        assertFalse("true".equals(mongoDB2.getEncrypt()));
+        assertFalse("true".equals(mongoDB2.isEncrypt()));
         assertTrue("property1".equals(mongoDB2.getProperty1()));
         assertTrue("property2".equals(mongoDB2.getProperty2()));
         assertTrue("property3".equals(mongoDB2.getProperty3()));