inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
feature/RM-4012_Category_REST_API
This commit is contained in:
Silviu Dinuta
2016-10-18 21:48:36 +03:00
parent e686da88de 9f3f82e290
commit a76a13db46
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rm-community/rm-community-repo/source/java/org/alfresco/rest/api/impl/RMNodesImpl.java
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;
@@ -55,7 +56,7 @@ import org.alfresco.service.namespace.QName;
import org.alfresco.util.Pair; import org.alfresco.util.Pair;
/** /**
* Centralizes access to the repository. * Centralizes access to the repository.
* *
* @author Ana Bozianu * @author Ana Bozianu
* @since 2.6 * @since 2.6
@@ -72,7 +73,7 @@ public class RMNodesImpl extends NodesImpl implements RMNodes
// Note: ordered // Note: ordered
CATEGORY, RECORD_FOLDER, FILE CATEGORY, RECORD_FOLDER, FILE
} }
private FilePlanService filePlanService; private FilePlanService filePlanService;
private NodeService nodeService; private NodeService nodeService;
private RecordsManagementServiceRegistry serviceRegistry; private RecordsManagementServiceRegistry serviceRegistry;
@@ -255,7 +256,7 @@ public class RMNodesImpl extends NodesImpl implements RMNodes
return null; return null;
} }
@Override @Override
protected Pair<Set<QName>, Set<QName>> buildSearchTypesAndIgnoreAspects(QName nodeTypeQName, boolean includeSubTypes, Set<QName> ignoreQNameTypes, Boolean includeFiles, Boolean includeFolders) protected Pair<Set<QName>, Set<QName>> buildSearchTypesAndIgnoreAspects(QName nodeTypeQName, boolean includeSubTypes, Set<QName> ignoreQNameTypes, Boolean includeFiles, Boolean includeFolders)
{ {
@@ -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);
}
} }