Fetching data node by xpath - rest and service layers

[cps.git] / cps-rest / src / main / java / org / onap / cps / rest / controller / DataRestController.java

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 fcb8ddc..4f23a8a 100644 (file)
--- 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
@@ -1,6 +1,7 @@
 /*
- * ============LICENSE_START=======================================================
+ *  ============LICENSE_START=======================================================
  *  Copyright (C) 2020 Bell Canada. All rights reserved.
+ *  Modifications Copyright (C) 2021 Pantheon.tech
  *  ================================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -20,35 +21,48 @@
 package org.onap.cps.rest.controller;
 
 import javax.validation.Valid;
-import org.modelmapper.ModelMapper;
-import org.onap.cps.api.CpsAdminService;
+import javax.validation.constraints.NotNull;
+import org.onap.cps.api.CpsDataService;
 import org.onap.cps.rest.api.CpsDataApi;
+import org.onap.cps.spi.FetchDescendantsOption;
+import org.onap.cps.spi.model.DataNode;
+import org.onap.cps.utils.DataMapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 
 @RestController
+@RequestMapping("${rest.api.cps-base-path}")
 public class DataRestController implements CpsDataApi {
 
     @Autowired
-    private CpsAdminService cpsAdminService;
-
-    @Autowired
-    private ModelMapper modelMapper;
+    private CpsDataService cpsDataService;
 
     @Override
-    public ResponseEntity<String> createNode(@Valid final MultipartFile multipartFile, final String dataspaceName) {
-        return null;
+    public ResponseEntity<String> createNode(@Valid final String jsonData, @NotNull final String dataspaceName,
+        @NotNull @Valid final String anchorName) {
+        cpsDataService.saveData(dataspaceName, anchorName, jsonData);
+        return new ResponseEntity<>(HttpStatus.CREATED);
     }
 
     @Override
-    public ResponseEntity<Object> getNode(final String dataspaceName) {
+    public ResponseEntity<Object> getNodeByDataspace(final String dataspaceName) {
         return null;
     }
 
     @Override
-    public ResponseEntity<Object> getNodeByDataspaceAndAnchor(final String dataspaceName, final String anchorName) {
-        return null;
+    public ResponseEntity<Object> getNodeByDataspaceAndAnchor(final String dataspaceName, final String anchorName,
+        final String cpsPath, final Boolean includeDescendants) {
+        if ("/".equals(cpsPath)) {
+            // TODO: extracting data by anchor only (root data node and below)
+            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, cpsPath, fetchDescendantsOption);
+        return new ResponseEntity<>(DataMapUtils.toDataMap(dataNode), HttpStatus.OK);
     }
 }