mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-14 17:58:59 +00:00
Merged HEAD (5.2) to 5.2.N (5.2.1)
126349 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
118692 jvonka: Merge from DEV/SABRE_JANV1 (part 2) - RA-613 / RA-655
- File Folder API (PoC - experimental WIP)
- TODO add tests +review backwards compat' (eg. favs)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126694 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
@@ -25,40 +25,57 @@
|
||||
*/
|
||||
package org.alfresco.rest.api.impl;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.AbstractList;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.alfresco.model.ContentModel;
|
||||
import org.alfresco.opencmis.CMISConnector;
|
||||
import org.alfresco.query.PagingRequest;
|
||||
import org.alfresco.query.PagingResults;
|
||||
import org.alfresco.repo.model.Repository;
|
||||
import org.alfresco.repo.node.getchildren.GetChildrenCannedQuery;
|
||||
import org.alfresco.rest.antlr.WhereClauseParser;
|
||||
import org.alfresco.rest.api.Nodes;
|
||||
import org.alfresco.rest.api.model.Document;
|
||||
import org.alfresco.rest.api.model.Folder;
|
||||
import org.alfresco.rest.api.model.Node;
|
||||
import org.alfresco.rest.api.model.PathInfo;
|
||||
import org.alfresco.rest.framework.core.exceptions.EntityNotFoundException;
|
||||
import org.alfresco.rest.framework.core.exceptions.InvalidArgumentException;
|
||||
import org.alfresco.rest.framework.resource.content.BasicContentInfo;
|
||||
import org.alfresco.rest.framework.resource.content.BinaryResource;
|
||||
import org.alfresco.rest.framework.resource.content.NodeBinaryResource;
|
||||
import org.alfresco.rest.framework.resource.parameters.CollectionWithPagingInfo;
|
||||
import org.alfresco.rest.framework.resource.parameters.Paging;
|
||||
import org.alfresco.rest.framework.resource.parameters.Parameters;
|
||||
import org.alfresco.rest.framework.resource.parameters.SortColumn;
|
||||
import org.alfresco.rest.framework.resource.parameters.where.Query;
|
||||
import org.alfresco.rest.framework.resource.parameters.where.QueryHelper;
|
||||
import org.alfresco.rest.workflow.api.impl.MapBasedQueryWalker;
|
||||
import org.alfresco.service.ServiceRegistry;
|
||||
import org.alfresco.service.cmr.dictionary.DictionaryService;
|
||||
import org.alfresco.service.cmr.model.FileFolderService;
|
||||
import org.alfresco.service.cmr.model.FileInfo;
|
||||
import org.alfresco.service.cmr.model.FileNotFoundException;
|
||||
import org.alfresco.service.cmr.repository.ContentWriter;
|
||||
import org.alfresco.service.cmr.repository.InvalidNodeRefException;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.service.cmr.repository.NodeService;
|
||||
import org.alfresco.service.cmr.repository.Path.Element;
|
||||
import org.alfresco.service.cmr.repository.StoreRef;
|
||||
import org.alfresco.service.cmr.security.AccessStatus;
|
||||
import org.alfresco.service.cmr.security.PermissionService;
|
||||
import org.alfresco.service.namespace.NamespaceService;
|
||||
import org.alfresco.service.namespace.QName;
|
||||
import org.alfresco.util.Pair;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.io.Serializable;
|
||||
import java.util.AbstractList;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* Centralises access to file/folder/node services and maps between representations.
|
||||
*
|
||||
@@ -77,51 +94,86 @@ public class NodesImpl implements Nodes
|
||||
|
||||
private final static String PATH_ROOT = "-root-";
|
||||
private final static String PATH_MY = "-my-";
|
||||
private final static String PATH_SHARED = "-shared-";
|
||||
|
||||
private NodeService nodeService;
|
||||
private DictionaryService dictionaryService;
|
||||
private CMISConnector cmisConnector;
|
||||
private FileFolderService fileFolderService;
|
||||
private Repository repositoryHelper;
|
||||
private NamespaceService namespaceService;
|
||||
private PermissionService permissionService;
|
||||
private Repository repositoryHelper;
|
||||
private ServiceRegistry sr;
|
||||
|
||||
public void setDictionaryService(DictionaryService dictionaryService)
|
||||
{
|
||||
this.dictionaryService = dictionaryService;
|
||||
}
|
||||
public void setServiceRegistry(ServiceRegistry sr) {
|
||||
this.sr = sr;
|
||||
|
||||
public void setNodeService(NodeService nodeService)
|
||||
{
|
||||
this.nodeService = nodeService;
|
||||
}
|
||||
|
||||
public void setCmisConnector(CMISConnector cmisConnector)
|
||||
{
|
||||
this.cmisConnector = cmisConnector;
|
||||
}
|
||||
|
||||
public void setFileFolderService(FileFolderService fileFolderService)
|
||||
{
|
||||
this.fileFolderService = fileFolderService;
|
||||
}
|
||||
|
||||
public void setRepositoryHelper(Repository repositoryHelper)
|
||||
{
|
||||
this.repositoryHelper = repositoryHelper;
|
||||
}
|
||||
|
||||
public void setNamespaceService(NamespaceService namespaceService)
|
||||
{
|
||||
this.namespaceService = namespaceService;
|
||||
}
|
||||
|
||||
public void setPermissionService(PermissionService permissionService)
|
||||
{
|
||||
this.permissionService = permissionService;
|
||||
}
|
||||
this.namespaceService = sr.getNamespaceService();
|
||||
this.fileFolderService = sr.getFileFolderService();
|
||||
this.nodeService = sr.getNodeService();
|
||||
this.permissionService = sr.getPermissionService();
|
||||
this.dictionaryService = sr.getDictionaryService();
|
||||
}
|
||||
|
||||
/*
|
||||
public void setRepositoryHelper(Repository repositoryHelper)
|
||||
{
|
||||
this.repositoryHelper = repositoryHelper;
|
||||
}
|
||||
|
||||
private static final List<QName> EXCLUDED_ASPECTS = Arrays.asList(
|
||||
ContentModel.ASPECT_REFERENCEABLE,
|
||||
ContentModel.ASPECT_LOCALIZED);
|
||||
|
||||
private static final List<QName> EXCLUDED_PROPS = Arrays.asList(
|
||||
// top-level basic info
|
||||
ContentModel.PROP_NAME,
|
||||
ContentModel.PROP_MODIFIER,
|
||||
ContentModel.PROP_MODIFIED,
|
||||
ContentModel.PROP_CREATOR,
|
||||
ContentModel.PROP_CREATED,
|
||||
ContentModel.PROP_CONTENT,
|
||||
// sys:localized
|
||||
ContentModel.PROP_LOCALE,
|
||||
// sys:referenceable
|
||||
ContentModel.PROP_NODE_UUID,
|
||||
ContentModel.PROP_STORE_IDENTIFIER,
|
||||
ContentModel.PROP_STORE_PROTOCOL,
|
||||
ContentModel.PROP_NODE_DBID,
|
||||
// other - TBC
|
||||
ContentModel.PROP_INITIAL_VERSION,
|
||||
ContentModel.PROP_AUTO_VERSION_PROPS,
|
||||
ContentModel.PROP_AUTO_VERSION);
|
||||
|
||||
private final static String PARAM_ISFOLDER = "isFolder";
|
||||
private final static String PARAM_NAME = "name";
|
||||
private final static String PARAM_CREATEDAT = "createdAt";
|
||||
private final static String PARAM_MODIFIEDAT = "modifiedAt";
|
||||
private final static String PARAM_CREATEBYUSER = "createdByUser";
|
||||
private final static String PARAM_MODIFIEDBYUSER = "modifiedByUser";
|
||||
private final static String PARAM_MIMETYPE = "mimeType";
|
||||
private final static String PARAM_SIZEINBYTES = "sizeInBytes";
|
||||
private final static String PARAM_NODETYPE = "nodeType";
|
||||
|
||||
private final static Map<String,QName> MAP_PARAM_QNAME;
|
||||
static {
|
||||
Map<String,QName> aMap = new HashMap<>(9);
|
||||
|
||||
aMap.put(PARAM_ISFOLDER, GetChildrenCannedQuery.SORT_QNAME_NODE_IS_FOLDER);
|
||||
aMap.put(PARAM_NAME, ContentModel.PROP_NAME);
|
||||
aMap.put(PARAM_CREATEDAT, ContentModel.PROP_CREATED);
|
||||
aMap.put(PARAM_MODIFIEDAT, ContentModel.PROP_MODIFIED);
|
||||
aMap.put(PARAM_CREATEBYUSER, ContentModel.PROP_CREATOR);
|
||||
aMap.put(PARAM_MODIFIEDBYUSER, ContentModel.PROP_MODIFIER);
|
||||
aMap.put(PARAM_MIMETYPE, GetChildrenCannedQuery.SORT_QNAME_CONTENT_MIMETYPE);
|
||||
aMap.put(PARAM_SIZEINBYTES, GetChildrenCannedQuery.SORT_QNAME_CONTENT_SIZE);
|
||||
aMap.put(PARAM_NODETYPE, GetChildrenCannedQuery.SORT_QNAME_NODE_TYPE);
|
||||
|
||||
MAP_PARAM_QNAME = Collections.unmodifiableMap(aMap);
|
||||
}
|
||||
|
||||
private final static Set<String> LIST_FOLDER_CHILDREN_EQUALS_QUERY_PROPERTIES =
|
||||
new HashSet<>(Arrays.asList(new String[] {PARAM_ISFOLDER}));
|
||||
|
||||
/*
|
||||
*
|
||||
* Note: assumes workspace://SpacesStore
|
||||
*/
|
||||
@@ -152,7 +204,7 @@ public class NodesImpl implements Nodes
|
||||
|
||||
public NodeRef validateNode(NodeRef nodeRef)
|
||||
{
|
||||
if(!nodeService.exists(nodeRef))
|
||||
if (! nodeService.exists(nodeRef))
|
||||
{
|
||||
throw new EntityNotFoundException(nodeRef.getId());
|
||||
}
|
||||
@@ -161,27 +213,30 @@ public class NodesImpl implements Nodes
|
||||
}
|
||||
|
||||
public boolean nodeMatches(NodeRef nodeRef, Set<QName> expectedTypes, Set<QName> excludedTypes)
|
||||
{
|
||||
if(!nodeService.exists(nodeRef))
|
||||
{
|
||||
throw new EntityNotFoundException(nodeRef.getId());
|
||||
}
|
||||
{
|
||||
if (! nodeService.exists(nodeRef))
|
||||
{
|
||||
throw new EntityNotFoundException(nodeRef.getId());
|
||||
}
|
||||
|
||||
QName type = nodeService.getType(nodeRef);
|
||||
return typeMatches(nodeService.getType(nodeRef), expectedTypes, excludedTypes);
|
||||
}
|
||||
|
||||
Set<QName> allExpectedTypes = new HashSet<QName>();
|
||||
if(expectedTypes != null)
|
||||
protected boolean typeMatches(QName type, Set<QName> expectedTypes, Set<QName> excludedTypes)
|
||||
{
|
||||
Set<QName> allExpectedTypes = new HashSet<>();
|
||||
if (expectedTypes != null)
|
||||
{
|
||||
for(QName expectedType : expectedTypes)
|
||||
for (QName expectedType : expectedTypes)
|
||||
{
|
||||
allExpectedTypes.addAll(dictionaryService.getSubTypes(expectedType, true));
|
||||
}
|
||||
}
|
||||
|
||||
Set<QName> allExcludedTypes = new HashSet<QName>();
|
||||
if(excludedTypes != null)
|
||||
Set<QName> allExcludedTypes = new HashSet<>();
|
||||
if (excludedTypes != null)
|
||||
{
|
||||
for(QName excludedType : excludedTypes)
|
||||
for (QName excludedType : excludedTypes)
|
||||
{
|
||||
allExcludedTypes.addAll(dictionaryService.getSubTypes(excludedType, true));
|
||||
}
|
||||
@@ -191,17 +246,23 @@ public class NodesImpl implements Nodes
|
||||
boolean excluded = allExcludedTypes.contains(type);
|
||||
return(inExpected && !excluded);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @deprecated review usage (backward compat')
|
||||
*/
|
||||
public Node getNode(String nodeId)
|
||||
{
|
||||
NodeRef nodeRef = validateNode(nodeId);
|
||||
|
||||
return new Node(nodeRef, nodeService.getProperties(nodeRef), namespaceService);
|
||||
return new Node(nodeRef, null, nodeService.getProperties(nodeRef), sr);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @deprecated review usage (backward compat')
|
||||
*/
|
||||
public Node getNode(NodeRef nodeRef)
|
||||
{
|
||||
return new Node(nodeRef, nodeService.getProperties(nodeRef), namespaceService);
|
||||
return new Node(nodeRef, null, nodeService.getProperties(nodeRef), sr);
|
||||
}
|
||||
|
||||
private Type getType(NodeRef nodeRef)
|
||||
@@ -216,65 +277,19 @@ public class NodesImpl implements Nodes
|
||||
return isContainer ? Type.FOLDER : Type.DOCUMENT;
|
||||
}
|
||||
|
||||
/*
|
||||
// TODO filter CMIS properties
|
||||
// TODO review & optimise - do we really need to go via CMIS properties !?
|
||||
private Properties getCMISProperties(NodeRef nodeRef)
|
||||
{
|
||||
CMISNodeInfoImpl nodeInfo = cmisConnector.createNodeInfo(nodeRef);
|
||||
final Properties properties = cmisConnector.getNodeProperties(nodeInfo, null);
|
||||
|
||||
// fake the title property, which CMIS doesn't give us
|
||||
String title = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_TITLE);
|
||||
final PropertyStringImpl titleProp = new PropertyStringImpl(ContentModel.PROP_TITLE.toString(), title);
|
||||
Properties wrapProperties = new Properties()
|
||||
{
|
||||
@Override
|
||||
public List<CmisExtensionElement> getExtensions()
|
||||
{
|
||||
return properties.getExtensions();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setExtensions(List<CmisExtensionElement> extensions)
|
||||
{
|
||||
properties.setExtensions(extensions);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, PropertyData<?>> getProperties()
|
||||
{
|
||||
Map<String, PropertyData<?>> updatedProperties = new HashMap<String, PropertyData<?>>(properties.getProperties());
|
||||
updatedProperties.put(titleProp.getId(), titleProp);
|
||||
return updatedProperties;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PropertyData<?>> getPropertyList()
|
||||
{
|
||||
List<PropertyData<?>> propertyList = new ArrayList<PropertyData<?>>(properties.getPropertyList());
|
||||
propertyList.add(titleProp);
|
||||
return propertyList;
|
||||
}
|
||||
};
|
||||
|
||||
return wrapProperties;
|
||||
}
|
||||
*/
|
||||
|
||||
/**
|
||||
* Returns the public api representation of a document.
|
||||
*
|
||||
* Note: properties are modelled after the OpenCMIS node properties
|
||||
*
|
||||
* @deprecated review usage (backward compat')
|
||||
*/
|
||||
public Document getDocument(NodeRef nodeRef)
|
||||
{
|
||||
Type type = getType(nodeRef);
|
||||
if (type.equals(Type.DOCUMENT))
|
||||
{
|
||||
//Properties properties = getCMISProperties(nodeRef);
|
||||
Map<QName, Serializable> properties = nodeService.getProperties(nodeRef);
|
||||
Document doc = new Document(nodeRef, properties, namespaceService);
|
||||
|
||||
Document doc = new Document(nodeRef, getParentNodeRef(nodeRef), properties, sr);
|
||||
return doc;
|
||||
}
|
||||
else
|
||||
@@ -285,17 +300,17 @@ public class NodesImpl implements Nodes
|
||||
|
||||
/**
|
||||
* Returns the public api representation of a folder.
|
||||
*
|
||||
* Note: properties are modelled after the OpenCMIS node properties
|
||||
*
|
||||
* @deprecated review usage (backward compat')
|
||||
*/
|
||||
public Folder getFolder(NodeRef nodeRef)
|
||||
{
|
||||
Type type = getType(nodeRef);
|
||||
if (type.equals(Type.FOLDER))
|
||||
{
|
||||
//Properties properties = getCMISProperties(nodeRef);
|
||||
Map<QName, Serializable> properties = nodeService.getProperties(nodeRef);
|
||||
Folder folder = new Folder(nodeRef, properties, namespaceService);
|
||||
|
||||
Folder folder = new Folder(nodeRef, getParentNodeRef(nodeRef), properties, sr);
|
||||
return folder;
|
||||
}
|
||||
else
|
||||
@@ -303,13 +318,28 @@ public class NodesImpl implements Nodes
|
||||
throw new InvalidArgumentException("Node is not a folder");
|
||||
}
|
||||
}
|
||||
|
||||
private NodeRef getParentNodeRef(final NodeRef nodeRef) {
|
||||
|
||||
if (repositoryHelper.getCompanyHome().equals(nodeRef))
|
||||
{
|
||||
return null; // note: does not make sense to return parent above C/H
|
||||
}
|
||||
|
||||
return nodeService.getPrimaryParent(nodeRef).getParentRef();
|
||||
}
|
||||
|
||||
private NodeRef validateOrLookupNode(String nodeId, String path) {
|
||||
final NodeRef parentNodeRef;
|
||||
NodeRef parentNodeRef;
|
||||
|
||||
if (nodeId.equals(PATH_ROOT))
|
||||
{
|
||||
parentNodeRef = repositoryHelper.getCompanyHome();
|
||||
}
|
||||
else if (nodeId.equals(PATH_SHARED))
|
||||
{
|
||||
parentNodeRef = repositoryHelper.getSharedHome();
|
||||
}
|
||||
else if (nodeId.equals(PATH_MY))
|
||||
{
|
||||
NodeRef person = repositoryHelper.getPerson();
|
||||
@@ -323,103 +353,272 @@ public class NodesImpl implements Nodes
|
||||
{
|
||||
parentNodeRef = validateNode(nodeId);
|
||||
}
|
||||
|
||||
if (path != null) {
|
||||
// resolve path relative to current nodeId
|
||||
parentNodeRef = resolveNodeByPath(parentNodeRef, path, true);
|
||||
}
|
||||
|
||||
return parentNodeRef;
|
||||
}
|
||||
|
||||
protected NodeRef resolveNodeByPath(final NodeRef parentNodeRef, String path, boolean checkForCompanyHome)
|
||||
{
|
||||
final List<String> pathElements = new ArrayList<>(0);
|
||||
|
||||
if ((path != null) && (! path.isEmpty())) {
|
||||
|
||||
if (path.startsWith("/")) {
|
||||
path = path.substring(1);
|
||||
}
|
||||
|
||||
if (! path.isEmpty()) {
|
||||
pathElements.addAll(Arrays.asList(path.split("/")));
|
||||
|
||||
if (checkForCompanyHome)
|
||||
{
|
||||
/*
|
||||
if (nodeService.getRootNode(parentNodeRef.getStoreRef()).equals(parentNodeRef)) {
|
||||
// special case
|
||||
NodeRef chNodeRef = repositoryHelper.getCompanyHome();
|
||||
String chName = (String)nodeService.getProperty(chNodeRef, ContentModel.PROP_NAME);
|
||||
if (chName.equals(pathElements.get(0))) {
|
||||
pathElements = pathElements.subList(1, pathElements.size());
|
||||
parentNodeRef = chNodeRef;
|
||||
}
|
||||
}
|
||||
*/
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
FileInfo fileInfo = null;
|
||||
try {
|
||||
if (pathElements.size() != 0) {
|
||||
fileInfo = fileFolderService.resolveNamePath(parentNodeRef, pathElements);
|
||||
}
|
||||
else
|
||||
{
|
||||
fileInfo = fileFolderService.getFileInfo(parentNodeRef);
|
||||
if (fileInfo == null)
|
||||
{
|
||||
throw new FileNotFoundException(parentNodeRef);
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (FileNotFoundException fnfe) {
|
||||
// convert checked exception
|
||||
throw new InvalidNodeRefException(fnfe.getMessage()+" ["+path+"]", parentNodeRef);
|
||||
}
|
||||
|
||||
return fileInfo.getNodeRef();
|
||||
}
|
||||
|
||||
public Node getFolderOrDocument(String nodeId, Parameters parameters)
|
||||
{
|
||||
String path = parameters.getParameter("path");
|
||||
|
||||
boolean incPrimaryPath = false;
|
||||
String str = parameters.getParameter("incPrimaryPath");
|
||||
if (str != null) {
|
||||
incPrimaryPath = new Boolean(str);
|
||||
}
|
||||
|
||||
NodeRef nodeRef = validateOrLookupNode(nodeId, path);
|
||||
|
||||
QName typeQName = nodeService.getType(nodeRef);
|
||||
return getFolderOrDocument(nodeRef, typeQName, incPrimaryPath);
|
||||
return getFolderOrDocument(nodeRef, getParentNodeRef(nodeRef), typeQName, false);
|
||||
}
|
||||
|
||||
private Node getFolderOrDocument(NodeRef nodeRef, QName typeQName,boolean incPrimaryPath)
|
||||
private Node getFolderOrDocument(final NodeRef nodeRef, NodeRef parentNodeRef, QName typeQName, boolean minimalnfo)
|
||||
{
|
||||
String primaryPath = null;
|
||||
if (incPrimaryPath)
|
||||
PathInfo pathInfo = null;
|
||||
if (! minimalnfo)
|
||||
{
|
||||
org.alfresco.service.cmr.repository.Path pp = nodeService.getPath(nodeRef);
|
||||
|
||||
// Remove "app:company_home" (2nd element)
|
||||
int ppSize = pp.size();
|
||||
if (ppSize > 1) {
|
||||
if (ppSize == 2) {
|
||||
pp = pp.subPath(0, 0);
|
||||
}
|
||||
else {
|
||||
Element rootElement = pp.get(0);
|
||||
pp = pp.subPath(2, ppSize-1).prepend(rootElement);
|
||||
}
|
||||
}
|
||||
|
||||
primaryPath = pp.toDisplayPath(nodeService, permissionService); // note: slower (hence optional when getting node info)
|
||||
pathInfo = lookupPathInfo(nodeRef);
|
||||
}
|
||||
|
||||
Node node = null;
|
||||
|
||||
Type type = getType(typeQName);
|
||||
|
||||
Node node;
|
||||
Map<QName, Serializable> properties = nodeService.getProperties(nodeRef);
|
||||
|
||||
if (type.equals(Type.DOCUMENT))
|
||||
{
|
||||
//Properties properties = getCMISProperties(nodeRef);
|
||||
node = new Document(nodeRef, properties, namespaceService);
|
||||
node = new Document(nodeRef, parentNodeRef, properties, sr);
|
||||
}
|
||||
else if (type.equals(Type.FOLDER))
|
||||
{
|
||||
// container/folder
|
||||
//Properties properties = getCMISProperties(nodeRef);
|
||||
node = new Folder(nodeRef, properties, namespaceService);
|
||||
node = new Folder(nodeRef, parentNodeRef, properties, sr);
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new InvalidArgumentException("Node is not a folder or file");
|
||||
}
|
||||
|
||||
node.setType(typeQName.toPrefixString(namespaceService));
|
||||
node.setPrimaryPath(primaryPath); // optional - can be null
|
||||
|
||||
if (! minimalnfo) {
|
||||
node.setProperties(mapProperties(properties));
|
||||
node.setAspectNames(mapAspects(nodeService.getAspects(nodeRef)));
|
||||
}
|
||||
|
||||
node.setNodeType(typeQName.toPrefixString(namespaceService));
|
||||
node.setPath(pathInfo);
|
||||
|
||||
return node;
|
||||
}
|
||||
|
||||
|
||||
protected PathInfo lookupPathInfo(NodeRef nodeRefIn)
|
||||
{
|
||||
List<PathInfo.ElementInfo> elements = new ArrayList<>(5);
|
||||
|
||||
NodeRef companyHomeNodeRef = repositoryHelper.getCompanyHome();
|
||||
boolean isComplete = true;
|
||||
|
||||
NodeRef pNodeRef = nodeRefIn;
|
||||
while (pNodeRef != null)
|
||||
{
|
||||
if (pNodeRef.equals(companyHomeNodeRef))
|
||||
{
|
||||
pNodeRef = null;
|
||||
}
|
||||
else {
|
||||
pNodeRef = nodeService.getPrimaryParent(pNodeRef).getParentRef();
|
||||
|
||||
if (pNodeRef == null)
|
||||
{
|
||||
// belts-and-braces - is it even possible to get here ?
|
||||
isComplete = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (permissionService.hasPermission(pNodeRef, PermissionService.READ) == AccessStatus.ALLOWED)
|
||||
{
|
||||
String name = (String) nodeService.getProperty(pNodeRef, ContentModel.PROP_NAME);
|
||||
elements.add(0, new PathInfo().new ElementInfo(pNodeRef.getId(), name));
|
||||
}
|
||||
else
|
||||
{
|
||||
isComplete = false;
|
||||
pNodeRef = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
StringBuilder sb = new StringBuilder();
|
||||
for (PathInfo.ElementInfo e : elements)
|
||||
{
|
||||
sb.append("/").append(e.getName());
|
||||
}
|
||||
|
||||
return new PathInfo(sb.toString(), isComplete, elements);
|
||||
}
|
||||
|
||||
protected Map<String, Serializable> mapProperties(Map<QName, Serializable> nodeProps)
|
||||
{
|
||||
Map<String, Serializable> props = new HashMap<>(nodeProps.size());
|
||||
|
||||
for (Map.Entry<QName, Serializable> entry : nodeProps.entrySet()) {
|
||||
QName propQName = entry.getKey();
|
||||
if (!EXCLUDED_PROPS.contains(propQName))
|
||||
{
|
||||
props.put(entry.getKey().toPrefixString(namespaceService), entry.getValue());
|
||||
}
|
||||
}
|
||||
|
||||
if (props.size() == 0)
|
||||
{
|
||||
props = null; // no props to return
|
||||
}
|
||||
|
||||
return props;
|
||||
}
|
||||
|
||||
protected List<String> mapAspects(Set<QName> nodeAspects)
|
||||
{
|
||||
List<String> aspectNames = new ArrayList<>(nodeAspects.size());
|
||||
|
||||
for (QName aspectName : nodeAspects)
|
||||
{
|
||||
if (! EXCLUDED_ASPECTS.contains(aspectName))
|
||||
{
|
||||
aspectNames.add(aspectName.toPrefixString(namespaceService));
|
||||
}
|
||||
}
|
||||
|
||||
if (aspectNames.size() == 0)
|
||||
{
|
||||
aspectNames = null; // no aspects to return
|
||||
}
|
||||
|
||||
return aspectNames;
|
||||
}
|
||||
|
||||
public CollectionWithPagingInfo<Node> getChildren(String parentFolderNodeId, Parameters parameters)
|
||||
{
|
||||
// TODO consider using: where=(exists(target/file)) / where=(exists(target/file))
|
||||
// instead of: includeFiles=true / includeFolders=true
|
||||
|
||||
boolean includeFolders = true;
|
||||
String str = parameters.getParameter("includeFolders");
|
||||
if (str != null) {
|
||||
includeFolders = new Boolean(str);
|
||||
// TODO
|
||||
// map - where (filter) properties - including isFolder
|
||||
// map - orderBy (sort) properties - including isFolder
|
||||
|
||||
// TODO refactor & fix !
|
||||
final boolean minimalnfo = (parameters.getSelectedProperties().size() == 0);
|
||||
|
||||
boolean includeFolders = true;
|
||||
boolean includeFiles = true;
|
||||
|
||||
Query q = parameters.getQuery();
|
||||
|
||||
if (q != null)
|
||||
{
|
||||
// TODO confirm list of filter props - what about custom props (+ across types/aspects) ?
|
||||
MapBasedQueryWalker propertyWalker = new MapBasedQueryWalker(LIST_FOLDER_CHILDREN_EQUALS_QUERY_PROPERTIES, null);
|
||||
QueryHelper.walk(q, propertyWalker);
|
||||
|
||||
Boolean b = propertyWalker.getProperty(PARAM_ISFOLDER, WhereClauseParser.EQUALS, Boolean.class);
|
||||
if (b != null)
|
||||
{
|
||||
includeFiles = !b;
|
||||
includeFolders = b;
|
||||
}
|
||||
}
|
||||
|
||||
boolean includeFiles = true;
|
||||
str = parameters.getParameter("includeFiles");
|
||||
if (str != null) {
|
||||
includeFiles = new Boolean(str);
|
||||
|
||||
List<SortColumn> sortCols = parameters.getSorting();
|
||||
List<Pair<QName, Boolean>> sortProps = null;
|
||||
if ((sortCols != null) && (sortCols.size() > 0))
|
||||
{
|
||||
sortProps = new ArrayList<>(sortCols.size());
|
||||
for (SortColumn sortCol : sortCols)
|
||||
{
|
||||
QName propQname = MAP_PARAM_QNAME.get(sortCol.column);
|
||||
if (propQname == null)
|
||||
{
|
||||
propQname = QName.resolveToQName(namespaceService, sortCol.column);
|
||||
}
|
||||
|
||||
if (propQname != null)
|
||||
{
|
||||
sortProps.add(new Pair<>(propQname, sortCol.asc));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
String path = parameters.getParameter("path");
|
||||
|
||||
Paging paging = parameters.getPaging();
|
||||
else
|
||||
{
|
||||
// default sort order
|
||||
sortProps = new ArrayList<>(Arrays.asList(
|
||||
new Pair<>(GetChildrenCannedQuery.SORT_QNAME_NODE_IS_FOLDER, Boolean.FALSE),
|
||||
new Pair<>(ContentModel.PROP_NAME, true)));
|
||||
}
|
||||
|
||||
Paging paging = parameters.getPaging();
|
||||
|
||||
// TODO do we want to support path with list folder children ?
|
||||
String path = null;
|
||||
//String path = parameters.getParameter("path");
|
||||
|
||||
final NodeRef parentNodeRef = validateOrLookupNode(parentFolderNodeId, path);
|
||||
|
||||
final Set<QName> folders = new HashSet<>(Arrays.asList(ContentModel.TYPE_FOLDER));
|
||||
if (! nodeMatches(parentNodeRef, folders, null))
|
||||
|
||||
if (! nodeMatches(parentNodeRef, Collections.singleton(ContentModel.TYPE_FOLDER), null))
|
||||
{
|
||||
throw new InvalidArgumentException("NodeId of folder is expected");
|
||||
}
|
||||
|
||||
PagingRequest pagingRequest = Util.getPagingRequest(paging);
|
||||
|
||||
final PagingResults<FileInfo> pagingResults = fileFolderService.list(parentNodeRef, includeFiles, includeFolders, null, null, pagingRequest);
|
||||
final PagingResults<FileInfo> pagingResults = fileFolderService.list(parentNodeRef, includeFiles, includeFolders, null, sortProps, pagingRequest);
|
||||
|
||||
final List<FileInfo> page = pagingResults.getPage();
|
||||
List<Node> nodes = new AbstractList<Node>()
|
||||
@@ -428,7 +627,9 @@ public class NodesImpl implements Nodes
|
||||
public Node get(int index)
|
||||
{
|
||||
FileInfo fInfo = page.get(index);
|
||||
return getFolderOrDocument(fInfo.getNodeRef(), fInfo.getType(), false);
|
||||
|
||||
// basic info by default (unless "select"ed otherwise)
|
||||
return getFolderOrDocument(fInfo.getNodeRef(), parentNodeRef, fInfo.getType(), minimalnfo);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -447,48 +648,68 @@ public class NodesImpl implements Nodes
|
||||
fileFolderService.delete(nodeRef);
|
||||
}
|
||||
|
||||
public Folder createFolder(String parentFolderNodeId, Folder folderInfo, Parameters parameters)
|
||||
// TODO should we able to specify content properties (eg. mimeType ... or use extension for now, or encoding)
|
||||
public Node createNode(String parentFolderNodeId, Node nodeInfo, Parameters parameters)
|
||||
{
|
||||
final NodeRef parentNodeRef = validateNode(parentFolderNodeId);
|
||||
// check that requested parent node exists and it's type is a (sub-)type of folder
|
||||
final NodeRef parentNodeRef = validateOrLookupNode(parentFolderNodeId, null);
|
||||
|
||||
final Set<QName> folders = new HashSet<>(Arrays.asList(ContentModel.TYPE_FOLDER));
|
||||
if (! nodeMatches(parentNodeRef, folders, null))
|
||||
if (! nodeMatches(parentNodeRef, Collections.singleton(ContentModel.TYPE_FOLDER), null))
|
||||
{
|
||||
throw new InvalidArgumentException("NodeId of folder is expected");
|
||||
throw new InvalidArgumentException("NodeId of folder is expected: "+parentNodeRef);
|
||||
}
|
||||
|
||||
String folderName = folderInfo.getName();
|
||||
String folderType = folderInfo.getType();
|
||||
if (folderType == null) {
|
||||
folderType = "cm:folder";
|
||||
}
|
||||
|
||||
QName folderTypeQName = QName.resolveToQName(namespaceService, folderType);
|
||||
|
||||
Map<QName, Serializable> props = new HashMap<QName, Serializable>(10);
|
||||
|
||||
props.put(ContentModel.PROP_NAME, folderName);
|
||||
|
||||
String title = folderInfo.getTitle();
|
||||
if ((title != null) && (! title.isEmpty())) {
|
||||
props.put(ContentModel.PROP_TITLE, title);
|
||||
String nodeName = nodeInfo.getName();
|
||||
if ((nodeName == null) || nodeName.isEmpty())
|
||||
{
|
||||
throw new InvalidArgumentException("Node name is expected: "+parentNodeRef);
|
||||
}
|
||||
|
||||
String description = folderInfo.getDescription();
|
||||
if ((description != null) && (! description.isEmpty())) {
|
||||
props.put(ContentModel.PROP_DESCRIPTION, description);
|
||||
String nodeType = nodeInfo.getNodeType();
|
||||
if ((nodeType == null) || nodeType.isEmpty())
|
||||
{
|
||||
throw new InvalidArgumentException("Node type is expected: "+parentNodeRef+","+nodeName);
|
||||
}
|
||||
|
||||
// TODO other custom properties !!
|
||||
// check that requested type is a (sub-) type of folder or content
|
||||
QName nodeTypeQName = QName.resolveToQName(namespaceService, nodeType);
|
||||
|
||||
QName assocQName = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, QName.createValidLocalName(folderName));
|
||||
Set<QName> contentAndFolders = new HashSet<>(Arrays.asList(ContentModel.TYPE_FOLDER, ContentModel.TYPE_CONTENT));
|
||||
if (! typeMatches(nodeTypeQName, contentAndFolders, null)) {
|
||||
throw new InvalidArgumentException("Type of folder or content is expected: "+ nodeType);
|
||||
}
|
||||
|
||||
NodeRef nodeRef = nodeService.createNode(parentNodeRef, ContentModel.ASSOC_CONTAINS, assocQName, folderTypeQName, props).getChildRef();
|
||||
boolean isContent = typeMatches(nodeTypeQName, Collections.singleton(ContentModel.TYPE_CONTENT), null);
|
||||
|
||||
return (Folder) getFolderOrDocument(nodeRef.getId(), parameters);
|
||||
Map<QName, Serializable> props = new HashMap<>(10);
|
||||
|
||||
if (nodeInfo.getProperties() != null)
|
||||
{
|
||||
for (Map.Entry entry : (Set<Map.Entry<String, Serializable>>)nodeInfo.getProperties().entrySet())
|
||||
{
|
||||
QName propQName = QName.createQName((String)entry.getKey(), namespaceService);
|
||||
props.put(propQName, (Serializable)entry.getValue());
|
||||
}
|
||||
}
|
||||
|
||||
props.put(ContentModel.PROP_NAME, nodeName);
|
||||
|
||||
QName assocQName = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, QName.createValidLocalName(nodeName));
|
||||
NodeRef nodeRef = nodeService.createNode(parentNodeRef, ContentModel.ASSOC_CONTAINS, assocQName, nodeTypeQName, props).getChildRef();
|
||||
|
||||
if (isContent) {
|
||||
// add empty file
|
||||
ContentWriter writer = sr.getContentService().getWriter(nodeRef, ContentModel.PROP_CONTENT, true);
|
||||
String mimeType = sr.getMimetypeService().guessMimetype(nodeName);
|
||||
writer.setMimetype(mimeType);
|
||||
writer.putContent("");
|
||||
}
|
||||
|
||||
return getFolderOrDocument(nodeRef.getId(), parameters);
|
||||
}
|
||||
|
||||
public Node updateNode(String nodeId, Node nodeInfo, Parameters parameters) {
|
||||
public Node updateNode(String nodeId, Node nodeInfo, Parameters parameters)
|
||||
{
|
||||
|
||||
final NodeRef nodeRef = validateNode(nodeId);
|
||||
|
||||
@@ -500,26 +721,72 @@ public class NodesImpl implements Nodes
|
||||
|
||||
Map<QName, Serializable> props = new HashMap<>(10);
|
||||
|
||||
if (nodeInfo.getProperties() != null)
|
||||
{
|
||||
for (Map.Entry entry : (Set<Map.Entry<String, Serializable>>)nodeInfo.getProperties().entrySet())
|
||||
{
|
||||
QName propQName = QName.createQName((String)entry.getKey(), namespaceService);
|
||||
props.put(propQName, (Serializable)entry.getValue());
|
||||
}
|
||||
}
|
||||
|
||||
String name = nodeInfo.getName();
|
||||
if ((name != null) && (! name.isEmpty())) {
|
||||
if ((name != null) && (! name.isEmpty()))
|
||||
{
|
||||
// note: this is equivalent of a rename within target folder
|
||||
props.put(ContentModel.PROP_NAME, name);
|
||||
}
|
||||
|
||||
String title = nodeInfo.getTitle();
|
||||
if ((title != null) && (! title.isEmpty())) {
|
||||
props.put(ContentModel.PROP_TITLE, title);
|
||||
}
|
||||
|
||||
String description = nodeInfo.getDescription();
|
||||
if ((description != null) && (! description.isEmpty())) {
|
||||
props.put(ContentModel.PROP_DESCRIPTION, description);
|
||||
}
|
||||
|
||||
if (props.size() > 0) {
|
||||
if (props.size() > 0)
|
||||
{
|
||||
nodeService.addProperties(nodeRef, props);
|
||||
}
|
||||
|
||||
return getFolderOrDocument(nodeRef.getId(), parameters);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BinaryResource getContent(String fileNodeId, Parameters parameters)
|
||||
{
|
||||
final NodeRef nodeRef = validateNode(fileNodeId);
|
||||
|
||||
if (! nodeMatches(nodeRef, Collections.singleton(ContentModel.TYPE_CONTENT), null))
|
||||
{
|
||||
throw new InvalidArgumentException("NodeId of content is expected: "+nodeRef);
|
||||
}
|
||||
|
||||
// TODO attachment header - update (or extend ?) REST fwk
|
||||
return new NodeBinaryResource(nodeRef, ContentModel.PROP_CONTENT);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateContent(String fileNodeId, BasicContentInfo contentInfo, InputStream stream, Parameters parameters)
|
||||
{
|
||||
final NodeRef nodeRef = validateNode(fileNodeId);
|
||||
|
||||
if (! nodeMatches(nodeRef, Collections.singleton(ContentModel.TYPE_CONTENT), null))
|
||||
{
|
||||
throw new InvalidArgumentException("NodeId of content is expected: "+nodeRef);
|
||||
}
|
||||
|
||||
ContentWriter writer = sr.getContentService().getWriter(nodeRef, ContentModel.PROP_CONTENT, true);
|
||||
|
||||
String mimeType = contentInfo.getMimeType();
|
||||
if (mimeType == null)
|
||||
{
|
||||
String fileName = (String)nodeService.getProperty(nodeRef, ContentModel.PROP_CONTENT);
|
||||
writer.guessMimetype(fileName);
|
||||
}
|
||||
else
|
||||
{
|
||||
writer.setMimetype(mimeType);
|
||||
}
|
||||
|
||||
writer.guessEncoding();
|
||||
|
||||
writer.putContent(stream);
|
||||
|
||||
// TODO - hmm - we may wish to return json info !!
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user