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-7035_AddPoliciesForHolds' into feature/RM-7034_AddPoliciesForHeldContent

Browse Source
This commit is contained in:
Roxana Lucanu
2019-10-30 10:07:45 +02:00
parent 2f1022ded6 9571f31565
commit bdb908e656
7 changed files with 79 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -6,6 +6,7 @@
.project
.settings
.history
*.bak
*.eml
*.iml
*.log*
@@ -16,6 +17,8 @@ build.local.properties
dist
explodedDeps
local.properties
rebel.xml
rebel-remote.xml
target
test-output

7
README.md
View File

@@ -170,3 +170,10 @@ docker-compose up
> Be aware of the fact that the Share images can not be started independently from Repo
e.g. In order to start an instance of rm-enterprise-repo and rm-enterprise-share, the above command must be run in rm-enterprise-share after the images have been built.
## Start the Docker images with jRebel in remote server mode
If you have a license for jRebel then this can be used from the rm-community-share or rm-enterprise-share directories with:
```
docker-compose -f docker-compose.yml -f jrebel-docker-compose.yml --project-name agsdev up --build --force-recreate
```

19
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java
View File

@@ -28,6 +28,7 @@
package org.alfresco.module.org_alfresco_module_rm.hold;
import static org.alfresco.model.ContentModel.ASPECT_LOCKABLE;
import static org.alfresco.model.ContentModel.PROP_NAME;
import java.io.Serializable;
import java.util.ArrayList;
@@ -265,7 +266,6 @@ public class HoldServiceImpl extends ServiceBaseImpl
transactionalResourceHelper.getSet("frozen").add(frozenNode);
removeFreezeAspect(frozenNode, 1);
}
return null;
}
};
@@ -583,10 +583,14 @@ public class HoldServiceImpl extends ServiceBaseImpl
}
invokeBeforeDeleteHold(hold);
String holdName = (String) nodeService.getProperty(hold, PROP_NAME);
Set<QName> classQNames = getTypeAndApsects(hold);
// delete the hold node
nodeService.deleteNode(hold);
//invokeOnDeleteHold(hold);
invokeOnDeleteHold(holdName, classQNames);
}
/**
@@ -924,12 +928,15 @@ public class HoldServiceImpl extends ServiceBaseImpl
/**
* Invoke onDeleteHold policy
*
* @param nodeRef node reference
* @param holdName name of the hold
* @param classQNames hold types and aspects
*/
protected void invokeOnDeleteHold(NodeRef nodeRef)
protected void invokeOnDeleteHold(String holdName, Set<QName> classQNames)
{
// execute policy for node type and aspects
OnDeleteHoldPolicy policy = onDeleteHoldPolicyDelegate.get(getTypeAndApsects(nodeRef));
policy.onDeleteHold(nodeRef);
OnDeleteHoldPolicy policy = onDeleteHoldPolicyDelegate.get(classQNames);
policy.onDeleteHold(holdName);
}
}

4
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServicePolicies.java
View File

@@ -83,9 +83,9 @@ public interface HoldServicePolicies
/**
* Called when a hold is deleted.
*
* @param hold node reference
* @param holdname name of the deleted hold
*/
void onDeleteHold(NodeRef hold);
void onDeleteHold(String holdname);
}
interface BeforeAddToHoldPolicy extends ClassPolicy

49
rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/CreateHoldTest.java
View File

