diff options
author | 2021-08-11 16:40:36 +0000 | |
---|---|---|
committer | 2021-08-11 16:40:36 +0000 | |
commit | 2ff8b7c6c11e56f6104ed529cc858f5fc128ea25 (patch) | |
tree | dcda7ca95851e65de4d424e881ba87a09e356d1a /cps-rest/src/main/java/org | |
parent | be21595d53636e2c9b912bfbe8dfdefb81edc70f (diff) | |
parent | 4802d46c0d3e7d65a9dcfbf6c168c6466d55c0b2 (diff) |
Merge "Update response query format"
Diffstat (limited to 'cps-rest/src/main/java/org')
-rw-r--r-- | cps-rest/src/main/java/org/onap/cps/rest/controller/QueryRestController.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/cps-rest/src/main/java/org/onap/cps/rest/controller/QueryRestController.java b/cps-rest/src/main/java/org/onap/cps/rest/controller/QueryRestController.java index b7fc9f795..8aa65a005 100644 --- a/cps-rest/src/main/java/org/onap/cps/rest/controller/QueryRestController.java +++ b/cps-rest/src/main/java/org/onap/cps/rest/controller/QueryRestController.java @@ -21,12 +21,16 @@ package org.onap.cps.rest.controller; import com.google.gson.Gson; +import java.util.ArrayList; import java.util.Collection; +import java.util.List; +import java.util.Map; import javax.validation.Valid; import org.onap.cps.api.CpsQueryService; import org.onap.cps.rest.api.CpsQueryApi; 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; @@ -47,6 +51,10 @@ public class QueryRestController implements CpsQueryApi { ? FetchDescendantsOption.INCLUDE_ALL_DESCENDANTS : FetchDescendantsOption.OMIT_DESCENDANTS; final Collection<DataNode> dataNodes = cpsQueryService.queryDataNodes(dataspaceName, anchorName, cpsPath, fetchDescendantsOption); - return new ResponseEntity<>(new Gson().toJson(dataNodes), HttpStatus.OK); + final List<Map<String, Object>> dataNodeList = new ArrayList<>(); + for (final DataNode dataNode : dataNodes) { + dataNodeList.add(DataMapUtils.toDataMap(dataNode)); + } + return new ResponseEntity<>(new Gson().toJson(dataNodeList), HttpStatus.OK); } } |