Merge remote-tracking branch feature/RM-4007_SupportAlliasesOnPut into

feature/RM-4012_Category_REST_API
This commit is contained in:
Silviu Dinuta
2016-10-18 21:48:36 +03:00

View File

@@ -48,6 +48,7 @@ import org.alfresco.rest.api.model.RecordNode;
import org.alfresco.rest.api.model.UserInfo; import org.alfresco.rest.api.model.UserInfo;
import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException; import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException; import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
import org.alfresco.rest.framework.resource.parameters.Parameters;
import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
@@ -273,4 +274,17 @@ public class RMNodesImpl extends NodesImpl implements RMNodes
return new Pair<>(searchTypeQNames, ignoreAspectQNames); return new Pair<>(searchTypeQNames, ignoreAspectQNames);
} }
/**
* Overridden this as a work around for REPO-1443 issue to remove after that issue is fixed
*/
@Override
public Node updateNode(String nodeId, Node nodeInfo, Parameters parameters) {
if ((nodeId == null) || (nodeId.isEmpty()))
{
throw new InvalidArgumentException("Missing nodeId");
}
NodeRef nodeRef = validateOrLookupNode(nodeId, null);
return super.updateNode(nodeRef.getId(), nodeInfo, parameters);
}
} }