inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-29 15:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
103503: Rearrange protected methods in line with previous layout


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-05-02 07:46:32 +00:00
parent fba0e07a62
commit 73bea317f5
1 changed files with 66 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
source/java/org/alfresco/repo/domain/contentdata/AbstractContentDataDAOImpl.java
View File

@@ -161,9 +161,7 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
contentUrls.add(contentUrl);
}
/**
* {@inheritDoc}
*/
@Override
public Pair<Long, ContentData> createContentData(ContentData contentData)
{
if (contentData == null)
@@ -174,9 +172,7 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
return entityPair;
}
/**
* {@inheritDoc}
*/
@Override
public Pair<Long, ContentData> getContentData(Long id)
{
if (id == null)
@@ -191,8 +187,10 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
return entityPair;
}
@Override
public void updateContentUrl(ContentUrlEntity contentUrl)
/**
* Internally update a URL or create a new one if it does not exist
*/
private void updateContentUrl(ContentUrlEntity contentUrl)
{
if (contentUrl == null)
{
@@ -242,9 +240,7 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
}
}
/**
* {@inheritDoc}
*/
@Override
public void updateContentData(Long id, ContentData contentData)
{
if (id == null)
@@ -262,9 +258,7 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
}
}
/**
* {@inheritDoc}
*/
@Override
public void deleteContentData(Long id)
{
if (id == null)
@@ -554,6 +548,64 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
return updateContentDataEntity(contentDataEntity);
}
@Override
public boolean updateContentUrlKey(String contentUrl, ContentUrlKeyEntity contentUrlKey)
{
boolean success = true;
ContentUrlEntity existing = getContentUrl(contentUrl);
if(existing != null)
{
ContentUrlEntity entity = ContentUrlEntity.setContentUrlKey(existing, contentUrlKey);
updateContentUrl(entity);
}
else
{
if (logger.isDebugEnabled())
{
logger.debug("No content url, not updating symmetric key");
}
success = false;
}
return success;
}
@Override
public boolean updateContentUrlKey(long contentUrlId, ContentUrlKeyEntity contentUrlKey)
{
boolean success = true;
ContentUrlEntity existing = getContentUrl(contentUrlId);
if(existing != null)
{
ContentUrlEntity entity = ContentUrlEntity.setContentUrlKey(existing, contentUrlKey);
updateContentUrl(entity);
}
else
{
if (logger.isDebugEnabled())
{
logger.debug("No content url, not updating symmetric key");
}
success = false;
}
return success;
}
@Override
public ContentUrlEntity getOrCreateContentUrl(String contentUrl)
{
ContentUrlEntity contentUrlEntity = new ContentUrlEntity();
contentUrlEntity.setContentUrl(contentUrl);
Pair<Long, ContentUrlEntity> pair = contentUrlCache.getOrCreateByValue(contentUrlEntity);
Long newContentUrlId = pair.getFirst();
contentUrlEntity.setId(newContentUrlId);
// Done
return contentUrlEntity;
}
/**
* @param contentUrl the content URL to create or search for
*/
@@ -600,7 +652,6 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
*/
protected abstract ContentDataEntity getContentDataEntity(Long id);
/**
* @param nodeIds the node ID
* @return Returns the associated entities or <tt>null</tt> if none exist
@@ -625,52 +676,6 @@ public abstract class AbstractContentDataDAOImpl implements ContentDataDAO
protected abstract int deleteContentUrlEntity(long id);
protected abstract int updateContentUrlEntity(ContentUrlEntity existing, ContentUrlEntity entity);
@Override
public boolean updateContentUrlKey(String contentUrl, ContentUrlKeyEntity contentUrlKey)
{
boolean success = true;
ContentUrlEntity existing = getContentUrl(contentUrl);
if(existing != null)
{
ContentUrlEntity entity = ContentUrlEntity.setContentUrlKey(existing, contentUrlKey);
updateContentUrl(entity);
}
else
{
if (logger.isDebugEnabled())
{
logger.debug("No content url, not updating symmetric key");
}
success = false;
}
return success;
}
@Override
public boolean updateContentUrlKey(long contentUrlId, ContentUrlKeyEntity contentUrlKey)
{
boolean success = true;
ContentUrlEntity existing = getContentUrl(contentUrlId);
if(existing != null)
{
ContentUrlEntity entity = ContentUrlEntity.setContentUrlKey(existing, contentUrlKey);
updateContentUrl(entity);
}
else
{
if (logger.isDebugEnabled())
{
logger.debug("No content url, not updating symmetric key");
}
success = false;
}
return success;
}
/**
* Transactional listener that deletes unreferenced <b>content_url</b> entities.
*