Merged DEV to HEAD (5.0)

87810: ACE-2030: Moved retired patches into retired-patches-context.xml
  87811: ACE-2030: Clean up unused PatchDAO methods and SQL mappings


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@87814 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2014-10-11 21:00:25 +00:00
parent 89a179e2d7
commit 33da30e3b8
7 changed files with 1297 additions and 2128 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2010 Alfresco Software Limited.
* Copyright (C) 2005-2014 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -18,168 +18,20 @@
*/
package org.alfresco.repo.domain.patch;
import java.util.List;
import java.util.Map;
import org.alfresco.ibatis.BatchingDAO;
import org.alfresco.repo.domain.contentdata.ContentDataDAO;
import org.alfresco.service.cmr.repository.ContentData;
import org.apache.ibatis.session.ResultHandler;
/**
* Abstract implementation for Patch DAO.
* <p>
* This provides additional queries used by patches.
*
* @author Derek Hulley
* @author janv
* @since 3.2
*/
public abstract class AbstractPatchDAOImpl implements PatchDAO, BatchingDAO
{
private ContentDataDAO contentDataDAO;
protected AbstractPatchDAOImpl()
{
}
/**
* Set the DAO that supplies {@link ContentData} IDs
*/
public void setContentDataDAO(ContentDataDAO contentDataDAO)
{
this.contentDataDAO = contentDataDAO;
}
@Override
public long getMaxAclId()
{
return getMaxAclEntityId();
}
@Override
public long getDmNodeCount()
{
return getDmNodeEntitiesCount();
}
@Override
public long getDmNodeCountWithNewACLs(Long above)
{
return getDmNodeEntitiesCountWithNewACLs(above);
}
/**
* {@inheritDoc}
* <p>
* @see #getAdmOldContentProperties(Long, Long)
*/
@Override
public void updateAdmV31ContentProperties(Long minNodeId, Long maxNodeId)
{
List<Map<String, Object>> props = getAdmOldContentProperties(minNodeId, maxNodeId);
// Do a first pass to create the ContentData IDs
for (Map<String, Object> prop : props)
{
String stringValue = (String) prop.get("stringValue");
ContentData contentData = ContentData.createContentProperty(stringValue);
Long contentDataId = contentDataDAO.createContentData(contentData).getFirst();
prop.put("contentDataId", contentDataId);
}
// Now do the updates in the context of a batch
try
{
// Run using a batch
startBatch();
for (Map<String, Object> prop : props)
{
Long nodeId = (Long) prop.get("nodeId");
Long qnameId = (Long) prop.get("qnameId");
Integer listIndex = (Integer) prop.get("listIndex");
Long localeId = (Long) prop.get("localeId");
Long contentDataId = (Long) prop.get("contentDataId");
// Update
updateAdmOldContentProperty(nodeId, qnameId, listIndex, localeId, contentDataId);
}
}
finally
{
executeBatch();
}
}
/**
* Results are of the form:
* <pre>
* nodeId: java.lang.Long
* qnameId: java.lang.Long
* listIndex: java.lang.Integer
* localeId: java.lang.Long
* stringValue: java.lang.String
* </pre>
*
*
* @param minNodeId inclusive lower bound for Node ID
* @param maxNodeId exclusive upper bound for Node ID
* @return Returns a map of query results
*/
protected abstract List<Map<String, Object>> getAdmOldContentProperties(Long minNodeId, Long maxNodeId);
/**
*
* @param nodeId part of the unique key
* @param qnameId part of the unique key
* @param listIndex part of the unique key
* @param localeId part of the unique key
* @param longValue the new ContentData ID
* @return Returns the row update count
*/
protected abstract void updateAdmOldContentProperty(
Long nodeId,
Long qnameId,
Integer listIndex,
Long localeId,
Long longValue);
protected abstract long getMaxAclEntityId();
protected abstract long getDmNodeEntitiesCount();
protected abstract long getDmNodeEntitiesCountWithNewACLs(Long above);
// note: caller's row handler is expected to migrate the attrs
@Override
public void migrateOldAttrTenants(ResultHandler resultHandler)
{
getOldAttrTenantsImpl(resultHandler);
}
protected abstract void getOldAttrTenantsImpl(ResultHandler resultHandler);
// note: caller's row handler is expected to migrate the attrs
@Override
public void migrateOldAttrPropertyBackedBeans(ResultHandler resultHandler)
{
getOldAttrPropertyBackedBeansImpl(resultHandler);
}
protected abstract void getOldAttrPropertyBackedBeansImpl(ResultHandler resultHandler);
// note: caller's row handler is expected to migrate the attrs
@Override
public void migrateOldAttrChainingURS(ResultHandler resultHandler)
{
getOldAttrChainingURSImpl(resultHandler);
}
protected abstract void getOldAttrChainingURSImpl(ResultHandler resultHandler);
@Override
public List<String> getOldAttrCustomNames()
{
return getOldAttrCustomNamesImpl();
}
protected abstract List<String> getOldAttrCustomNamesImpl();
}