From 34d6ad0ae36eb85cfaf2ecc1e345a1450ce9d79e Mon Sep 17 00:00:00 2001 From: ZhangZihao Date: Tue, 25 Jun 2019 09:55:59 +0800 Subject: topic portal portaldesign Change-Id: I47fd9bdbdedb70ae719790cf24f75a6029faa6c4 Issue-ID: DCAEGEN2-1623 Signed-off-by: ZhangZihao --- .../onap/datalake/feeder/controller/PortalController.java | 14 ++------------ .../datalake/feeder/controller/PortalDesignController.java | 2 +- .../onap/datalake/feeder/controller/TopicController.java | 3 +-- .../java/org/onap/datalake/feeder/domain/PortalDesign.java | 7 +------ .../org/onap/datalake/feeder/dto/PortalDesignConfig.java | 2 ++ 5 files changed, 7 insertions(+), 21 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/PortalController.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/PortalController.java index cb3ff344..2844facd 100644 --- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/PortalController.java +++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/PortalController.java @@ -44,7 +44,6 @@ import java.util.List; * * @author guochunmeng */ -@CrossOrigin(origins = "*") @RestController @RequestMapping(value = "/portals", produces = { MediaType.APPLICATION_JSON_VALUE }) public class PortalController { @@ -70,17 +69,8 @@ public class PortalController { Portal portal = null; try { portal = portalRepository.findById(portalConfig.getName()).get(); - if (portalConfig.getEnabled() == false) { - log.info("Disable portal "+portalConfig.getName()); - portal.setPort(null); - portal.setHost(null); - portal.setLogin(null); - portal.setPass(null); - portal.setEnabled(false); - }else { - log.info("Update portal "+portalConfig); - portalService.fillPortalConfiguration(portalConfig, portal); - } + log.info("Update portal "+portalConfig); + portalService.fillPortalConfiguration(portalConfig, portal); portalRepository.save(portal); return mkPostReturnBody(200, portal); } catch (Exception e) { diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/PortalDesignController.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/PortalDesignController.java index 989a9f45..fa35b3ba 100644 --- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/PortalDesignController.java +++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/controller/PortalDesignController.java @@ -176,4 +176,4 @@ public class PortalDesignController { response.sendError(sc, msg); } -} +} \ No newline at end of file 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 2784be33..93cec8bb 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 @@ -49,7 +49,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.bind.annotation.CrossOrigin; + import io.swagger.annotations.ApiOperation; @@ -65,7 +65,6 @@ import io.swagger.annotations.ApiOperation; * @contributor Kate Hsuan @ QCT */ -@CrossOrigin(origins = "*") @RestController @RequestMapping(value = "/topics", produces = { MediaType.APPLICATION_JSON_VALUE })//, consumes= {MediaType.APPLICATION_JSON_UTF8_VALUE}) public class TopicController { diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/PortalDesign.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/PortalDesign.java index 5b1be038..3a39b4e6 100644 --- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/PortalDesign.java +++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/domain/PortalDesign.java @@ -72,18 +72,13 @@ public class PortalDesign { PortalDesignConfig portalDesignConfig = new PortalDesignConfig(); portalDesignConfig.setId(getId()); - portalDesignConfig.setBody(getBody()); - portalDesignConfig.setName(getName()); - portalDesignConfig.setNote(getNote()); - portalDesignConfig.setSubmitted(getSubmitted()); - portalDesignConfig.setTopic(getTopic().getName()); - portalDesignConfig.setDesignType(getDesignType().getName()); + portalDesignConfig.setDisplay(getDesignType().getDisplay()); return portalDesignConfig; } diff --git a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/dto/PortalDesignConfig.java b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/dto/PortalDesignConfig.java index a696d3ec..49e1cde5 100755 --- a/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/dto/PortalDesignConfig.java +++ b/components/datalake-handler/feeder/src/main/java/org/onap/datalake/feeder/dto/PortalDesignConfig.java @@ -47,4 +47,6 @@ public class PortalDesignConfig { private String designType; + private String display; + } -- cgit 1.2.3-korg