From 50896f0eab1bc427ee724d8e74cc8469ab04fa0c Mon Sep 17 00:00:00 2001 From: Rama-Huawei Date: Wed, 7 Aug 2019 14:15:52 +0530 Subject: Return an empty collection instead of null Issue-ID: DCAEGEN2-1468 Signed-off-by: Rama-Huawei Change-Id: I294014cd009ae02983e575c94e830b2ff30e7b07 --- .../org/onap/datalake/feeder/controller/DbController.java | 14 +++----------- .../onap/datalake/feeder/controller/FeederController.java | 2 +- .../onap/datalake/feeder/controller/TopicController.java | 3 --- .../main/java/org/onap/datalake/feeder/domain/Kafka.java | 4 ---- 4 files changed, 4 insertions(+), 19 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 f177a9ac..9fa8f490 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 @@ -61,7 +61,6 @@ public class DbController { @GetMapping("") @ResponseBody @ApiOperation(value="Gat all databases name") - //public Iterable list() throws IOException { public List list() throws IOException { Iterable ret = dbRepository.findAll(); List retString = new ArrayList<>(); @@ -112,7 +111,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())); } @@ -134,10 +133,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); @@ -171,21 +166,18 @@ public class DbController { @ResponseBody @ApiOperation(value="Get a database's all topics.") public Set getDbTopics(@PathVariable("dbName") String dbName, HttpServletResponse response) throws IOException { - //Db db = dbService.getDb(dbName); Set 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", -- cgit 1.2.3-korg