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

Revert "Merge branch 'merge-2.7/RM-7065_MNT-20822' into 'release/V2.7'"

Browse Source 
This reverts merge request !1353
This commit is contained in:
Roxana Lucanu
2020-01-27 08:43:09 +00:00
parent b562d97966
commit b2011a8a52
5 changed files with 11 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/RetainAction.java
View File

@@ -38,11 +38,6 @@ import org.alfresco.service.cmr.repository.NodeRef;
*/
public class RetainAction extends RMDispositionActionExecuterAbstractBase
{
/**
* Action name
*/
public static final String NAME = "retain";
@Override
protected void executeRecordFolderLevelDisposition(Action action, NodeRef recordFolder)
{

15
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java
View File

@@ -440,21 +440,6 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
{
this.numberFound = numberFound;
}
@Override
public boolean hasMore()
{
/*
Overriding for MNT-20822
Changing code to correct the hasMore field in the search api response.
Basing off the implementation in SolrJSONResultSet with changes due to
numberFound being equal to skip + count rather than an accurate number
of possible results
*/
return getUnFilteredResultSet().length() >= getResultSetMetaData()
.getSearchParameters()
.getMaxItems();
}
}
BitSet inclusionMask = new BitSet(returnedObject.length());

64
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
View File

@@ -57,9 +57,6 @@ import org.alfresco.repo.policy.annotation.BehaviourBean;
import org.alfresco.repo.policy.annotation.BehaviourKind;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
import org.alfresco.repo.transaction.AlfrescoTransactionSupport.TxnReadState;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
@@ -68,7 +65,6 @@ import org.alfresco.service.cmr.repository.Period;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.RegexQNamePattern;
import org.alfresco.service.transaction.TransactionService;
import org.alfresco.util.ParameterCheck;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -119,9 +115,6 @@ public class DispositionServiceImpl extends ServiceBaseImpl
/** Freeze Service */
private FreezeService freezeService;
/** Transaction service */
private TransactionService transactionService;
/** Disposition properties */
private Map<QName, DispositionProperty> dispositionProperties = new HashMap<QName, DispositionProperty>(4);
@@ -199,14 +192,6 @@ public class DispositionServiceImpl extends ServiceBaseImpl
this.freezeService = freezeService;
}
/**
* @param transactionService transaction service
*/
public void setTransactionService(TransactionService transactionService)
{
this.transactionService = transactionService;
}
/**
* Behavior to initialize the disposition schedule of a newly filed record.
*
@@ -423,7 +408,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl
NodeRef dsNodeRef = getAssociatedDispositionScheduleImpl(nodeRef);
if (dsNodeRef != null)
{
// Create disposition schedule object
// Cerate disposition schedule object
ds = new DispositionScheduleImpl(serviceRegistry, nodeService, dsNodeRef);
}
}
@@ -712,7 +697,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl
* @param nodeRef node reference
* @param dispositionActionDefinition disposition action definition
*/
private DispositionAction initialiseDispositionAction(final NodeRef nodeRef, DispositionActionDefinition dispositionActionDefinition)
private DispositionAction initialiseDispositionAction(NodeRef nodeRef, DispositionActionDefinition dispositionActionDefinition)
{
List<ChildAssociationRef> childAssocs = nodeService.getChildAssocs(nodeRef, ASSOC_NEXT_DISPOSITION_ACTION, ASSOC_NEXT_DISPOSITION_ACTION, 1, true);
if (childAssocs != null && !childAssocs.isEmpty())
@@ -721,7 +706,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl
}
// Create the properties
final Map<QName, Serializable> props = new HashMap<QName, Serializable>(10);
Map<QName, Serializable> props = new HashMap<QName, Serializable>(10);
Date asOfDate = calculateAsOfDate(nodeRef, dispositionActionDefinition);
@@ -733,23 +718,14 @@ public class DispositionServiceImpl extends ServiceBaseImpl
props.put(PROP_DISPOSITION_AS_OF, asOfDate);
}
DispositionAction da;
// check if current transaction is a READ ONLY one and if true create the node in a READ WRITE transaction
if (AlfrescoTransactionSupport.getTransactionReadState().equals(TxnReadState.TXN_READ_ONLY))
{
da =
transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<DispositionAction>()
{
public DispositionAction execute() throws Throwable
{
return createDispositionAction(nodeRef, props);
}
}, false, true);
}
else
{
da = createDispositionAction(nodeRef, props);
}
// Create a new disposition action object
NodeRef dispositionActionNodeRef = this.nodeService.createNode(
nodeRef,
ASSOC_NEXT_DISPOSITION_ACTION,
ASSOC_NEXT_DISPOSITION_ACTION,
TYPE_DISPOSITION_ACTION,
props).getChildRef();
DispositionAction da = new DispositionActionImpl(serviceRegistry, dispositionActionNodeRef);
// Create the events
List<RecordsManagementEvent> events = dispositionActionDefinition.getEvents();
@@ -761,24 +737,6 @@ public class DispositionServiceImpl extends ServiceBaseImpl
return da;
}
/** Creates a new disposition action object
*
* @param nodeRef node reference
* @param props properties of the disposition action to be created
* @return the disposition action object
*/
private DispositionAction createDispositionAction(final NodeRef nodeRef, Map<QName, Serializable> props)
{
NodeRef dispositionActionNodeRef = nodeService.createNode(
nodeRef,
ASSOC_NEXT_DISPOSITION_ACTION,
ASSOC_NEXT_DISPOSITION_ACTION,
TYPE_DISPOSITION_ACTION,
props).getChildRef();
return new DispositionActionImpl(serviceRegistry, dispositionActionNodeRef);
}
/**
* Compute the "disposition as of" date (if necessary) for a disposition action and a node.
*