diff options
author | 2021-04-19 12:40:01 +0300 | |
---|---|---|
committer | 2021-04-20 12:58:55 +0300 | |
commit | 24bf350947acb7fcb62878932d520387bc922a96 (patch) | |
tree | 447c8ad367db6769c5e6bd66f85fcf059524999b /cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java | |
parent | 3da52076907385c8a42b817f7aceb65e0dcb7cdd (diff) |
Create child data node (part 1): CPS service + REST
Issue-ID: CPS-337
Change-Id: I9c5c62d144b5301ac80e2b82a5cc66a980dad011
Signed-off-by: Ruslan Kashapov <ruslan.kashapov@pantheon.tech>
Diffstat (limited to 'cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java')
-rwxr-xr-x | cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java b/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java index f466ebcef..3385f35fe 100755 --- a/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java +++ b/cps-rest/src/main/java/org/onap/cps/rest/controller/DataRestController.java @@ -21,8 +21,6 @@ package org.onap.cps.rest.controller; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import org.onap.cps.api.CpsDataService; import org.onap.cps.rest.api.CpsDataApi; import org.onap.cps.spi.FetchDescendantsOption; @@ -38,13 +36,19 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("${rest.api.cps-base-path}") public class DataRestController implements CpsDataApi { + private static final String ROOT_XPATH = "/"; + @Autowired private CpsDataService cpsDataService; @Override - public ResponseEntity<String> createNode(@Valid final String jsonData, @NotNull final String dataspaceName, - @NotNull @Valid final String anchorName) { - cpsDataService.saveData(dataspaceName, anchorName, jsonData); + public ResponseEntity<String> createNode(final String jsonData, final String dataspaceName, final String anchorName, + final String parentNodeXpath) { + if (isRootXpath(parentNodeXpath)) { + cpsDataService.saveData(dataspaceName, anchorName, jsonData); + } else { + cpsDataService.saveData(dataspaceName, anchorName, parentNodeXpath, jsonData); + } return new ResponseEntity<>(HttpStatus.CREATED); } @@ -56,7 +60,7 @@ public class DataRestController implements CpsDataApi { @Override public ResponseEntity<Object> getNodeByDataspaceAndAnchor(final String dataspaceName, final String anchorName, final String xpath, final Boolean includeDescendants) { - if ("/".equals(xpath)) { + if (isRootXpath(xpath)) { return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); } final FetchDescendantsOption fetchDescendantsOption = Boolean.TRUE.equals(includeDescendants) @@ -79,4 +83,8 @@ public class DataRestController implements CpsDataApi { cpsDataService.replaceNodeTree(dataspaceName, anchorName, parentNodeXpath, jsonData); return new ResponseEntity<>(HttpStatus.OK); } + + private static boolean isRootXpath(final String xpath) { + return ROOT_XPATH.equals(xpath); + } } |