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 'remotes/origin/release/V3.0' into merge-3.1/MNT-20740_BinDuplicationHotFix

Browse Source
This commit is contained in:
cagache
2019-09-03 13:36:48 +03:00
parent ad7eec9700 995a771b51
commit c1b3decae4
10 changed files with 271 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/content/ContentDestructionComponent.java
View File

@@ -33,6 +33,7 @@ import java.util.Set;
import org.alfresco.model.ContentModel;
import org.alfresco.model.RenditionModel;
import org.alfresco.module.org_alfresco_module_rm.util.ContentBinDuplicationUtility;
import org.alfresco.repo.policy.BehaviourFilter;
import org.alfresco.repo.policy.annotation.BehaviourBean;
import org.alfresco.service.cmr.dictionary.DictionaryService;
@@ -63,6 +64,9 @@ public class ContentDestructionComponent
/** behaviour filter */
private BehaviourFilter behaviourFilter;
/** Utility class for duplicating content */
private ContentBinDuplicationUtility contentBinDuplicationUtility;
/** indicates whether cleansing is enabled or not */
private boolean cleansingEnabled = false;
@@ -138,6 +142,15 @@ public class ContentDestructionComponent
this.behaviourFilter = behaviourFilter;
}
/**
* Setter for content duplication utility class
* @param contentBinDuplicationUtility ContentBinDuplicationUtility
*/
public void setContentBinDuplicationUtility(ContentBinDuplicationUtility contentBinDuplicationUtility)
{
this.contentBinDuplicationUtility = contentBinDuplicationUtility;
}
/**
* @param cleansingEnabled true if cleansing enabled, false otherwise
*/
@@ -214,16 +227,19 @@ public class ContentDestructionComponent
// get content data
ContentData dataContent = (ContentData)entry.getValue();
// if enabled cleanse content
if (isCleansingEnabled())
if (!contentBinDuplicationUtility.hasAtLeastOneOtherReference(nodeRef))
{
// register for cleanse then immediate destruction
getEagerContentStoreCleaner().registerOrphanedContentUrlForCleansing(dataContent.getContentUrl());
}
else
{
// register for immediate destruction
getEagerContentStoreCleaner().registerOrphanedContentUrl(dataContent.getContentUrl(), true);
// if enabled cleanse content
if (isCleansingEnabled())
{
// register for cleanse then immediate destruction
getEagerContentStoreCleaner().registerOrphanedContentUrlForCleansing(dataContent.getContentUrl());
}
else
{
// register for immediate destruction
getEagerContentStoreCleaner().registerOrphanedContentUrl(dataContent.getContentUrl(), true);
}
}
// clear the property

6
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/query/RecordsManagementQueryDAO.java
View File

@@ -61,4 +61,10 @@ public interface RecordsManagementQueryDAO
* @return list of distinct property values
*/
public Set<String> getChildrenStringPropertyValues(NodeRef parent, QName property);
/**
* @param contentUrl the URL of the content url entity
* @return Set<NodeRef> a set of nodes that reference the given content url
*/
Set<NodeRef> getNodeRefsWhichReferenceContentUrl(String contentUrl);
}

97
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/query/RecordsManagementQueryDAOImpl.java
View File

