From 678c78c5c47bf836cef69a25345d766bf7fb3091 Mon Sep 17 00:00:00 2001 From: ZhangZihao Date: Thu, 16 Jan 2020 11:13:55 +0800 Subject: modified dbController rest api Change-Id: Ie1daa567338c48a13112ef1fff02109de16e8901 Issue-ID: DCAEGEN2-1877 Signed-off-by: ZhangZihao --- .../main/java/org/onap/datalake/feeder/controller/DbController.java | 6 +++--- .../java/org/onap/datalake/feeder/controller/DbControllerTest.java | 3 ++- 2 files 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 49439e60..058d4ca9 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 @@ -211,17 +211,17 @@ public class DbController { } //Update Db - @PutMapping("") + @PutMapping("/{id}") @ResponseBody @ApiOperation(value="Update a database.") - public PostReturnBody updateDb(@RequestBody DbConfig dbConfig, BindingResult result, HttpServletResponse response) throws IOException { + public PostReturnBody updateDb(@PathVariable int id, @RequestBody DbConfig dbConfig, BindingResult result, HttpServletResponse response) throws IOException { if (result.hasErrors()) { sendError(response, 400, "Error parsing DB: " + result.toString()); return null; } - Db oldDb = dbRepository.findById(dbConfig.getId()).get(); + Db oldDb = dbRepository.findById(id).get(); if (oldDb == null) { sendError(response, 404, DB_NOT_FOUND + dbConfig.getName()); return null; diff --git a/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/controller/DbControllerTest.java b/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/controller/DbControllerTest.java index c46a026b..9318ee00 100644 --- a/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/controller/DbControllerTest.java +++ b/components/datalake-handler/feeder/src/test/java/org/onap/datalake/feeder/controller/DbControllerTest.java @@ -69,6 +69,7 @@ public class DbControllerTest { public DbConfig getDbConfig() { DbConfig dbConfig = new DbConfig(); + dbConfig.setId(1); dbConfig.setName("Elecsticsearch"); dbConfig.setHost("localhost"); dbConfig.setLogin("root"); @@ -112,7 +113,7 @@ public class DbControllerTest { DbController dbController = new DbController(); DbConfig dbConfig = getDbConfig(); when(mockBindingResult.hasErrors()).thenReturn(true); - PostReturnBody db = dbController.updateDb(dbConfig, mockBindingResult, + PostReturnBody db = dbController.updateDb(dbConfig.getId(), dbConfig, mockBindingResult, httpServletResponse); assertEquals(null, db); //when(mockBindingResult.hasErrors()).thenReturn(false); -- cgit 1.2.3-korg From 5d81682e5bbaa28c4dd8258fb530a775d4f7b5e2 Mon Sep 17 00:00:00 2001 From: Guobiao Mo Date: Tue, 21 Jan 2020 16:46:38 -0800 Subject: Add a method to retrieve DB type list Issue-ID: DCAEGEN2-1877 Change-Id: I8eae95aba59a7f5dcbd6df2928b78a82c3235e49 Signed-off-by: Guobiao Mo --- .../java/org/onap/datalake/feeder/controller/DbController.java | 9 +++++++++ .../src/main/java/org/onap/datalake/feeder/domain/DbType.java | 6 +++++- 2 files changed, 14 insertions(+), 1 deletion(-) 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 058d4ca9..fc709360 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 @@ -258,6 +258,15 @@ public class DbController { } + //get db type list + @GetMapping("/dbtypes") + @ResponseBody + @ApiOperation(value="Get a list of all db types.") + public Iterable getDbTypes(HttpServletResponse response) throws IOException { + log.info("Get a list of all db types ......"); + Iterable dbTypes = dbTypeRepository.findAll(); + return dbTypes; + } @PostMapping("/verify") @ResponseBody diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/DbType.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/DbType.java index 9c83a9cd..700ce8cb 100644 --- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/DbType.java +++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/DbType.java @@ -29,6 +29,9 @@ import javax.persistence.FetchType; import javax.persistence.Id; import javax.persistence.OneToMany; import javax.persistence.Table; + +import com.fasterxml.jackson.annotation.JsonBackReference; + import lombok.Getter; import lombok.Setter; @@ -56,7 +59,8 @@ public class DbType { @Column(name="`tool`", nullable = false) private boolean tool; - + + @JsonBackReference @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "dbType") protected Set dbs = new HashSet<>(); -- cgit 1.2.3-korg