private final JsonObjectMapper jsonObjectMapper;
private final SessionManager sessionManager;
- private static final String REG_EX_FOR_OPTIONAL_LIST_INDEX = "(\\[@[\\s\\S]+?]){0,1})";
+ private static final String REG_EX_FOR_OPTIONAL_LIST_INDEX = "(\\[@[\\s\\S]+?])?)";
@Override
public void addChildDataNode(final String dataspaceName, final String anchorName, final String parentNodeXpath,
final DataNode newChildDataNode) {
- addNewChildDataNode(dataspaceName, anchorName, parentNodeXpath, newChildDataNode);
+ final AnchorEntity anchorEntity = getAnchorEntity(dataspaceName, anchorName);
+ addNewChildDataNode(anchorEntity, parentNodeXpath, newChildDataNode);
}
@Override
public void addChildDataNodes(final String dataspaceName, final String anchorName,
final String parentNodeXpath, final Collection<DataNode> dataNodes) {
- addChildrenDataNodes(dataspaceName, anchorName, parentNodeXpath, dataNodes);
+ final AnchorEntity anchorEntity = getAnchorEntity(dataspaceName, anchorName);
+ addChildrenDataNodes(anchorEntity, parentNodeXpath, dataNodes);
}
@Override
public void addListElements(final String dataspaceName, final String anchorName, final String parentNodeXpath,
final Collection<DataNode> newListElements) {
- addChildrenDataNodes(dataspaceName, anchorName, parentNodeXpath, newListElements);
+ final AnchorEntity anchorEntity = getAnchorEntity(dataspaceName, anchorName);
+ addChildrenDataNodes(anchorEntity, parentNodeXpath, newListElements);
}
@Override
public void addMultipleLists(final String dataspaceName, final String anchorName, final String parentNodeXpath,
final Collection<Collection<DataNode>> newLists) {
+ final AnchorEntity anchorEntity = getAnchorEntity(dataspaceName, anchorName);
final Collection<String> failedXpaths = new HashSet<>();
- newLists.forEach(newList -> {
+ for (final Collection<DataNode> newList : newLists) {
try {
- addChildrenDataNodes(dataspaceName, anchorName, parentNodeXpath, newList);
+ addChildrenDataNodes(anchorEntity, parentNodeXpath, newList);
} catch (final AlreadyDefinedExceptionBatch e) {
failedXpaths.addAll(e.getAlreadyDefinedXpaths());
}
- });
-
+ }
if (!failedXpaths.isEmpty()) {
throw new AlreadyDefinedExceptionBatch(failedXpaths);
}
-
}
- private void addNewChildDataNode(final String dataspaceName, final String anchorName,
- final String parentNodeXpath, final DataNode newChild) {
- final FragmentEntity parentFragmentEntity =
- getFragmentEntity(dataspaceName, anchorName, parentNodeXpath);
- final FragmentEntity newChildAsFragmentEntity =
- convertToFragmentWithAllDescendants(parentFragmentEntity.getDataspace(),
- parentFragmentEntity.getAnchor(), newChild);
+ private void addNewChildDataNode(final AnchorEntity anchorEntity, final String parentNodeXpath,
+ final DataNode newChild) {
+ final FragmentEntity parentFragmentEntity = getFragmentEntity(anchorEntity, parentNodeXpath);
+ final FragmentEntity newChildAsFragmentEntity = convertToFragmentWithAllDescendants(anchorEntity, newChild);
newChildAsFragmentEntity.setParentId(parentFragmentEntity.getId());
try {
fragmentRepository.save(newChildAsFragmentEntity);
} catch (final DataIntegrityViolationException e) {
- throw AlreadyDefinedException.forDataNode(newChild.getXpath(), anchorName, e);
+ throw AlreadyDefinedException.forDataNode(newChild.getXpath(), anchorEntity.getName(), e);
}
-
}
- private void addChildrenDataNodes(final String dataspaceName, final String anchorName, final String parentNodeXpath,
+ private void addChildrenDataNodes(final AnchorEntity anchorEntity, final String parentNodeXpath,
final Collection<DataNode> newChildren) {
- final FragmentEntity parentFragmentEntity =
- getFragmentEntity(dataspaceName, anchorName, parentNodeXpath);
+ final FragmentEntity parentFragmentEntity = getFragmentEntity(anchorEntity, parentNodeXpath);
final List<FragmentEntity> fragmentEntities = new ArrayList<>(newChildren.size());
try {
- newChildren.forEach(newChildAsDataNode -> {
+ for (final DataNode newChildAsDataNode : newChildren) {
final FragmentEntity newChildAsFragmentEntity =
- convertToFragmentWithAllDescendants(parentFragmentEntity.getDataspace(),
- parentFragmentEntity.getAnchor(), newChildAsDataNode);
+ convertToFragmentWithAllDescendants(anchorEntity, newChildAsDataNode);
newChildAsFragmentEntity.setParentId(parentFragmentEntity.getId());
fragmentEntities.add(newChildAsFragmentEntity);
- });
+ }
fragmentRepository.saveAll(fragmentEntities);
} catch (final DataIntegrityViolationException e) {
log.warn("Exception occurred : {} , While saving : {} children, retrying using individual save operations",
e, fragmentEntities.size());
- retrySavingEachChildIndividually(dataspaceName, anchorName, parentNodeXpath, newChildren);
+ retrySavingEachChildIndividually(anchorEntity, parentNodeXpath, newChildren);
}
}
- private void retrySavingEachChildIndividually(final String dataspaceName, final String anchorName,
- final String parentNodeXpath,
+ private void retrySavingEachChildIndividually(final AnchorEntity anchorEntity, final String parentNodeXpath,
final Collection<DataNode> newChildren) {
final Collection<String> failedXpaths = new HashSet<>();
for (final DataNode newChild : newChildren) {
try {
- addNewChildDataNode(dataspaceName, anchorName, parentNodeXpath, newChild);
+ addNewChildDataNode(anchorEntity, parentNodeXpath, newChild);
} catch (final AlreadyDefinedException e) {
failedXpaths.add(newChild.getXpath());
}
@Override
public void storeDataNodes(final String dataspaceName, final String anchorName,
final Collection<DataNode> dataNodes) {
- final DataspaceEntity dataspaceEntity = dataspaceRepository.getByName(dataspaceName);
- final AnchorEntity anchorEntity = anchorRepository.getByDataspaceAndName(dataspaceEntity, anchorName);
+ final AnchorEntity anchorEntity = getAnchorEntity(dataspaceName, anchorName);
final List<FragmentEntity> fragmentEntities = new ArrayList<>(dataNodes.size());
try {
for (final DataNode dataNode: dataNodes) {
- final FragmentEntity fragmentEntity = convertToFragmentWithAllDescendants(dataspaceEntity, anchorEntity,
- dataNode);
+ final FragmentEntity fragmentEntity = convertToFragmentWithAllDescendants(anchorEntity, dataNode);
fragmentEntities.add(fragmentEntity);
}
fragmentRepository.saveAll(fragmentEntities);
} catch (final DataIntegrityViolationException exception) {
log.warn("Exception occurred : {} , While saving : {} data nodes, Retrying saving data nodes individually",
exception, dataNodes.size());
- storeDataNodesIndividually(dataspaceName, anchorName, dataNodes);
+ storeDataNodesIndividually(anchorEntity, dataNodes);
}
}
- private void storeDataNodesIndividually(final String dataspaceName, final String anchorName,
- final Collection<DataNode> dataNodes) {
- final DataspaceEntity dataspaceEntity = dataspaceRepository.getByName(dataspaceName);
- final AnchorEntity anchorEntity = anchorRepository.getByDataspaceAndName(dataspaceEntity, anchorName);
+ private void storeDataNodesIndividually(final AnchorEntity anchorEntity, final Collection<DataNode> dataNodes) {
final Collection<String> failedXpaths = new HashSet<>();
for (final DataNode dataNode: dataNodes) {
try {
- final FragmentEntity fragmentEntity = convertToFragmentWithAllDescendants(dataspaceEntity, anchorEntity,
- dataNode);
+ final FragmentEntity fragmentEntity = convertToFragmentWithAllDescendants(anchorEntity, dataNode);
fragmentRepository.save(fragmentEntity);
} catch (final DataIntegrityViolationException e) {
failedXpaths.add(dataNode.getXpath());
* Convert DataNode object into Fragment and places the result in the fragments placeholder. Performs same action
* for all DataNode children recursively.
*
- * @param dataspaceEntity dataspace
* @param anchorEntity anchorEntity
* @param dataNodeToBeConverted dataNode
* @return a Fragment built from current DataNode
*/
- private FragmentEntity convertToFragmentWithAllDescendants(final DataspaceEntity dataspaceEntity,
- final AnchorEntity anchorEntity,
+ private FragmentEntity convertToFragmentWithAllDescendants(final AnchorEntity anchorEntity,
final DataNode dataNodeToBeConverted) {
- final FragmentEntity parentFragment = toFragmentEntity(dataspaceEntity, anchorEntity, dataNodeToBeConverted);
+ final FragmentEntity parentFragment = toFragmentEntity(anchorEntity, dataNodeToBeConverted);
final Builder<FragmentEntity> childFragmentsImmutableSetBuilder = ImmutableSet.builder();
for (final DataNode childDataNode : dataNodeToBeConverted.getChildDataNodes()) {
- final FragmentEntity childFragment =
- convertToFragmentWithAllDescendants(parentFragment.getDataspace(), parentFragment.getAnchor(),
- childDataNode);
+ final FragmentEntity childFragment = convertToFragmentWithAllDescendants(anchorEntity, childDataNode);
childFragmentsImmutableSetBuilder.add(childFragment);
}
parentFragment.setChildFragments(childFragmentsImmutableSetBuilder.build());
return parentFragment;
}
- private FragmentEntity toFragmentEntity(final DataspaceEntity dataspaceEntity,
- final AnchorEntity anchorEntity, final DataNode dataNode) {
+ private FragmentEntity toFragmentEntity(final AnchorEntity anchorEntity, final DataNode dataNode) {
return FragmentEntity.builder()
- .dataspace(dataspaceEntity)
+ .dataspace(anchorEntity.getDataspace())
.anchor(anchorEntity)
.xpath(dataNode.getXpath())
.attributes(jsonObjectMapper.asJsonString(dataNode.getLeaves()))
public Collection<DataNode> getDataNodesForMultipleXpaths(final String dataspaceName, final String anchorName,
final Collection<String> xpaths,
final FetchDescendantsOption fetchDescendantsOption) {
- final Collection<FragmentEntity> fragmentEntities = getFragmentEntities(dataspaceName, anchorName, xpaths);
+ final AnchorEntity anchorEntity = getAnchorEntity(dataspaceName, anchorName);
+ final Collection<FragmentEntity> fragmentEntities = getFragmentEntities(anchorEntity, xpaths);
return toDataNodes(fragmentEntities, fetchDescendantsOption);
}
- private Collection<FragmentEntity> getFragmentEntities(final String dataspaceName, final String anchorName,
+ private Collection<FragmentEntity> getFragmentEntities(final AnchorEntity anchorEntity,
final Collection<String> xpaths) {
- final DataspaceEntity dataspaceEntity = dataspaceRepository.getByName(dataspaceName);
- final AnchorEntity anchorEntity = anchorRepository.getByDataspaceAndName(dataspaceEntity, anchorName);
-
final Collection<String> nonRootXpaths = new HashSet<>(xpaths);
final boolean haveRootXpath = nonRootXpaths.removeIf(CpsDataPersistenceServiceImpl::isRootXpath);
new HashSet<>(fragmentRepository.findByAnchorAndMultipleCpsPaths(anchorEntity.getId(), normalizedXpaths));
if (haveRootXpath) {
- final List<FragmentExtract> fragmentExtracts = fragmentRepository.getTopLevelFragments(dataspaceEntity,
- anchorEntity);
+ final List<FragmentExtract> fragmentExtracts = fragmentRepository.findAllExtractsByAnchor(anchorEntity);
fragmentEntities.addAll(FragmentEntityArranger.toFragmentEntityTrees(anchorEntity, fragmentExtracts));
}
return fragmentEntities;
}
- private FragmentEntity getFragmentEntity(final String dataspaceName, final String anchorName, final String xpath) {
- final DataspaceEntity dataspaceEntity = dataspaceRepository.getByName(dataspaceName);
- final AnchorEntity anchorEntity = anchorRepository.getByDataspaceAndName(dataspaceEntity, anchorName);
+ private FragmentEntity getFragmentEntity(final AnchorEntity anchorEntity, final String xpath) {
final FragmentEntity fragmentEntity;
if (isRootXpath(xpath)) {
- final List<FragmentExtract> fragmentExtracts = fragmentRepository.getTopLevelFragments(dataspaceEntity,
- anchorEntity);
+ final List<FragmentExtract> fragmentExtracts = fragmentRepository.findAllExtractsByAnchor(anchorEntity);
fragmentEntity = FragmentEntityArranger.toFragmentEntityTrees(anchorEntity, fragmentExtracts)
.stream().findFirst().orElse(null);
} else {
- final String normalizedXpath = getNormalizedXpath(xpath);
- fragmentEntity =
- fragmentRepository.getByDataspaceAndAnchorAndXpath(dataspaceEntity, anchorEntity, normalizedXpath);
+ fragmentEntity = fragmentRepository.getByAnchorAndXpath(anchorEntity, getNormalizedXpath(xpath));
}
if (fragmentEntity == null) {
- throw new DataNodeNotFoundException(dataspaceEntity.getName(), anchorEntity.getName(), xpath);
+ throw new DataNodeNotFoundException(anchorEntity.getDataspace().getName(), anchorEntity.getName(), xpath);
}
return fragmentEntity;
-
}
private Collection<FragmentEntity> buildFragmentEntitiesFromFragmentExtracts(final AnchorEntity anchorEntity,
final String normalizedXpath) {
final List<FragmentExtract> fragmentExtracts =
- fragmentRepository.findByAnchorIdAndParentXpath(anchorEntity.getId(), normalizedXpath);
- log.debug("Fetched {} fragment entities by anchor {} and cps path {}.",
- fragmentExtracts.size(), anchorEntity.getName(), normalizedXpath);
+ fragmentRepository.findByAnchorAndParentXpath(anchorEntity, normalizedXpath);
return FragmentEntityArranger.toFragmentEntityTrees(anchorEntity, fragmentExtracts);
-
}
@Override
public List<DataNode> queryDataNodes(final String dataspaceName, final String anchorName, final String cpsPath,
final FetchDescendantsOption fetchDescendantsOption) {
- final DataspaceEntity dataspaceEntity = dataspaceRepository.getByName(dataspaceName);
- final AnchorEntity anchorEntity = anchorRepository.getByDataspaceAndName(dataspaceEntity, anchorName);
+ final AnchorEntity anchorEntity = getAnchorEntity(dataspaceName, anchorName);
final CpsPathQuery cpsPathQuery;
try {
cpsPathQuery = CpsPathUtil.getCpsPathQuery(cpsPath);
final CpsPathQuery cpsPathQuery) {
final Set<String> ancestorXpath = new HashSet<>();
final Pattern pattern =
- Pattern.compile("([\\s\\S]*\\/" + Pattern.quote(cpsPathQuery.getAncestorSchemaNodeIdentifier())
- + REG_EX_FOR_OPTIONAL_LIST_INDEX + "\\/[\\s\\S]*");
+ Pattern.compile("([\\s\\S]*/" + Pattern.quote(cpsPathQuery.getAncestorSchemaNodeIdentifier())
+ + REG_EX_FOR_OPTIONAL_LIST_INDEX + "/[\\s\\S]*");
for (final FragmentEntity fragmentEntity : fragmentEntities) {
final Matcher matcher = pattern.matcher(fragmentEntity.getXpath());
if (matcher.matches()) {
@Override
public void updateDataLeaves(final String dataspaceName, final String anchorName, final String xpath,
final Map<String, Serializable> updateLeaves) {
- final FragmentEntity fragmentEntity = getFragmentEntity(dataspaceName, anchorName, xpath);
+ final AnchorEntity anchorEntity = getAnchorEntity(dataspaceName, anchorName);
+ final FragmentEntity fragmentEntity = getFragmentEntity(anchorEntity, xpath);
final String currentLeavesAsString = fragmentEntity.getAttributes();
final String mergedLeaves = mergeLeaves(updateLeaves, currentLeavesAsString);
fragmentEntity.setAttributes(mergedLeaves);
@Override
public void updateDataNodeAndDescendants(final String dataspaceName, final String anchorName,
final DataNode dataNode) {
- final FragmentEntity fragmentEntity = getFragmentEntity(dataspaceName, anchorName, dataNode.getXpath());
+ final AnchorEntity anchorEntity = getAnchorEntity(dataspaceName, anchorName);
+ final FragmentEntity fragmentEntity = getFragmentEntity(anchorEntity, dataNode.getXpath());
updateFragmentEntityAndDescendantsWithDataNode(fragmentEntity, dataNode);
try {
fragmentRepository.save(fragmentEntity);
@Override
public void updateDataNodesAndDescendants(final String dataspaceName, final String anchorName,
final List<DataNode> updatedDataNodes) {
+ final AnchorEntity anchorEntity = getAnchorEntity(dataspaceName, anchorName);
+
final Map<String, DataNode> xpathToUpdatedDataNode = updatedDataNodes.stream()
.collect(Collectors.toMap(DataNode::getXpath, dataNode -> dataNode));
final Collection<String> xpaths = xpathToUpdatedDataNode.keySet();
- final Collection<FragmentEntity> existingFragmentEntities =
- getFragmentEntities(dataspaceName, anchorName, xpaths);
+ final Collection<FragmentEntity> existingFragmentEntities = getFragmentEntities(anchorEntity, xpaths);
for (final FragmentEntity existingFragmentEntity : existingFragmentEntities) {
final DataNode updatedDataNode = xpathToUpdatedDataNode.get(existingFragmentEntity.getXpath());
try {
fragmentRepository.saveAll(existingFragmentEntities);
} catch (final StaleStateException staleStateException) {
- retryUpdateDataNodesIndividually(dataspaceName, anchorName, existingFragmentEntities);
+ retryUpdateDataNodesIndividually(anchorEntity, existingFragmentEntities);
}
}
- private void retryUpdateDataNodesIndividually(final String dataspaceName, final String anchorName,
+ private void retryUpdateDataNodesIndividually(final AnchorEntity anchorEntity,
final Collection<FragmentEntity> fragmentEntities) {
final Collection<String> failedXpaths = new HashSet<>();
-
- fragmentEntities.forEach(dataNodeFragment -> {
+ for (final FragmentEntity dataNodeFragment : fragmentEntities) {
try {
fragmentRepository.save(dataNodeFragment);
} catch (final StaleStateException e) {
failedXpaths.add(dataNodeFragment.getXpath());
}
- });
-
+ }
if (!failedXpaths.isEmpty()) {
final String failedXpathsConcatenated = String.join(",", failedXpaths);
throw new ConcurrencyException("Concurrent Transactions", String.format(
"DataNodes : %s in Dataspace :'%s' with Anchor : '%s' are updated by another transaction.",
- failedXpathsConcatenated, dataspaceName, anchorName));
+ failedXpathsConcatenated, anchorEntity.getDataspace().getName(), anchorEntity.getName()));
}
}
private void updateFragmentEntityAndDescendantsWithDataNode(final FragmentEntity existingFragmentEntity,
final DataNode newDataNode) {
-
existingFragmentEntity.setAttributes(jsonObjectMapper.asJsonString(newDataNode.getLeaves()));
final Map<String, FragmentEntity> existingChildrenByXpath = existingFragmentEntity.getChildFragments().stream()
.collect(Collectors.toMap(FragmentEntity::getXpath, childFragmentEntity -> childFragmentEntity));
final Collection<FragmentEntity> updatedChildFragments = new HashSet<>();
-
for (final DataNode newDataNodeChild : newDataNode.getChildDataNodes()) {
final FragmentEntity childFragment;
if (isNewDataNode(newDataNodeChild, existingChildrenByXpath)) {
- childFragment = convertToFragmentWithAllDescendants(
- existingFragmentEntity.getDataspace(), existingFragmentEntity.getAnchor(), newDataNodeChild);
+ childFragment = convertToFragmentWithAllDescendants(existingFragmentEntity.getAnchor(),
+ newDataNodeChild);
} else {
childFragment = existingChildrenByXpath.get(newDataNodeChild.getXpath());
updateFragmentEntityAndDescendantsWithDataNode(childFragment, newDataNodeChild);
@Transactional
public void replaceListContent(final String dataspaceName, final String anchorName, final String parentNodeXpath,
final Collection<DataNode> newListElements) {
- final FragmentEntity parentEntity = getFragmentEntity(dataspaceName, anchorName, parentNodeXpath);
+ final AnchorEntity anchorEntity = getAnchorEntity(dataspaceName, anchorName);
+ final FragmentEntity parentEntity = getFragmentEntity(anchorEntity, parentNodeXpath);
final String listElementXpathPrefix = getListElementXpathPrefix(newListElements);
final Map<String, FragmentEntity> existingListElementFragmentEntitiesByXPath =
extractListElementFragmentEntitiesByXPath(parentEntity.getChildFragments(), listElementXpathPrefix);
existingListElementFragmentEntitiesByXPath.get(newListElement.getXpath());
final FragmentEntity entityToBeAdded = getFragmentForReplacement(parentEntity, newListElement,
existingListElementEntity);
-
updatedChildFragmentEntities.add(entityToBeAdded);
}
parentEntity.getChildFragments().addAll(updatedChildFragmentEntities);
return;
}
- final DataspaceEntity dataspaceEntity = dataspaceRepository.getByName(dataspaceName);
- final AnchorEntity anchorEntity = anchorRepository.getByDataspaceAndName(dataspaceEntity, anchorName);
+ final AnchorEntity anchorEntity = getAnchorEntity(dataspaceName, anchorName);
final Collection<String> deleteChecklist = new HashSet<>(xpathsToDelete.size());
for (final String xpath : xpathsToDelete) {
try {
deleteChecklist.add(CpsPathUtil.getNormalizedXpath(xpath));
} catch (final PathParsingException e) {
- log.debug("Error parsing xpath \"{}\": {}", xpath, e.getMessage());
+ log.warn("Error parsing xpath \"{}\": {}", xpath, e.getMessage());
}
}
final DataNode newListElement,
final FragmentEntity existingListElementEntity) {
if (existingListElementEntity == null) {
- return convertToFragmentWithAllDescendants(
- parentEntity.getDataspace(), parentEntity.getAnchor(), newListElement);
+ return convertToFragmentWithAllDescendants(parentEntity.getAnchor(), newListElement);
}
if (newListElement.getChildDataNodes().isEmpty()) {
copyAttributesFromNewListElement(existingListElementEntity, newListElement);
}
return jsonObjectMapper.asJsonString(currentLeavesAsMap);
}
+
+ private AnchorEntity getAnchorEntity(final String dataspaceName, final String anchorName) {
+ final DataspaceEntity dataspaceEntity = dataspaceRepository.getByName(dataspaceName);
+ return anchorRepository.getByDataspaceAndName(dataspaceEntity, anchorName);
+ }
}
import java.util.Collection;\r
import java.util.List;\r
import java.util.Optional;\r
-import javax.validation.constraints.NotNull;\r
-import org.checkerframework.checker.nullness.qual.NonNull;\r
import org.onap.cps.spi.entities.AnchorEntity;\r
-import org.onap.cps.spi.entities.DataspaceEntity;\r
import org.onap.cps.spi.entities.FragmentEntity;\r
import org.onap.cps.spi.entities.FragmentExtract;\r
import org.onap.cps.spi.exceptions.DataNodeNotFoundException;\r
public interface FragmentRepository extends JpaRepository<FragmentEntity, Long>, FragmentRepositoryCpsPathQuery,\r
FragmentRepositoryMultiPathQuery, FragmentNativeRepository {\r
\r
- Optional<FragmentEntity> findByDataspaceAndAnchorAndXpath(@NonNull DataspaceEntity dataspaceEntity,\r
- @NonNull AnchorEntity anchorEntity,\r
- @NonNull String xpath);\r
+ Optional<FragmentEntity> findByAnchorAndXpath(AnchorEntity anchorEntity, String xpath);\r
\r
- default FragmentEntity getByDataspaceAndAnchorAndXpath(@NonNull DataspaceEntity dataspaceEntity,\r
- @NonNull AnchorEntity anchorEntity,\r
- @NonNull String xpath) {\r
- return findByDataspaceAndAnchorAndXpath(dataspaceEntity, anchorEntity, xpath)\r
- .orElseThrow(() -> new DataNodeNotFoundException(dataspaceEntity.getName(), anchorEntity.getName(), xpath));\r
+ default FragmentEntity getByAnchorAndXpath(final AnchorEntity anchorEntity, final String xpath) {\r
+ return findByAnchorAndXpath(anchorEntity, xpath).orElseThrow(() ->\r
+ new DataNodeNotFoundException(anchorEntity.getDataspace().getName(), anchorEntity.getName(), xpath));\r
}\r
\r
- @Query(\r
- value = "SELECT * FROM FRAGMENT WHERE anchor_id = :anchor AND dataspace_id = :dataspace AND parent_id is NULL",\r
- nativeQuery = true)\r
- List<FragmentEntity> findRootsByDataspaceAndAnchor(@Param("dataspace") int dataspaceId,\r
- @Param("anchor") int anchorId);\r
-\r
- @Query(value = "SELECT id, anchor_id AS anchorId, xpath, parent_id AS parentId,"\r
- + " CAST(attributes AS TEXT) AS attributes"\r
- + " FROM FRAGMENT WHERE anchor_id = :anchorId",\r
- nativeQuery = true)\r
- List<FragmentExtract> findRootsByAnchorId(@Param("anchorId") int anchorId);\r
+ boolean existsByAnchorId(int anchorId);\r
\r
- /**\r
- * find top level fragment by anchor.\r
- *\r
- * @param dataspaceEntity dataspace entity\r
- * @param anchorEntity anchor entity\r
- * @return FragmentEntity fragment entity\r
- */\r
- default List<FragmentExtract> getTopLevelFragments(DataspaceEntity dataspaceEntity,\r
- AnchorEntity anchorEntity) {\r
- final List<FragmentExtract> fragmentExtracts = findRootsByAnchorId(anchorEntity.getId());\r
- if (fragmentExtracts.isEmpty()) {\r
- throw new DataNodeNotFoundException(dataspaceEntity.getName(), anchorEntity.getName());\r
- }\r
- return fragmentExtracts;\r
- }\r
+ @Query("SELECT f FROM FragmentEntity f WHERE anchor = :anchor")\r
+ List<FragmentExtract> findAllExtractsByAnchor(@Param("anchor") AnchorEntity anchorEntity);\r
\r
@Modifying\r
- @Query("DELETE FROM FragmentEntity fe WHERE fe.anchor IN (:anchors)")\r
- void deleteByAnchorIn(@
NotNull @Param("anchors") Collection<AnchorEntity> anchorEntities);
\r+ @Query("DELETE FROM FragmentEntity WHERE anchor IN (:anchors)")\r
+ void deleteByAnchorIn(@Param("anchors") Collection<AnchorEntity> anchorEntities);\r
\r
- @Query(value = "SELECT id, anchor_id AS anchorId, xpath, parent_id AS parentId,"\r
- + " CAST(attributes AS TEXT) AS attributes"\r
- + " FROM FRAGMENT WHERE anchor_id = :anchorId"\r
- + " AND ( xpath = :parentXpath OR xpath LIKE CONCAT(:parentXpath,'/%') )",\r
- nativeQuery = true)\r
- List<FragmentExtract> findByAnchorIdAndParentXpath(@Param("anchorId") int anchorId,\r
- @Param("parentXpath") String parentXpath);\r
+ @Query("SELECT f FROM FragmentEntity f WHERE anchor = :anchor"\r
+ + " AND (xpath = :parentXpath OR xpath LIKE CONCAT(:parentXpath,'/%'))")\r
+ List<FragmentExtract> findByAnchorAndParentXpath(@Param("anchor") AnchorEntity anchorEntity,\r
+ @Param("parentXpath") String parentXpath);\r
\r
@Query(value = "SELECT id, anchor_id AS anchorId, xpath, parent_id AS parentId,"\r
+ " CAST(attributes AS TEXT) AS attributes"\r
List<FragmentExtract> quickFindWithDescendants(@Param("anchorId") int anchorId,\r
@Param("xpathRegex") String xpathRegex);\r
\r
- @Query("SELECT f.xpath FROM FragmentEntity f WHERE f.anchor = :anchor AND f.xpath IN :xpaths")\r
+ @Query("SELECT xpath FROM FragmentEntity f WHERE anchor = :anchor AND xpath IN :xpaths")\r
List<String> findAllXpathByAnchorAndXpathIn(@Param("anchor") AnchorEntity anchorEntity,\r
@Param("xpaths") Collection<String> xpaths);\r
\r
def static deleteTestChildXpath = "${deleteTestParentXPath}/child-with-slash[@key='a/b']"
def static deleteTestGrandChildXPath = "${deleteTestChildXpath}/grandChild"
- def expectedLeavesByXpathMap = [
- '/parent-207' : ['parent-leaf': 'parent-leaf value'],
- '/parent-207/child-001' : ['first-child-leaf': 'first-child-leaf value'],
- '/parent-207/child-002' : ['second-child-leaf': 'second-child-leaf value'],
- '/parent-207/child-002/grand-child': ['grand-child-leaf': 'grand-child-leaf value']
- ]
-
@Sql([CLEAR_DATA, SET_DATA])
def 'Get all datanodes with descendants .'() {
when: 'data nodes are retrieved by their xpath'
and: 'the (grand)child node of the new list entry is also present'
def dataspaceEntity = dataspaceRepository.getByName(DATASPACE_NAME)
def anchorEntity = anchorRepository.getByDataspaceAndName(dataspaceEntity, ANCHOR_NAME3)
- def grandChildFragmentEntity = fragmentRepository.findByDataspaceAndAnchorAndXpath(dataspaceEntity, anchorEntity, grandChild.xpath)
+ def grandChildFragmentEntity = fragmentRepository.findByAnchorAndXpath(anchorEntity, grandChild.xpath)
assert grandChildFragmentEntity.isPresent()
}
and: 'the new entity is inserted correctly'
def dataspaceEntity = dataspaceRepository.getByName(DATASPACE_NAME)
def anchorEntity = anchorRepository.getByDataspaceAndName(dataspaceEntity, ANCHOR_HAVING_SINGLE_TOP_LEVEL_FRAGMENT)
- fragmentRepository.findByDataspaceAndAnchorAndXpath(dataspaceEntity, anchorEntity, '/parent-200/child-new2').isPresent()
+ fragmentRepository.findByAnchorAndXpath(anchorEntity, '/parent-200/child-new2').isPresent()
}
@Sql([CLEAR_DATA, SET_DATA])
@Sql([CLEAR_DATA, SET_DATA])
def 'Delete data node for an anchor.'() {
given: 'a data-node exists for an anchor'
- assert fragmentsExistInDB(1001, 3003)
+ assert fragmentsExistInDB(3003)
when: 'data nodes are deleted '
objectUnderTest.deleteDataNodes(DATASPACE_NAME, ANCHOR_NAME3)
then: 'all data-nodes are deleted successfully'
- assert !fragmentsExistInDB(1001, 3003)
+ assert !fragmentsExistInDB(3003)
}
@Sql([CLEAR_DATA, SET_DATA])
def 'Delete data node for multiple anchors.'() {
given: 'a data-node exists for an anchor'
- assert fragmentsExistInDB(1001, 3001)
- assert fragmentsExistInDB(1001, 3003)
+ assert fragmentsExistInDB(3001)
+ assert fragmentsExistInDB(3003)
when: 'data nodes are deleted '
objectUnderTest.deleteDataNodes(DATASPACE_NAME, ['ANCHOR-001', 'ANCHOR-003'])
then: 'all data-nodes are deleted successfully'
- assert !fragmentsExistInDB(1001, 3001)
- assert !fragmentsExistInDB(1001, 3003)
+ assert !fragmentsExistInDB(3001)
+ assert !fragmentsExistInDB(3003)
}
- def fragmentsExistInDB(dataSpaceId, anchorId) {
- !fragmentRepository.findRootsByDataspaceAndAnchor(dataSpaceId, anchorId).isEmpty()
+ def fragmentsExistInDB(anchorId) {
+ fragmentRepository.existsByAnchorId(anchorId)
}
static Collection<DataNode> toDataNodes(xpaths) {
return jsonObjectMapper.convertJsonString(fragmentEntity.attributes, Map<String, Object>.class)
}
- def static assertLeavesMaps(actualLeavesMap, expectedLeavesMap) {
- expectedLeavesMap.forEach((key, value) -> {
- def actualValue = actualLeavesMap[key]
- if (value instanceof Collection<?> && actualValue instanceof Collection<?>) {
- assert value.size() == actualValue.size()
- assert value.containsAll(actualValue)
- } else {
- assert value == actualValue
- }
- })
- return true
- }
-
def static treeToFlatMapByXpath(Map<String, DataNode> flatMap, DataNode dataNodeTree) {
flatMap.put(dataNodeTree.xpath, dataNodeTree)
dataNodeTree.childDataNodes
def getFragmentByXpath(dataspaceName, anchorName, xpath) {
def dataspace = dataspaceRepository.getByName(dataspaceName)
def anchor = anchorRepository.getByDataspaceAndName(dataspace, anchorName)
- return fragmentRepository.findByDataspaceAndAnchorAndXpath(dataspace, anchor, xpath).orElseThrow()
+ return fragmentRepository.findByAnchorAndXpath(anchor, xpath).orElseThrow()
}
-
def createChildListAllHavingAttributeValue(parentXpath, tag, Collection keys, boolean addGrandChild) {
def listElementAsDataNodes = keysToXpaths(parentXpath, keys).collect {
new DataNodeBuilder()
import org.hibernate.StaleStateException
import org.onap.cps.spi.FetchDescendantsOption
import org.onap.cps.spi.entities.AnchorEntity
+import org.onap.cps.spi.entities.DataspaceEntity
import org.onap.cps.spi.entities.FragmentEntity
import org.onap.cps.spi.exceptions.ConcurrencyException
import org.onap.cps.spi.exceptions.DataValidationException
def objectUnderTest = Spy(new CpsDataPersistenceServiceImpl(mockDataspaceRepository, mockAnchorRepository,
mockFragmentRepository, jsonObjectMapper, mockSessionManager))
+ def anchorEntity = new AnchorEntity(id: 123, dataspace: new DataspaceEntity(id: 1))
+
+ def setup() {
+ mockAnchorRepository.getByDataspaceAndName(_, _) >> anchorEntity
+ }
+
def 'Storing data nodes individually when batch operation fails'(){
given: 'two data nodes and supporting repository mock behavior'
def dataNode1 = createDataNodeAndMockRepositoryMethodSupportingIt('xpath1','OK')
when: 'trying to store data nodes'
objectUnderTest.storeDataNodes('dataSpaceName', 'anchorName', [dataNode1, dataNode2])
then: 'the two data nodes are saved individually'
- 2 * mockFragmentRepository.save(_);
+ 2 * mockFragmentRepository.save(_)
}
def 'Store single data node.'() {
def 'Handling of StaleStateException (caused by concurrent updates) during update data node and descendants.'() {
given: 'the fragment repository returns a fragment entity'
- mockFragmentRepository.getByDataspaceAndAnchorAndXpath(*_) >> {
+ mockFragmentRepository.getByAnchorAndXpath(*_) >> {
def fragmentEntity = new FragmentEntity()
fragmentEntity.setChildFragments([new FragmentEntity()] as Set<FragmentEntity>)
return fragmentEntity
'/node1': 'OK',
'/node2': 'EXCEPTION',
'/node3': 'EXCEPTION'])
- and: 'db contains an anchor'
- mockAnchorRepository.getByDataspaceAndName(*_) >> new AnchorEntity(id:123)
and: 'the batch update will therefore also fail'
mockFragmentRepository.saveAll(*_) >> { throw new StaleStateException("concurrent updates") }
when: 'attempt batch update data nodes'
}
def 'Retrieving multiple data nodes.'() {
- given: 'db contains an anchor'
- def anchorEntity = new AnchorEntity(id:123)
- mockAnchorRepository.getByDataspaceAndName(*_) >> anchorEntity
- and: 'fragment repository returns a collection of fragments'
+ given: 'fragment repository returns a collection of fragments'
def fragmentEntity1 = new FragmentEntity(xpath: '/xpath1', childFragments: [])
def fragmentEntity2 = new FragmentEntity(xpath: '/xpath2', childFragments: [])
mockFragmentRepository.findByAnchorAndMultipleCpsPaths(123, ['/xpath1', '/xpath2'] as Set<String>) >> [fragmentEntity1, fragmentEntity2]
def 'update data node leaves: #scenario'(){
given: 'A node exists for the given xpath'
- mockFragmentRepository.getByDataspaceAndAnchorAndXpath(_, _, '/some/xpath') >> new FragmentEntity(xpath: '/some/xpath', attributes: existingAttributes)
+ mockFragmentRepository.getByAnchorAndXpath(_, '/some/xpath') >> new FragmentEntity(xpath: '/some/xpath', attributes: existingAttributes)
when: 'the node leaves are updated'
objectUnderTest.updateDataLeaves('some-dataspace', 'some-anchor', '/some/xpath', newAttributes as Map<String, Serializable>)
then: 'the fragment entity saved has the original and new attributes'
}
def 'update data node and descendants: #scenario'(){
- given: 'mocked responses'
- mockAnchorRepository.getByDataspaceAndName(_, _) >> new AnchorEntity(id:123)
+ given: 'the fragment repository returns fragment entities related to the xpath inputs'
mockFragmentRepository.findByAnchorAndMultipleCpsPaths(_, [] as Set) >> []
mockFragmentRepository.findByAnchorAndMultipleCpsPaths(_, ['/test/xpath'] as Set) >> [new FragmentEntity(xpath: '/test/xpath', childFragments: [])]
when: 'replace data node tree'
def 'update data nodes and descendants'() {
given: 'the fragment repository returns fragment entities related to the xpath inputs'
mockFragmentRepository.findByAnchorAndMultipleCpsPaths(_, ['/test/xpath1', '/test/xpath2'] as Set) >> [
- new FragmentEntity(xpath: '/test/xpath1', childFragments: []),
- new FragmentEntity(xpath: '/test/xpath2', childFragments: [])]
- and: 'db contains an anchor'
- mockAnchorRepository.getByDataspaceAndName(*_) >> new AnchorEntity(id:123)
+ new FragmentEntity(xpath: '/test/xpath1', childFragments: [], anchor: anchorEntity),
+ new FragmentEntity(xpath: '/test/xpath2', childFragments: [], anchor: anchorEntity)]
and: 'some data nodes with descendants'
def dataNode1 = new DataNode(xpath: '/test/xpath1', leaves: ['id': 'testId1'], childDataNodes: [new DataNode(xpath: '/test/xpath1/child', leaves: ['id': 'childTestId1'])])
def dataNode2 = new DataNode(xpath: '/test/xpath2', leaves: ['id': 'testId2'], childDataNodes: [new DataNode(xpath: '/test/xpath2/child', leaves: ['id': 'childTestId2'])])
def createDataNodeAndMockRepositoryMethodSupportingIt(xpath, scenario) {
def dataNode = new DataNodeBuilder().withXpath(xpath).build()
def fragmentEntity = new FragmentEntity(xpath: xpath, childFragments: [])
- mockFragmentRepository.getByDataspaceAndAnchorAndXpath(_, _, xpath) >> fragmentEntity
+ mockFragmentRepository.getByAnchorAndXpath(_, xpath) >> fragmentEntity
if ('EXCEPTION' == scenario) {
mockFragmentRepository.save(fragmentEntity) >> { throw new StaleStateException("concurrent updates") }
}
dataNodes.add(dataNode)
def fragmentEntity = new FragmentEntity(xpath: xpath, childFragments: [])
fragmentEntities.add(fragmentEntity)
- mockFragmentRepository.getByDataspaceAndAnchorAndXpath(_, _, xpath) >> fragmentEntity
+ mockFragmentRepository.getByAnchorAndXpath(_, xpath) >> fragmentEntity
if ('EXCEPTION' == scenario) {
mockFragmentRepository.save(fragmentEntity) >> { throw new StaleStateException("concurrent updates") }
}
}
def mockFragmentWithJson(json) {
- def anchorEntity = new AnchorEntity(id:123)
- mockAnchorRepository.getByDataspaceAndName(*_) >> anchorEntity
def fragmentEntity = new FragmentEntity(xpath: '/parent-01', childFragments: [], attributes: json)
mockFragmentRepository.findByAnchorAndMultipleCpsPaths(123, ['/parent-01'] as Set<String>) >> [fragmentEntity]
}
Code Review / cps.git / commitdiff