@@ -30,17 +30,22 @@ package org.alfresco.module.org_alfresco_module_rm.query;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
import org.alfresco.repo.domain.contentdata.ContentUrlEntity;
import org.alfresco.repo.domain.node.NodeDAO;
import org.alfresco.repo.domain.qname.QNameDAO;
import org.alfresco.repo.tenant.TenantService;
import org.alfresco.repo.version.Version2Model;
import org.alfresco.service.cmr.repository.InvalidNodeRefException;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.Pair;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.mybatis.spring.SqlSessionTemplate;
/**
@@ -51,8 +56,14 @@ import org.mybatis.spring.SqlSessionTemplate;
*/
public class RecordsManagementQueryDAOImpl implements RecordsManagementQueryDAO, RecordsManagementModel
{
/** logger */
@SuppressWarnings ("unused")
private static final Log logger = LogFactory.getLog(RecordsManagementQueryDAOImpl.class);
/** query names */
private static final String COUNT_IDENTIFIER = "alfresco.query.rm.select_CountRMIndentifier";
private static final String GET_CHILDREN_PROPERTY_VALUES = "select_GetStringPropertyValuesOfChildren";
private static final String SELECT_NODE_IDS_WHICH_REFERENCE_CONTENT_URL = "select_NodeIdsWhichReferenceContentUrl";
/** SQL session template */
protected SqlSessionTemplate template;
@@ -143,4 +154,90 @@ public class RecordsManagementQueryDAOImpl implements RecordsManagementQueryDAO,
return new HashSet<>(template.selectList(GET_CHILDREN_PROPERTY_VALUES, queryParams));
}
/**
* Get a set of node reference which reference the provided content URL
*
* @return Set<NodeRef> set of nodes that reference the provided content URL
* @param String contentUrl content URL
*/
@Override
public Set<NodeRef> getNodeRefsWhichReferenceContentUrl(String contentUrl)
{
if (logger.isDebugEnabled())
{
logger.debug("Getting nodes that reference content URL = " + contentUrl);
}
// create the content URL entity used to query for nodes
ContentUrlEntity contentUrlEntity = new ContentUrlEntity();
contentUrlEntity.setContentUrl(contentUrl.toLowerCase());
if (logger.isDebugEnabled())
{
logger.debug("Executing query " + SELECT_NODE_IDS_WHICH_REFERENCE_CONTENT_URL);
}
// Get all the node ids which reference the given content url
List<Long> nodeIds = template.selectList(SELECT_NODE_IDS_WHICH_REFERENCE_CONTENT_URL, contentUrlEntity);
if (logger.isDebugEnabled())
{
logger.debug("Query " + SELECT_NODE_IDS_WHICH_REFERENCE_CONTENT_URL + " returned " + nodeIds.size() + " results");
}
// create a set of uuids which reference the content url
Set<NodeRef> nodesReferencingContentUrl = new HashSet<NodeRef>(nodeIds.size());
for (Long nodeId : nodeIds)
{
StringBuilder logMessage = null;
NodeRef nodeRefToAdd;
if (nodeId != null && nodeDAO.exists(nodeId))
{
if (logger.isDebugEnabled())
{
logMessage = new StringBuilder("Adding noderef ");
}
// if the referencing node is a version2Store reference to the content url, add the version 2 frozen node ref
NodeRef version2FrozenNodeRef = (NodeRef) nodeDAO.getNodeProperty(nodeId, Version2Model.PROP_QNAME_FROZEN_NODE_REF);
if (version2FrozenNodeRef != null && nodeDAO.exists(version2FrozenNodeRef))
{
nodeRefToAdd = version2FrozenNodeRef;
if (logger.isDebugEnabled())
{
logMessage.append(nodeRefToAdd).append(" (from version)");
}
}
// add the node ref of the referencing node
else
{
nodeRefToAdd = nodeDAO.getNodeIdStatus(nodeId).getNodeRef();
if (logger.isDebugEnabled())
{
logMessage.append(nodeRefToAdd);
}
}
nodesReferencingContentUrl.add(nodeRefToAdd);
if (logger.isDebugEnabled())
{
logger.debug(logMessage.toString());
}
}
else
{
if (logger.isDebugEnabled())
{
logger.debug("Not adding " + nodeId + " (exist==false)");
}
}
}
return nodesReferencingContentUrl;
}
}

50
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/ContentBinDuplicationUtility.java
View File

@@ -27,11 +27,15 @@
package org.alfresco.module.org_alfresco_module_rm.util;
import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.query.RecordsManagementQueryDAO;
import org.alfresco.repo.policy.BehaviourFilter;
import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.NodeRef;
import java.util.Set;
/**
* Utility class to duplicate the content of a node without triggering the audit or versioning behaviours
* @author Ross Gale
@@ -44,6 +48,14 @@ public class ContentBinDuplicationUtility extends ServiceBaseImpl
*/
private BehaviourFilter behaviourFilter;
/**
* Provides methods for accessing and transforming content.
*/
private ContentService contentService;
/** Records Management Query DAO */
private RecordsManagementQueryDAO recordsManagementQueryDAO;
/**
* Setter for behaviour filter
* @param behaviourFilter BehaviourFilter
@@ -53,6 +65,44 @@ public class ContentBinDuplicationUtility extends ServiceBaseImpl
this.behaviourFilter = behaviourFilter;
}
/**
* Setter for content service
* @param contentService ContentService
*/
public void setContentService(ContentService contentService)
{
this.contentService = contentService;
}
/**
* Setter for the Records Management QueryDAO
*
* @param recordsManagementQueryDAO The RM query DAO to set
*/
public void setRecordsManagementQueryDAO(RecordsManagementQueryDAO recordsManagementQueryDAO)
{
this.recordsManagementQueryDAO = recordsManagementQueryDAO;
}
/**
* Determines whether the bin file for a given node has at least one other reference to it
* Will return true if the binary exists and is referenced by at least one other node
* @param nodeRef Node with the binary in question
* @return boolean for if the bin has at least one other reference to it
*/
public boolean hasAtLeastOneOtherReference(NodeRef nodeRef)
{
boolean hasAtLeastOneOtherReference = false;
String contentUrl = contentService.getReader(nodeRef, ContentModel.PROP_CONTENT).getContentUrl();
Set<NodeRef> referencesToContentNode = recordsManagementQueryDAO.getNodeRefsWhichReferenceContentUrl(contentUrl);
if (referencesToContentNode.size() > 1)
{
hasAtLeastOneOtherReference = true;
}
return hasAtLeastOneOtherReference;
}
/**
* Duplicate the content of a node without triggering the audit or versioning behaviours
*