inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD (5.2) to 5.2.N (5.2.1)

Browse Source 
127604 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127414 jvonka: Node Associations - create node with assocs (peer &/or secondary child)
      - can be optionally used to create (eg. mandatory) assoc(s) to other existing node(s)
      RA-925


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127711 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 15:18:10 +00:00
parent b2b51abb1e
commit 3f0bba6779
11 changed files with 285 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
source/java/org/alfresco/rest/api/nodes/NodeTargetsRelation.java
View File

@@ -21,22 +21,17 @@ package org.alfresco.rest.api.nodes;
import org.alfresco.rest.api.model.AssocTarget;
import org.alfresco.rest.api.model.Node;
import org.alfresco.rest.framework.WebApiDescription;
import org.alfresco.rest.framework.core.exceptions.ConstraintViolatedException;
import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
import org.alfresco.rest.framework.resource.RelationshipResource;
import org.alfresco.rest.framework.resource.actions.interfaces.RelationshipResourceAction;
import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
import org.alfresco.rest.framework.resource.parameters.Parameters;
import org.alfresco.service.cmr.repository.AssociationExistsException;
import org.alfresco.service.cmr.repository.AssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.QNamePattern;
import org.alfresco.service.namespace.RegexQNamePattern;
import java.util.ArrayList;
import java.util.List;
/**
@@ -72,37 +67,9 @@ public class NodeTargetsRelation extends AbstractNodeRelation implements
@Override
@WebApiDescription(title="Add node assoc")
public List<AssocTarget> create(String sourceNodeId, List<AssocTarget> entity, Parameters parameters)
public List<AssocTarget> create(String sourceNodeId, List<AssocTarget> entities, Parameters parameters)
{
List<AssocTarget> result = new ArrayList<>(entity.size());
NodeRef srcNodeRef = nodes.validateNode(sourceNodeId);
for (AssocTarget assoc : entity)
{
String assocTypeStr = assoc.getAssocType();
QName assocTypeQName = getAssocType(assocTypeStr);
String targetNodeId = assoc.getTargetId();
try
{
NodeRef tgtNodeRef = nodes.validateNode(targetNodeId);
nodeAssocService.createAssociation(srcNodeRef, tgtNodeRef, assocTypeQName);
}
catch (AssociationExistsException aee)
{
throw new ConstraintViolatedException("Node association '"+assocTypeStr+"' already exists from "+sourceNodeId+" to "+targetNodeId);
}
catch (IllegalArgumentException iae)
{
// note: for now, we assume it is invalid assocType - alternatively, we could attempt to pre-validate via dictionary.getAssociation
throw new InvalidArgumentException(sourceNodeId+","+assocTypeStr+","+targetNodeId);
}
result.add(assoc);
}
return result;
return nodes.addTargets(sourceNodeId, entities);
}
@Override
@@ -113,7 +80,7 @@ public class NodeTargetsRelation extends AbstractNodeRelation implements
NodeRef tgtNodeRef = nodes.validateNode(targetNodeId);
String assocTypeStr = parameters.getParameter(PARAM_ASSOC_TYPE);
QNamePattern assocTypeQName = getAssocType(assocTypeStr, false);
QNamePattern assocTypeQName = nodes.getAssocType(assocTypeStr, false);
if (assocTypeQName == null)
{