From 615031ac4bb36fb02e72eea9e59c9e3bcec4ab1e Mon Sep 17 00:00:00 2001 From: ZhangZihao Date: Mon, 24 Jun 2019 11:26:35 +0800 Subject: db modify Change-Id: I848b9ac6d45dc60e93be27306cfbed97c73da51d Issue-ID: DCAEGEN2-1622 Signed-off-by: ZhangZihao --- .../datalake/feeder/controller/DbController.java | 90 ++++++++++------------ .../org/onap/datalake/feeder/dto/DbConfig.java | 45 +++++++++++ 2 files changed, 85 insertions(+), 50 deletions(-) create mode 100644 components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/dto/DbConfig.java (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 7e364332..bd9b742b 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 @@ -24,13 +24,12 @@ import java.util.*; import javax.servlet.http.HttpServletResponse; -import io.swagger.annotations.*; import org.onap.datalake.feeder.domain.Db; import org.onap.datalake.feeder.domain.Topic; import org.onap.datalake.feeder.repository.DbRepository; import org.onap.datalake.feeder.repository.TopicRepository; import org.onap.datalake.feeder.service.DbService; -import org.onap.datalake.feeder.controller.domain.DbConfig; +import org.onap.datalake.feeder.dto.DbConfig; import org.onap.datalake.feeder.controller.domain.PostReturnBody; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,10 +38,7 @@ import org.springframework.http.MediaType; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; /** * This controller manages the big data storage settings. All the settings are @@ -144,51 +140,6 @@ public class DbController { } - //Update Db - @PutMapping("/{dbName}") - @ResponseBody - @ApiOperation(value="Update a database.") - public PostReturnBody updateDb(@PathVariable("dbName") String dbName, @RequestBody DbConfig dbConfig, BindingResult result, HttpServletResponse response) throws IOException { - - if (result.hasErrors()) { - sendError(response, 400, "Error parsing DB: " + result.toString()); - 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()); - return null; - } else { - 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(dbConfig.isEncrypt()); - - if(!oldDb.getName().equals("Elecsticsearch") || !oldDb.getName().equals("Druid")) - { - oldDb.setDatabase(dbConfig.getDatabase()); - } - dbRepository.save(oldDb); - DbConfig retMsg; - PostReturnBody retBody = new PostReturnBody<>(); - retMsg = new DbConfig(); - composeRetMessagefromDbConfig(oldDb, retMsg); - retBody.setReturnBody(retMsg); - retBody.setStatusCode(200); - return retBody; - } - } - //Delete a db //the topics are missing in the return, since in we use @JsonBackReference on Db's topics //need to the the following method to retrieve the topic list @@ -229,6 +180,45 @@ public class DbController { } + //Update Db + @PutMapping("") + @ResponseBody + @ApiOperation(value="Update a database.") + public PostReturnBody updateDb(@RequestBody DbConfig dbConfig, BindingResult result, HttpServletResponse response) throws IOException { + + if (result.hasErrors()) { + sendError(response, 400, "Error parsing DB: " + result.toString()); + return null; + } + + Db oldDb = dbService.getDb(dbConfig.getName()); + if (oldDb == null) { + sendError(response, 404, "Db not found: " + dbConfig.getName()); + return null; + } else { + oldDb.setHost(dbConfig.getHost()); + oldDb.setPort(dbConfig.getPort()); + oldDb.setEnabled(dbConfig.isEnabled()); + oldDb.setLogin(dbConfig.getLogin()); + oldDb.setPass(dbConfig.getPassword()); + oldDb.setEncrypt(dbConfig.isEncrypt()); + if (!oldDb.getName().equals("Elecsticsearch") || !oldDb.getName().equals("Druid")) { + oldDb.setDatabase(dbConfig.getDatabase()); + } + + dbRepository.save(oldDb); + DbConfig retMsg; + PostReturnBody retBody = new PostReturnBody<>(); + retMsg = new DbConfig(); + composeRetMessagefromDbConfig(oldDb, retMsg); + retBody.setReturnBody(retMsg); + retBody.setStatusCode(200); + return retBody; + } + + } + + @PostMapping("/verify") @ResponseBody @ApiOperation(value="Database connection verification") diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/dto/DbConfig.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/dto/DbConfig.java new file mode 100644 index 00000000..0b6c54c3 --- /dev/null +++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/dto/DbConfig.java @@ -0,0 +1,45 @@ +/* + * ============LICENSE_START======================================================= + * ONAP : DataLake + * ================================================================================ + * Copyright 2019 QCT + *================================================================================= + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +package org.onap.datalake.feeder.dto; + + +import lombok.Getter; +import lombok.Setter; + +/** + * JSON request body for DB manipulation. + * + * @author Kate Hsuan + * + */ + +@Getter +@Setter +public class DbConfig { + private String name; + private String host; + private boolean enabled; + private String login; + private String password; + private boolean encrypt; + private String database; + private Integer port; + private String poperties; +} -- cgit 1.2.3-korg