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

RM-6941 added slf4j and test [ags]

Browse Source
This commit is contained in:
bdwiwedi
2021-08-12 12:21:37 +05:30
parent 3e447f38f6
commit 5752ddedbe
6 changed files with 343 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
amps/ags/rm-community/rm-community-repo/pom.xml
View File

@@ -144,7 +144,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>compile</scope>
<scope>provided</scope>
</dependency>
</dependencies>

29
amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/RecordsManagementActionServiceImpl.java
View File

@@ -84,24 +84,11 @@ public class RecordsManagementActionServiceImpl implements RecordsManagementActi
*/
private FreezeService freezeService;
/**
* @param freezeService freeze service
*/
public void setFreezeService(FreezeService freezeService)
{
this.freezeService = freezeService;
}
/**
* list of retention actions to automatically execute
*/
private List<String> retentionActions;
public void setRetentionActions(List<String> retentionActions)
{
this.retentionActions = retentionActions;
}
/**
* @return Policy component
*/
@@ -118,6 +105,19 @@ public class RecordsManagementActionServiceImpl implements RecordsManagementActi
return this.nodeService;
}
/**
* @param freezeService freeze service
*/
public void setFreezeService(FreezeService freezeService)
{
this.freezeService = freezeService;
}
public void setRetentionActions(List<String> retentionActions)
{
this.retentionActions = retentionActions;
}
/**
* Set the policy component
*
@@ -336,7 +336,8 @@ public class RecordsManagementActionServiceImpl implements RecordsManagementActi
String msg = I18NUtil.getMessage(MSG_NO_IMPLICIT_NODEREF, name);
log.warn(msg);
throw new AlfrescoRuntimeException(msg);
} else
}
else
{
return this.executeRecordsManagementAction(implicitTargetNode, name, parameters);
}

1
amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionService.java
View File

@@ -288,5 +288,4 @@ public interface DispositionService
* @param record
*/
void recalculateNextDispositionStep(NodeRef record);
}

139
amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/freeze/FreezeServiceImpl.java
View File

