Merge "Return an empty collection instead of null"

4 files changed, 4 insertions, 19 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 7f35662d..cff29596 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
@@ -66,7 +66,6 @@ public class DbController {
 	@GetMapping("")
 	@ResponseBody
 	@ApiOperation(value="Gat all databases name")
-	//public Iterable<Db> list() throws IOException {
 	public List<String> list() throws IOException {
 		Iterable<Db> ret = dbRepository.findAll();
 		List<String> retString = new ArrayList<>();
@@ -118,7 +117,7 @@ public class DbController {
 			newdb.setPass(dbConfig.getPassword());
 			newdb.setEncrypt(dbConfig.isEncrypt());
 
-			if(!dbConfig.getName().equals("Elecsticsearch") || !dbConfig.getName().equals("Druid"))
+			if(!dbConfig.getName().equals("Elecsticsearch") || dbConfig.getName().equals("Druid"))
 			{
 				newdb.setDatabase(new String(dbConfig.getDatabase()));
 			}
@@ -140,10 +139,6 @@ public class DbController {
 	@ResponseBody
 	@ApiOperation(value="Get a database's details.")
 	public Db getDb(@PathVariable("dbName") String dbName, HttpServletResponse response) throws IOException {
-		/*Db db = dbService.getDb(dbName);
-		if (db == null) {
-			sendError(response, 404, "Db not found: " + dbName);
-		}*/
 		Db db = dbRepository.findByName(dbName);
 		if (db == null) {
 			sendError(response, 404, "Db not found: " + dbName);
@@ -177,21 +172,18 @@ public class DbController {
 	@ResponseBody
 	@ApiOperation(value="Get a database's all topics.")
 	public Set<Topic> getDbTopics(@PathVariable("dbName") String dbName, HttpServletResponse response) throws IOException {
-		//Db db = dbService.getDb(dbName);
 		Set<Topic> topics;
 		try {
 			Db db = dbRepository.findByName(dbName);
 			topics = db.getTopics();
-		}catch(Exception ex)
-		{
+		} catch(Exception ex) {
 			sendError(response, 404, "DB: " + dbName + " or Topics not found");
-			return null;
+			return Collections.emptySet();
 
 		}
 		return topics;
 	}
 
-
 	//Update Db
 	@PutMapping("")
 	@ResponseBody
diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/FeederController.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/FeederController.java
index 0a64ddb3..d9080ec0 100644
--- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/FeederController.java
+++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/FeederController.java
@@ -92,7 +92,7 @@ public class FeederController {
 	@ApiOperation(value="Retrieve feeder status.")
     public String status() {    	
     	String status = "Feeder is running: "+pullService.isRunning();
-    	log.info("sending feeder status ...");//TODO we can send what topics are monitored, how many messages are sent, etc.
+        log.info("sending feeder status ..." + status);//TODO we can send what topics are monitored, how many messages are sent, etc.
 
         return "{\"version\": \""+config.getDatalakeVersion()+"\", \"running\": "+pullService.isRunning()+"}";
     }
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 bb0de4b0..b59b2a7b 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
@@ -72,9 +72,6 @@ public class TopicController {
 
 	private final Logger log = LoggerFactory.getLogger(this.getClass());
 
-	//@Autowired
-	//private DmaapService dmaapService;
-
 	@Autowired
 	private ApplicationContext context;
 
diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/Kafka.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/Kafka.java
index 7f7b59e8..de80db70 100644
--- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/Kafka.java
+++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/Kafka.java
@@ -95,10 +95,6 @@ public class Kafka {
 	@Column(name="`timeout_sec`", columnDefinition = "integer default 10")
 	private Integer timeout;
 
-	//don't show this field in admin UI 
-	//@Column(name="`check_topic_interval_sec`", columnDefinition = "integer default 10")
-//	private Integer checkTopicInterval;
-	
 	@JsonBackReference
 	@ManyToMany(fetch = FetchType.EAGER)
 	@JoinTable(	name 				= "map_kafka_topic",