From 2b7d23c2ffa067732df1ecc3879d252646dad2da Mon Sep 17 00:00:00 2001 From: "Rishi.Chail" Date: Wed, 14 Apr 2021 00:51:44 +0100 Subject: Get Data under anchor using single root Issue-ID: CPS-325 Signed-off-by: Rishi.Chail Change-Id: Id8da3d767199c5767c625b55d175ac6791dcca48 --- .../main/java/org/onap/cps/rest/controller/DataRestController.java | 7 ++----- .../org/onap/cps/rest/controller/DataRestControllerSpec.groovy | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'cps-rest') 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 3385f35fe..ddd3ac48e 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 @@ -60,13 +60,10 @@ public class DataRestController implements CpsDataApi { @Override public ResponseEntity getNodeByDataspaceAndAnchor(final String dataspaceName, final String anchorName, final String xpath, final Boolean includeDescendants) { - if (isRootXpath(xpath)) { - return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); - } final FetchDescendantsOption fetchDescendantsOption = Boolean.TRUE.equals(includeDescendants) ? FetchDescendantsOption.INCLUDE_ALL_DESCENDANTS : FetchDescendantsOption.OMIT_DESCENDANTS; - final DataNode dataNode = - cpsDataService.getDataNode(dataspaceName, anchorName, xpath, fetchDescendantsOption); + final DataNode dataNode = cpsDataService.getDataNode(dataspaceName, anchorName, xpath, + fetchDescendantsOption); return new ResponseEntity<>(DataMapUtils.toDataMap(dataNode), HttpStatus.OK); } diff --git a/cps-rest/src/test/groovy/org/onap/cps/rest/controller/DataRestControllerSpec.groovy b/cps-rest/src/test/groovy/org/onap/cps/rest/controller/DataRestControllerSpec.groovy index 713dda140..299299ce2 100755 --- a/cps-rest/src/test/groovy/org/onap/cps/rest/controller/DataRestControllerSpec.groovy +++ b/cps-rest/src/test/groovy/org/onap/cps/rest/controller/DataRestControllerSpec.groovy @@ -191,7 +191,7 @@ class DataRestControllerSpec extends Specification { 'no dataspace' | '/x-path' | new DataspaceNotFoundException('') || HttpStatus.BAD_REQUEST 'no anchor' | '/x-path' | new AnchorNotFoundException('', '') || HttpStatus.BAD_REQUEST 'no data' | '/x-path' | new DataNodeNotFoundException('', '', '') || HttpStatus.NOT_FOUND - 'empty path' | '' | new IllegalStateException() || HttpStatus.NOT_IMPLEMENTED + 'root path' | '/' | new DataNodeNotFoundException('', '') || HttpStatus.NOT_FOUND 'already defined' | '/x-path' | new AlreadyDefinedException('', new Throwable()) || HttpStatus.CONFLICT } -- cgit 1.2.3-korg