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 feature/RM-4012_Category_REST_API into

Browse Source 
feature/RM-4199_RM_REST_API_IMPL
This commit is contained in:
Silviu Dinuta
2016-10-18 21:52:14 +03:00
parent ee07a75d67 a76a13db46
commit 6eb062d4a3
2 changed files with 25 additions and 11 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.framework.core.exceptions.EntityNotFoundException;
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.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
@@ -55,7 +56,7 @@ import org.alfresco.service.namespace.QName;
import org.alfresco.util.Pair;
/**
* Centralizes access to the repository.
* Centralizes access to the repository.
*
* @author Ana Bozianu
* @since 2.6
@@ -72,7 +73,7 @@ public class RMNodesImpl extends NodesImpl implements RMNodes
// Note: ordered
CATEGORY, RECORD_FOLDER, FILE
}
private FilePlanService filePlanService;
private NodeService nodeService;
private RecordsManagementServiceRegistry serviceRegistry;
@@ -255,7 +256,7 @@ public class RMNodesImpl extends NodesImpl implements RMNodes
return null;
}
@Override
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);
}
/**
* 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);
}
}

16
rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/RecordsManagementAuditServiceImplTest.java
View File

@@ -171,9 +171,9 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
// "audit.start", "audit.view" and "Update RM Object";
entries = getAuditTrail(3, ADMIN_USER);
assertEquals(entries.get(0).getEvent(), "audit.start");
assertEquals(entries.get(2).getEvent(), "audit.start");
assertEquals(entries.get(1).getEvent(), "audit.view");
assertEquals(entries.get(2).getEvent(), "Update RM Object");
assertEquals(entries.get(0).getEvent(), "Update RM Object");
// New "audit.view" event was generated - will be visible on next getAuditTrail().
@@ -185,14 +185,14 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
nodeService.deleteNode(record);
List<RecordsManagementAuditEntry> entries = getAuditTrail(5, ADMIN_USER);
assertEquals(entries.get(0).getEvent(), "audit.start");
assertEquals(entries.get(1).getEvent(), "audit.view");
assertEquals(entries.get(2).getEvent(), "Update RM Object");
assertEquals(entries.get(4).getEvent(), "audit.start");
assertEquals(entries.get(3).getEvent(), "audit.view");
assertEquals(entries.get(2).getEvent(), "Update RM Object");
assertEquals(entries.get(1).getEvent(), "audit.view");
// Show the audit contains a reference to the deleted item:
assertEquals(entries.get(4).getEvent(), "Delete RM Object");
assertEquals(entries.get(4).getNodeRef(), record);
assertEquals(entries.get(0).getEvent(), "Delete RM Object");
assertEquals(entries.get(0).getNodeRef(), record);
return null;
}
@@ -212,7 +212,7 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
// show the audit has been updated
List<RecordsManagementAuditEntry> entries = getAuditTrail(3, ADMIN_USER);
final RecordsManagementAuditEntry entry = entries.get(2);
final RecordsManagementAuditEntry entry = entries.get(0);
assertNotNull(entry);
// investigate the contents of the audit entry