Merge "Support pagination in query across all anchors(ep4)"

diff --cc cps-rest/docs/openapi/components.yml
Simple merge

diff --cc cps-rest/src/test/groovy/org/onap/cps/rest/controller/QueryRestControllerSpec.groovy
index 2bf29fc,8ee01c0..fd669b7
--- 1/cps-rest/src/test/groovy/org/onap/cps/rest/controller/QueryRestControllerSpec.groovy
--- 2/cps-rest/src/test/groovy/org/onap/cps/rest/controller/QueryRestControllerSpec.groovy
+++ b/cps-rest/src/test/groovy/org/onap/cps/rest/controller/QueryRestControllerSpec.groovy
@@@ -23,9 -23,9 +23,10 @@@
  
  package org.onap.cps.rest.controller
  
+ import org.onap.cps.spi.PaginationOption
  import org.onap.cps.utils.PrefixResolver
  
 +import static org.onap.cps.spi.FetchDescendantsOption.DIRECT_CHILDREN_ONLY
  import static org.onap.cps.spi.FetchDescendantsOption.INCLUDE_ALL_DESCENDANTS
  import static org.onap.cps.spi.FetchDescendantsOption.OMIT_DESCENDANTS
  import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
@@@ -144,6 -147,40 +152,41 @@@ class QueryRestControllerSpec extends S
              'no descendants by default' | ''                             || OMIT_DESCENDANTS
              'no descendant explicitly'  | 'none'                         || OMIT_DESCENDANTS
              'descendants'               | 'all'                          || INCLUDE_ALL_DESCENDANTS
 +            'direct children'           | 'direct'                       || DIRECT_CHILDREN_ONLY
      }
+ 
+     def 'Query data node by cps path for the given dataspace across all anchors with pagination #scenario.'() {
+         given: 'service method returns a list containing a data node from different anchors'
+         def dataNode1 = new DataNodeBuilder().withXpath('/xpath')
+                 .withAnchor('my_anchor')
+                 .withLeaves([leaf: 'value', leafList: ['leaveListElement1', 'leaveListElement2']]).build()
+         def dataNode2 = new DataNodeBuilder().withXpath('/xpath')
+                 .withAnchor('my_anchor_2')
+                 .withLeaves([leaf: 'value', leafList: ['leaveListElement3', 'leaveListElement4']]).build()
+         and: 'the query endpoint'
+             def dataspaceName = 'my_dataspace'
+             def cpsPath = 'some/cps/path'
+             def dataNodeEndpoint = "$basePath/v2/dataspaces/$dataspaceName/nodes/query"
+             mockCpsQueryService.queryDataNodesAcrossAnchors(dataspaceName, cpsPath,
+                 INCLUDE_ALL_DESCENDANTS, new PaginationOption(pageIndex,pageSize)) >> [dataNode1, dataNode2]
+             mockCpsQueryService.countAnchorsForDataspaceAndCpsPath(dataspaceName, cpsPath) >> totalAnchors
+         when: 'query data nodes API is invoked'
+             def response =
+                 mvc.perform(
+                         get(dataNodeEndpoint)
+                                 .param('cps-path', cpsPath)
+                                 .param('descendants', "all")
+                                 .param('pageIndex', String.valueOf(pageIndex))
+                                 .param('pageSize', String.valueOf(pageSize)))
+                         .andReturn().response
+         then: 'the response contains the the datanode in json format'
+             assert response.status == HttpStatus.OK.value()
+             assert Integer.valueOf(response.getHeaderValue("total-pages")) == expectedPageSize
+             assert response.getContentAsString().contains('{"xpath":{"leaf":"value","leafList":["leaveListElement1","leaveListElement2"]}}')
+             assert response.getContentAsString().contains('{"xpath":{"leaf":"value","leafList":["leaveListElement3","leaveListElement4"]}}')
+         where: 'the following options for include descendants are provided in the request'
+             scenario                     | pageIndex | pageSize | totalAnchors || expectedPageSize
+             '1st page with all anchors'  | 1         | 3        | 3            || 1
+             '1st page with less anchors' | 1         | 2        | 3            || 2
+     }
  }

diff --cc cps-ri/src/main/java/org/onap/cps/spi/impl/CpsDataPersistenceServiceImpl.java
Simple merge

diff --cc cps-ri/src/main/java/org/onap/cps/spi/repository/FragmentRepository.java
Simple merge

diff --cc docs/api/swagger/cps/openapi.yaml
Simple merge

diff --cc integration-test/src/test/groovy/org/onap/cps/integration/functional/CpsDataServiceIntegrationSpec.groovy
Simple merge