@@ -39,9 +39,7 @@ import java.util.Set;
import org.alfresco.module.org_alfresco_module_rm.capability.Capability;
import org.alfresco.module.org_alfresco_module_rm.hold.HoldServicePolicies;
import org.alfresco.module.org_alfresco_module_rm.hold.HoldServicePolicies.BeforeCreateHoldPolicy;
import org.alfresco.module.org_alfresco_module_rm.hold.HoldServicePolicies.BeforeDeleteHoldPolicy;
import org.alfresco.module.org_alfresco_module_rm.hold.HoldServicePolicies.OnCreateHoldPolicy;
import org.alfresco.module.org_alfresco_module_rm.hold.HoldServicePolicies.OnDeleteHoldPolicy;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
import org.alfresco.module.org_alfresco_module_rm.role.Role;
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
@@ -150,38 +148,43 @@ public class CreateHoldTest extends BaseRMTestCase implements BeforeCreateHoldPo
public void testPolicyNotificationForCreateHold() throws Exception
{
doTestInTransaction(new Test<Void>()
doBehaviourDrivenTest(new BehaviourDrivenTest()
{
private NodeRef hold;
BehaviourDefinition<ClassBehaviourBinding> beforeCreateHoldBehaviour;
BehaviourDefinition<ClassBehaviourBinding> onCreateHoldBehaviour;
@Override
public Void run()
public void given()
{
BehaviourDefinition<ClassBehaviourBinding> beforeCreateHoldBehaviour = policyComponent.bindClassBehaviour(
HoldServicePolicies.BeforeCreateHoldPolicy.BEFORE_CREATE_HOLD, RecordsManagementModel.TYPE_HOLD_CONTAINER,
beforeCreateHoldBehaviour = policyComponent.bindClassBehaviour(HoldServicePolicies.BeforeCreateHoldPolicy.BEFORE_CREATE_HOLD,
RecordsManagementModel.TYPE_HOLD_CONTAINER,
new JavaBehaviour(CreateHoldTest.this, "beforeCreateHold", NotificationFrequency.EVERY_EVENT));
BehaviourDefinition<ClassBehaviourBinding> onCreateHoldBehaviour = policyComponent.bindClassBehaviour(
HoldServicePolicies.OnCreateHoldPolicy.ON_CREATE_HOLD, RecordsManagementModel.TYPE_HOLD,
onCreateHoldBehaviour = policyComponent.bindClassBehaviour(HoldServicePolicies.OnCreateHoldPolicy.ON_CREATE_HOLD,
RecordsManagementModel.TYPE_HOLD,
new JavaBehaviour(CreateHoldTest.this, "onCreateHold", NotificationFrequency.EVERY_EVENT));
assertFalse(beforeCreateHoldFlag);
assertFalse(onCreateHoldFlag);
// Create a hold
hold = holdService.createHold(filePlan, generate(), generate(), generate());
assertTrue(beforeCreateHoldFlag);
assertTrue(onCreateHoldFlag);
//clean up
policyComponent.removeClassDefinition(beforeCreateHoldBehaviour);
policyComponent.removeClassDefinition(onCreateHoldBehaviour);
return null;
}
}, getAdminUserName());
public void when()
{
// Create a hold
NodeRef hold = holdService.createHold(filePlan, generate(), generate(), generate());
}
public void then()
{
assertTrue(beforeCreateHoldFlag);
assertTrue(onCreateHoldFlag);
}
public void after()
{
policyComponent.removeClassDefinition(beforeCreateHoldBehaviour);
policyComponent.removeClassDefinition(onCreateHoldBehaviour);
}
});
}

48
rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/DeleteHoldTest.java
View File

@@ -27,13 +27,11 @@
package org.alfresco.module.org_alfresco_module_rm.test.integration.hold;
import static org.alfresco.repo.security.authentication.AuthenticationUtil.getAdminUserName;
import static org.alfresco.util.GUID.generate;
import java.util.ArrayList;
import java.util.List;
import org.alfresco.module.org_alfresco_module_rm.hold.HoldServicePolicies;
import org.alfresco.module.org_alfresco_module_rm.hold.HoldServicePolicies.BeforeDeleteHoldPolicy;
import org.alfresco.module.org_alfresco_module_rm.hold.HoldServicePolicies.OnDeleteHoldPolicy;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
@@ -251,39 +249,47 @@ public class DeleteHoldTest extends BaseRMTestCase implements BeforeDeleteHoldPo
public void testPolicyNotificationForDeleteHold() throws Exception
{
doTestInTransaction(new Test<Void>()
doBehaviourDrivenTest(new BehaviourDrivenTest()
{
BehaviourDefinition<ClassBehaviourBinding> beforeDeleteHoldBehaviour;
BehaviourDefinition<ClassBehaviourBinding> onDeleteHoldBehaviour;
NodeRef hold;
@Override
public Void run()
public void given()
{
BehaviourDefinition<ClassBehaviourBinding> beforeDeleteHoldBehaviour = policyComponent.bindClassBehaviour(
HoldServicePolicies.BeforeDeleteHoldPolicy.BEFORE_DELETE_HOLD, RecordsManagementModel.TYPE_HOLD,
beforeDeleteHoldBehaviour = policyComponent.bindClassBehaviour(BeforeDeleteHoldPolicy.BEFORE_DELETE_HOLD,
RecordsManagementModel.TYPE_HOLD,
new JavaBehaviour(DeleteHoldTest.this, "beforeDeleteHold", NotificationFrequency.EVERY_EVENT));
BehaviourDefinition<ClassBehaviourBinding> onDeleteHoldBehaviour = policyComponent.bindClassBehaviour(
HoldServicePolicies.OnDeleteHoldPolicy.ON_DELETE_HOLD, RecordsManagementModel.TYPE_HOLD,
onDeleteHoldBehaviour = policyComponent.bindClassBehaviour(OnDeleteHoldPolicy.ON_DELETE_HOLD, RecordsManagementModel.TYPE_HOLD,
new JavaBehaviour(DeleteHoldTest.this, "onDeleteHold", NotificationFrequency.EVERY_EVENT));
NodeRef hold = holdService.createHold(filePlan, generate(), generate(), generate());
// Create a hold
hold = holdService.createHold(filePlan, generate(), generate(), generate());
assertFalse(beforeDeleteHoldFlag);
assertFalse(onDeleteHoldFlag);
assertFalse(beforeDeleteHoldFlag);
}
public void when()
{
// Delete the hold
holdService.deleteHold(hold);
assertTrue(beforeDeleteHoldFlag);
assertTrue(onDeleteHoldFlag);
//clean up
policyComponent.removeClassDefinition(beforeDeleteHoldBehaviour);
policyComponent.removeClassDefinition(onDeleteHoldBehaviour);
return null;
}
}, getAdminUserName());
public void then()
{
assertTrue(beforeDeleteHoldFlag);
assertTrue(onDeleteHoldFlag);
}
public void after()
{
policyComponent.removeClassDefinition(beforeDeleteHoldBehaviour);
policyComponent.removeClassDefinition(onDeleteHoldBehaviour);
}
});
}
@@ -294,7 +300,7 @@ public class DeleteHoldTest extends BaseRMTestCase implements BeforeDeleteHoldPo
}
@Override
public void onDeleteHold(NodeRef hold)
public void onDeleteHold(String holdName)
{
onDeleteHoldFlag = true;
}

2
rm-community/rm-community-repo/unit-test/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImplUnitTest.java
View File

@@ -314,7 +314,7 @@ public class HoldServiceImplUnitTest extends BaseUnitTest
{
// mocks for policies
doNothing().when(holdService).invokeBeforeDeleteHold(any());
doNothing().when(holdService).invokeOnDeleteHold(any());
doNothing().when(holdService).invokeOnDeleteHold(any(), any());
// delete hold
holdService.deleteHold(hold);