import static org.onap.cps.spi.FetchDescendantsOption.INCLUDE_ALL_DESCENDANTS;
import java.time.OffsetDateTime;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
cmHandleJsonData, NO_TIMESTAMP);
}
+ /**
+ * Method to save batch of cm handles.
+ *
+ * @param yangModelCmHandles cm handle represented as Yang Models
+ */
+ public void saveCmHandleBatch(final Collection<YangModelCmHandle> yangModelCmHandles) {
+ final List<String> cmHandlesJsonData = new ArrayList<>();
+ yangModelCmHandles.forEach(yangModelCmHandle -> cmHandlesJsonData.add(
+ String.format("{\"cm-handles\":[%s]}", jsonObjectMapper.asJsonString(yangModelCmHandle))));
+ cpsDataService.saveListElementsBatch(NCMP_DATASPACE_NAME, NCMP_DMI_REGISTRY_ANCHOR,
+ NCMP_DMI_REGISTRY_PARENT, cmHandlesJsonData, NO_TIMESTAMP);
+ }
+
/**
* Method to delete a list or a list element.
*
}
}
+ def 'Save Multiple Cmhandles'() {
+ given: 'cm handles represented as Yang Model'
+ def yangModelCmHandle1 = new YangModelCmHandle(id: 'cmhandle1')
+ def yangModelCmHandle2 = new YangModelCmHandle(id: 'cmhandle2')
+ when: 'the cm handles are saved'
+ objectUnderTest.saveCmHandleBatch([yangModelCmHandle1, yangModelCmHandle2])
+ then: 'CPS Data Service persists both cm handles as a batch'
+ 1 * mockCpsDataService.saveListElementsBatch('NCMP-Admin','ncmp-dmi-registry','/dmi-registry',_,null) >> {
+ args -> {
+ def jsonDataList = (args[3] as List)
+ (jsonDataList[0] as String).contains('cmhandle1')
+ (jsonDataList[0] as String).contains('cmhandle2')
+ }
+ }
+ }
+
def 'Delete list or list elements'() {
when: 'the method to delete list or list elements is called'
objectUnderTest.deleteListOrListElement('sample xPath')
addChildDataNodes(dataspaceName, anchorName, parentNodeXpath, newListElements);
}
+ @Override
+ @Transactional
+ public void addListElementsBatch(final String dataspaceName, final String anchorName, final String parentNodeXpath,
+ final Collection<Collection<DataNode>> newListsElements) {
+
+ newListsElements.forEach(
+ newListElement -> addListElements(dataspaceName, anchorName, parentNodeXpath, newListElement));
+
+ }
+
private void addChildDataNodes(final String dataspaceName, final String anchorName, final String parentNodeXpath,
final Collection<DataNode> newChildren) {
final FragmentEntity parentFragmentEntity = getFragmentByXpath(dataspaceName, anchorName, parentNodeXpath);
}
@Sql([CLEAR_DATA, SET_DATA])
- def 'Add multiple new list elements including an element with a child datanode.'() {
+ def 'Add collection of multiple new list elements including an element with a child datanode.'() {
given: 'two new child list elements for an existing parent'
def listElementXpaths = ['/parent-201/child-204[@key="NEW1"]', '/parent-201/child-204[@key="NEW2"]']
def listElements = toDataNodes(listElementXpaths)
def grandChild = buildDataNode('/parent-201/child-204[@key="NEW1"]/grand-child-204[@key2="NEW1-CHILD"]', [leave:'value'], [])
listElements[0].childDataNodes = [grandChild]
when: 'the new data node (list elements) are added to an existing parent node'
- objectUnderTest.addListElements(DATASPACE_NAME, ANCHOR_NAME3, '/parent-201', listElements)
+ objectUnderTest.addListElementsBatch(DATASPACE_NAME, ANCHOR_NAME3, '/parent-201', [listElements])
then: 'new entries are successfully persisted, parent node now contains 5 children (2 new + 3 existing before)'
def parentFragment = fragmentRepository.getById(LIST_DATA_NODE_PARENT201_FRAGMENT_ID)
def allChildXpaths = parentFragment.childFragments.collect { it.xpath }
void saveListElements(String dataspaceName, String anchorName, String parentNodeXpath, String jsonData,
OffsetDateTime observedTimestamp);
+ /**
+ * Persists child data fragment representing one or more list elements under existing data node for the
+ * given anchor and dataspace.
+ *
+ * @param dataspaceName dataspace name
+ * @param anchorName anchor name
+ * @param parentNodeXpath parent node xpath
+ * @param jsonDataList collection of json data representing list element(s)
+ * @param observedTimestamp observedTimestamp
+ */
+ void saveListElementsBatch(String dataspaceName, String anchorName, String parentNodeXpath,
+ Collection<String> jsonDataList, OffsetDateTime observedTimestamp);
+
/**
* Retrieves datanode by XPath for given dataspace and anchor.
*
processDataUpdatedEventAsync(dataspaceName, anchorName, parentNodeXpath, UPDATE, observedTimestamp);
}
+ @Override
+ public void saveListElementsBatch(final String dataspaceName, final String anchorName, final String parentNodeXpath,
+ final Collection<String> jsonDataList, final OffsetDateTime observedTimestamp) {
+ CpsValidator.validateNameCharacters(dataspaceName, anchorName);
+ final Collection<Collection<DataNode>> listElementDataNodeCollections =
+ buildDataNodes(dataspaceName, anchorName, parentNodeXpath, jsonDataList);
+ cpsDataPersistenceService.addListElementsBatch(dataspaceName, anchorName, parentNodeXpath,
+ listElementDataNodeCollections);
+ processDataUpdatedEventAsync(dataspaceName, anchorName, parentNodeXpath, UPDATE, observedTimestamp);
+ }
+
@Override
public DataNode getDataNode(final String dataspaceName, final String anchorName, final String xpath,
final FetchDescendantsOption fetchDescendantsOption) {
}
+ private Collection<Collection<DataNode>> buildDataNodes(final String dataspaceName, final String anchorName,
+ final String parentNodeXpath, final Collection<String> jsonDataList) {
+ return jsonDataList.stream()
+ .map(jsonData -> buildDataNodes(dataspaceName, anchorName, parentNodeXpath, jsonData))
+ .collect(Collectors.toList());
+ }
+
private void processDataUpdatedEventAsync(final String dataspaceName, final String anchorName, final String xpath,
final Operation operation, final OffsetDateTime observedTimestamp) {
try {
void addListElements(String dataspaceName, String anchorName, String parentNodeXpath,
Collection<DataNode> listElementsCollection);
+ /**
+ * Adds list child elements to a Fragment.
+ *
+ * @param dataspaceName dataspace name
+ * @param anchorName anchor name
+ * @param parentNodeXpath parent node xpath
+ * @param listElementsCollections collections of data nodes representing list elements
+ */
+ void addListElementsBatch(String dataspaceName, String anchorName, String parentNodeXpath,
+ Collection<Collection<DataNode>> listElementsCollections);
+
/**
* Retrieves datanode by XPath for given dataspace and anchor.
*
import spock.lang.Specification
import java.time.OffsetDateTime
+import java.util.stream.Collectors
class CpsDataServiceImplSpec extends Specification {
def mockCpsDataPersistenceService = Mock(CpsDataPersistenceService)
1 * mockNotificationService.processDataUpdatedEvent(dataspaceName, anchorName, '/test-tree', Operation.UPDATE, observedTimestamp)
}
+ def 'Saving collection of a batch with data fragment under existing node.'() {
+ given: 'schema set for given anchor and dataspace references test-tree model'
+ setupSchemaSetMocks('test-tree.yang')
+ when: 'save data method is invoked with list element json data'
+ def jsonData = '{"branch": [{"name": "A"}, {"name": "B"}]}'
+ objectUnderTest.saveListElementsBatch(dataspaceName, anchorName, '/test-tree', [jsonData], observedTimestamp)
+ then: 'the persistence service method is invoked with correct parameters'
+ 1 * mockCpsDataPersistenceService.addListElementsBatch(dataspaceName, anchorName, '/test-tree',_) >> {
+ args -> {
+ def listElementsCollection = args[3] as Collection<Collection<DataNode>>
+ assert listElementsCollection.size() == 1
+ def listOfXpaths = listElementsCollection.stream().flatMap(x -> x.stream()).map(it-> it.xpath).collect(Collectors.toList())
+ assert listOfXpaths.size() == 2
+ assert listOfXpaths.containsAll(['/test-tree/branch[@name=\'B\']','/test-tree/branch[@name=\'A\']'])
+ }
+ }
+ and: 'data updated event is sent to notification service'
+ 1 * mockNotificationService.processDataUpdatedEvent(dataspaceName, anchorName, '/test-tree', Operation.UPDATE, observedTimestamp)
+ }
+
def 'Saving empty list element data fragment.'() {
given: 'schema set for given anchor and dataspace references test-tree model'
setupSchemaSetMocks('test-tree.yang')
Code Review / cps.git / commitdiff