From 9fed0b36e89a08c9dead91d4fbf0c5176079d96d Mon Sep 17 00:00:00 2001 From: Rama-Huawei Date: Tue, 10 Sep 2019 16:21:18 +0530 Subject: [PATCH] Defined a constant for this literal "Db not found" Removed the declaration of thrown exception, as it can't be thrown from method's body Issue-ID: DCAEGEN2-1468 Signed-off-by: Rama-Huawei Change-Id: I341b5ea67dd643503fee9077a7073aeb8adbc15a --- .../java/org/onap/datalake/feeder/controller/DbController.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 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 cff29596..2d130b83 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 @@ -55,6 +55,7 @@ import io.swagger.annotations.ApiOperation; public class DbController { private final Logger log = LoggerFactory.getLogger(this.getClass()); + private static final String DB_NOT_FOUND = "Db not found: "; @Autowired private DbRepository dbRepository; @@ -66,7 +67,7 @@ public class DbController { @GetMapping("") @ResponseBody @ApiOperation(value="Gat all databases name") - public List list() throws IOException { + public List list() { Iterable ret = dbRepository.findAll(); List retString = new ArrayList<>(); for(Db db : ret) @@ -141,7 +142,7 @@ public class DbController { public Db getDb(@PathVariable("dbName") String dbName, HttpServletResponse response) throws IOException { Db db = dbRepository.findByName(dbName); if (db == null) { - sendError(response, 404, "Db not found: " + dbName); + sendError(response, 404, DB_NOT_FOUND + dbName); } return db; } @@ -157,7 +158,7 @@ public class DbController { Db delDb = dbRepository.findByName(dbName); if (delDb == null) { - sendError(response, 404, "Db not found: " + dbName); + sendError(response, 404, DB_NOT_FOUND + dbName); return; } Set topicRelation = delDb.getTopics(); @@ -197,7 +198,7 @@ public class DbController { Db oldDb = dbRepository.findById(dbConfig.getId()).get(); if (oldDb == null) { - sendError(response, 404, "Db not found: " + dbConfig.getName()); + sendError(response, 404, DB_NOT_FOUND + dbConfig.getName()); return null; } else { oldDb.setHost(dbConfig.getHost()); -- 2.16.6