Bug fix

1. Add a topic delete API.
2. Fix JSON response body.
3. Fix DB config update.

Issue-ID: DCAEGEN2-1437

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

4 files changed, 34 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 2b724c72..7ee0e0ae 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
@@ -105,11 +105,12 @@ public class DbController {
 			newdb.setName(dbConfig.getName());
 			newdb.setHost(dbConfig.getHost());
 			newdb.setPort(dbConfig.getPort());
+			newdb.setEnabled(dbConfig.isEnabled());
 			newdb.setLogin(dbConfig.getLogin());
 			newdb.setPass(dbConfig.getPassword());
 			newdb.setEncrypt(false);
 
-			if(dbConfig.getName().equals("Elecsticsearch") || dbConfig.getName().equals("Druid"))
+			if(!dbConfig.getName().equals("Elecsticsearch") || !dbConfig.getName().equals("Druid"))
 			{
 				newdb.setDatabase(new String(dbConfig.getDatabase()));
 			}
@@ -154,6 +155,12 @@ public class DbController {
 			return null;
 		}
 
+		if(!dbName.equals(dbConfig.getName()))
+		{
+			sendError(response, 400, "Mismatch DB name.");
+			return null;
+		}
+
 		Db oldDb = dbService.getDb(dbConfig.getName());
 		if (oldDb == null) {
 			sendError(response, 404, "Db not found: " + dbConfig.getName());
@@ -162,11 +169,12 @@ public class DbController {
 			oldDb.setName(dbConfig.getName());
 			oldDb.setHost(dbConfig.getHost());
 			oldDb.setPort(dbConfig.getPort());
+			oldDb.setEnabled(dbConfig.isEnabled());
 			oldDb.setLogin(dbConfig.getLogin());
 			oldDb.setPass(dbConfig.getPassword());
 			oldDb.setEncrypt(false);
 
-			if(oldDb.getName().equals("Elecsticsearch") || oldDb.getName().equals("Druid"))
+			if(!oldDb.getName().equals("Elecsticsearch") || !oldDb.getName().equals("Druid"))
 			{
 				oldDb.setDatabase(dbConfig.getDatabase());
 			}
@@ -238,7 +246,12 @@ public class DbController {
 	{
 		dbConfigMsg.setName(db.getName());
 		dbConfigMsg.setHost(db.getHost());
+		dbConfigMsg.setEnabled(db.isEnabled());
 		dbConfigMsg.setPort(db.getPort());
+		dbConfigMsg.setLogin(db.getLogin());
+		dbConfigMsg.setDatabase(db.getDatabase());
+
+
 	}
 
 	private void sendError(HttpServletResponse response, int sc, String msg) throws IOException {
diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/TopicController.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/TopicController.java
index d3a1fce3..82f4d9ec 100644
--- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/TopicController.java
+++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/TopicController.java
@@ -163,6 +163,23 @@ public class TopicController {
 		}
 	}
 
+	@DeleteMapping("/{topicName}")
+	@ResponseBody
+	@ApiOperation(value="Update a topic.")
+	public void deleteTopic(@PathVariable("topicName") String topicName, HttpServletResponse response) throws IOException
+	{
+		Topic oldTopic = topicService.getTopic(topicName);
+		if (oldTopic == null) {
+			sendError(response, 404, "Topic not found "+topicName);
+		} else {
+			Set<Db> dbRelation = oldTopic.getDbs();
+			dbRelation.clear();
+			topicRepository.save(oldTopic);
+			topicRepository.delete(oldTopic);
+			response.setStatus(204);
+		}
+	}
+
 	private PostReturnBody<TopicConfig> mkPostReturnBody(int statusCode, Topic topic)
 	{
 		PostReturnBody<TopicConfig> retBody = new PostReturnBody<>();
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 e9d9ba8a..10aaba8c 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
@@ -35,6 +35,7 @@ import lombok.Setter;
 public class DbConfig {
     private String name;
     private String host;
+    private boolean enabled;
     private String login;
     private String password;
     private String database;
diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/Topic.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/Topic.java
index e957c0f4..30737162 100644
--- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/Topic.java
+++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/Topic.java
@@ -143,6 +143,7 @@ public class Topic {
 		TopicConfig tConfig = new TopicConfig();
 
 		tConfig.setName(getName());
+		tConfig.setLogin(getLogin());
 		tConfig.setEnabled(isEnabled());
 		tConfig.setDataFormat(dataFormat);
 		tConfig.setSaveRaw(isSaveRaw());