@@ -68,13 +68,19 @@ public class FreezeServiceImpl extends ServiceBaseImpl
implements FreezeService,
RecordsManagementModel
{
/** I18N */
/**
* I18N
*/
private static final String MSG_HOLD_NAME = "rm.hold.name";
/** File Plan Service */
/**
* File Plan Service
*/
private FilePlanService filePlanService;
/** Hold service */
/**
* Hold service
*/
private HoldService holdService;
/**
@@ -90,42 +96,48 @@ public class FreezeServiceImpl extends ServiceBaseImpl
/**
* @param recordFolderService record folder service
*/
public void setRecordFolderService(RecordFolderService recordFolderService) {
public void setRecordFolderService(RecordFolderService recordFolderService)
{
this.recordFolderService = recordFolderService;
}
/**
* @param recordService record service
*/
public void setRecordService(RecordService recordService) {
public void setRecordService(RecordService recordService)
{
this.recordService = recordService;
}
/**
* @return File plan service
*/
protected FilePlanService getFilePlanService() {
protected FilePlanService getFilePlanService()
{
return this.filePlanService;
}
/**
* @return Hold service
*/
protected HoldService getHoldService() {
protected HoldService getHoldService()
{
return this.holdService;
}
/**
* @param filePlanService file plan service
*/
public void setFilePlanService(FilePlanService filePlanService) {
public void setFilePlanService(FilePlanService filePlanService)
{
this.filePlanService = filePlanService;
}
/**
* @param holdService hold service
*/
public void setHoldService(HoldService holdService) {
public void setHoldService(HoldService holdService)
{
this.holdService = holdService;
}
@@ -133,7 +145,8 @@ public class FreezeServiceImpl extends ServiceBaseImpl
* @see org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService#isFrozen(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public boolean isFrozen(NodeRef nodeRef) {
public boolean isFrozen(NodeRef nodeRef)
{
ParameterCheck.mandatory("nodeRef", nodeRef);
return nodeService.hasAspect(nodeRef, ASPECT_FROZEN);
@@ -148,7 +161,8 @@ public class FreezeServiceImpl extends ServiceBaseImpl
*/
@Override
@Deprecated
public Set<NodeRef> getFrozen(NodeRef hold) {
public Set<NodeRef> getFrozen(NodeRef hold)
{
return new HashSet<>(getHoldService().getHeld(hold));
}
@@ -158,7 +172,8 @@ public class FreezeServiceImpl extends ServiceBaseImpl
*/
@Override
@Deprecated
public NodeRef freeze(String reason, NodeRef nodeRef) {
public NodeRef freeze(String reason, NodeRef nodeRef)
{
NodeRef hold = createHold(nodeRef, reason);
getHoldService().addToHold(hold, nodeRef);
return hold;
@@ -170,7 +185,8 @@ public class FreezeServiceImpl extends ServiceBaseImpl
*/
@Override
@Deprecated
public void freeze(NodeRef hold, NodeRef nodeRef) {
public void freeze(NodeRef hold, NodeRef nodeRef)
{
ParameterCheck.mandatory("hold", hold);
ParameterCheck.mandatory("nodeRef", nodeRef);
@@ -183,9 +199,11 @@ public class FreezeServiceImpl extends ServiceBaseImpl
*/
@Override
@Deprecated
public NodeRef freeze(String reason, Set<NodeRef> nodeRefs) {
public NodeRef freeze(String reason, Set<NodeRef> nodeRefs)
{
NodeRef hold = null;
if (!nodeRefs.isEmpty()) {
if (!nodeRefs.isEmpty())
{
final List<NodeRef> list = new ArrayList<>(nodeRefs);
hold = createHold(list.get(0), reason);
getHoldService().addToHold(hold, list);
@@ -199,11 +217,13 @@ public class FreezeServiceImpl extends ServiceBaseImpl
*/
@Override
@Deprecated
public void freeze(NodeRef hold, Set<NodeRef> nodeRefs) {
public void freeze(NodeRef hold, Set<NodeRef> nodeRefs)
{
ParameterCheck.mandatory("hold", hold);
ParameterCheck.mandatoryCollection("nodeRefs", nodeRefs);
for (NodeRef nodeRef : nodeRefs) {
for (NodeRef nodeRef : nodeRefs)
{
freeze(hold, nodeRef);
}
}
@@ -213,9 +233,11 @@ public class FreezeServiceImpl extends ServiceBaseImpl
*/
@Override
@Deprecated
public void unFreeze(NodeRef nodeRef) {
public void unFreeze(NodeRef nodeRef)
{
List<NodeRef> holds = getHoldService().heldBy(nodeRef, true);
for (NodeRef hold : holds) {
for (NodeRef hold : holds)
{
getHoldService().removeFromHold(hold, nodeRef);
}
}
@@ -225,10 +247,12 @@ public class FreezeServiceImpl extends ServiceBaseImpl
*/
@Override
@Deprecated
public void unFreeze(Set<NodeRef> nodeRefs) {
public void unFreeze(Set<NodeRef> nodeRefs)
{
ParameterCheck.mandatoryCollection("nodeRefs", nodeRefs);
for (NodeRef nodeRef : nodeRefs) {
for (NodeRef nodeRef : nodeRefs)
{
unFreeze(nodeRef);
}
}
@@ -238,7 +262,8 @@ public class FreezeServiceImpl extends ServiceBaseImpl
*/
@Override
@Deprecated
public void relinquish(NodeRef hold) {
public void relinquish(NodeRef hold)
{
getHoldService().deleteHold(hold);
}
@@ -247,7 +272,8 @@ public class FreezeServiceImpl extends ServiceBaseImpl
*/
@Override
@Deprecated
public String getReason(NodeRef hold) {
public String getReason(NodeRef hold)
{
return getHoldService().getHoldReason(hold);
}
@@ -257,7 +283,8 @@ public class FreezeServiceImpl extends ServiceBaseImpl
*/
@Override
@Deprecated
public void updateReason(NodeRef hold, String reason) {
public void updateReason(NodeRef hold, String reason)
{
getHoldService().setHoldReason(hold, reason);
}
@@ -265,7 +292,8 @@ public class FreezeServiceImpl extends ServiceBaseImpl
* @see org.alfresco.module.org_alfresco_module_rm.hold.HoldService#getHolds(NodeRef)
*/
@Override
public Set<NodeRef> getHolds(NodeRef filePlan) {
public Set<NodeRef> getHolds(NodeRef filePlan)
{
ParameterCheck.mandatory("filePlan", filePlan);
return new HashSet<>(getHoldService().getHolds(filePlan));
@@ -275,35 +303,47 @@ public class FreezeServiceImpl extends ServiceBaseImpl
* @see org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService#hasFrozenChildren(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public boolean hasFrozenChildren(final NodeRef nodeRef) {
public boolean hasFrozenChildren(final NodeRef nodeRef)
{
ParameterCheck.mandatory("nodeRef", nodeRef);
boolean result = false;
// check that we are dealing with a record folder or a collaboration folder
if (isRecordFolder(nodeRef) ||
(instanceOf(nodeRef, TYPE_FOLDER) && !nodeService.hasAspect(nodeRef, ASPECT_SITE_CONTAINER))) {
(instanceOf(nodeRef, TYPE_FOLDER) && !nodeService.hasAspect(nodeRef, ASPECT_SITE_CONTAINER)))
{
int heldCount = 0;
if (nodeService.hasAspect(nodeRef, ASPECT_HELD_CHILDREN)) {
heldCount = (Integer) getInternalNodeService().getProperty(nodeRef, PROP_HELD_CHILDREN_COUNT);
} else {
final TransactionService transactionService = (TransactionService) applicationContext.getBean("transactionService");
if (nodeService.hasAspect(nodeRef, ASPECT_HELD_CHILDREN))
{
heldCount = (Integer)getInternalNodeService().getProperty(nodeRef, PROP_HELD_CHILDREN_COUNT);
}
else
{
final TransactionService transactionService = (TransactionService)applicationContext.getBean("transactionService");
heldCount = AuthenticationUtil.runAsSystem(new RunAsWork<Integer>() {
heldCount = AuthenticationUtil.runAsSystem(new RunAsWork<Integer>()
{
@Override
public Integer doWork() {
return transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Integer>() {
public Integer execute() throws Throwable {
public Integer doWork()
{
return transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Integer>()
{
public Integer execute() throws Throwable
{
int heldCount = 0;
// NOTE: this process remains to 'patch' older systems to improve performance next time around
List<ChildAssociationRef> childAssocs = getInternalNodeService().getChildAssocs(nodeRef, ContentModel.ASSOC_CONTAINS, null);
if (childAssocs != null && !childAssocs.isEmpty()) {
for (ChildAssociationRef childAssociationRef : childAssocs) {
if (childAssocs != null && !childAssocs.isEmpty())
{
for (ChildAssociationRef childAssociationRef : childAssocs)
{
final NodeRef childRef = childAssociationRef.getChildRef();
if (childAssociationRef.isPrimary() && isFrozen(childRef)) {
heldCount++;
if (childAssociationRef.isPrimary() && isFrozen(childRef))
{
heldCount ++;
}
}
}
@@ -332,12 +372,15 @@ public class FreezeServiceImpl extends ServiceBaseImpl
* @see org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService#getFreezeDate(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public Date getFreezeDate(NodeRef nodeRef) {
public Date getFreezeDate(NodeRef nodeRef)
{
ParameterCheck.mandatory("nodeRef", nodeRef);
if (isFrozen(nodeRef)) {
if (isFrozen(nodeRef))
{
Serializable property = nodeService.getProperty(nodeRef, PROP_FROZEN_AT);
if (property != null) {
if (property != null)
{
return (Date) property;
}
}
@@ -349,12 +392,15 @@ public class FreezeServiceImpl extends ServiceBaseImpl
* @see org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService#getFreezeInitiator(org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
public String getFreezeInitiator(NodeRef nodeRef) {
public String getFreezeInitiator(NodeRef nodeRef)
{
ParameterCheck.mandatory("nodeRef", nodeRef);
if (isFrozen(nodeRef)) {
if (isFrozen(nodeRef))
{
Serializable property = nodeService.getProperty(nodeRef, PROP_FROZEN_BY);
if (property != null) {
if (property != null)
{
return (String) property;
}
}
@@ -373,7 +419,8 @@ public class FreezeServiceImpl extends ServiceBaseImpl
* @param reason the reason why the record will be frozen
* @return NodeRef of the created hold
*/
private NodeRef createHold(NodeRef nodeRef, String reason) {
private NodeRef createHold(NodeRef nodeRef, String reason)
{
// get the hold container
final NodeRef filePlan = getFilePlanService().getFilePlan(nodeRef);
NodeRef holdContainer = getFilePlanService().getHoldContainer(filePlan);

9
amps/ags/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/job/DispositionLifecycleJobExecuter.java
View File

@@ -58,7 +58,8 @@ import org.springframework.extensions.surf.util.I18NUtil;
* @author Roy Wetherall
*/
@Slf4j
public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecuter {
public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecuter
{
/** batching properties */
private int batchSize;
@@ -226,7 +227,8 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
}
}
log.debug("Job Finished");
} catch (AlfrescoRuntimeException exception)
}
catch (AlfrescoRuntimeException exception)
{
log.debug(exception.getMessage());
}
@@ -276,7 +278,8 @@ public class DispositionLifecycleJobExecuter extends RecordsManagementJobExecute
log.debug("Processed action: " + dispAction + "on" + parent);
} catch (AlfrescoRuntimeException exception)
}
catch (AlfrescoRuntimeException exception)
{
log.debug(exception.getMessage());

14
amps/ags/rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/service/FreezeServiceImplTest.java
View File

@@ -136,19 +136,21 @@ public class FreezeServiceImplTest extends BaseRMTestCase
frozenNodes = holdService.getHeld(hold);
assertNotNull(frozenNodes);
assertEquals(3, frozenNodes.size());
} else if (reason.equals("NewFreezeReason"))
}
else if (reason.equals("NewFreezeReason"))
{
frozenNodes = holdService.getHeld(hold);
assertNotNull(frozenNodes);
assertEquals(1, frozenNodes.size());
} else
}
else
{
throw new AlfrescoRuntimeException("The reason '" + reason + "' was not found in the existing holds.");
}
}
// Check the nodes are frozen
final List<NodeRef> testRecords = Arrays.asList(new NodeRef[] { recordOne, recordTwo, recordThree });
final List<NodeRef> testRecords = Arrays.asList(new NodeRef[]{recordOne, recordTwo, recordThree});
for (NodeRef nr : testRecords)
{
assertTrue(freezeService.isFrozen(nr));
@@ -170,12 +172,14 @@ public class FreezeServiceImplTest extends BaseRMTestCase
frozenNodes = holdService.getHeld(hold);
assertNotNull(frozenNodes);
assertEquals(2, frozenNodes.size());
} else if (reason.equals("NewFreezeReason"))
}
else if (reason.equals("NewFreezeReason"))
{
frozenNodes = holdService.getHeld(hold);
assertNotNull(frozenNodes);
assertEquals(1, frozenNodes.size());
} else
}
else
{
throw new AlfrescoRuntimeException("The reason '" + reason + "' was not found in the existing holds.");
}