inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added method to delete multiple child contexts for unique property contexts

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16441 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-09-22 15:17:45 +00:00
parent 1935a73684
commit a48ac3deca
7 changed files with 113 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
config/alfresco/ibatis/org.hibernate.dialect.Dialect/propval-common-SqlMap.xml
View File

@@ -461,4 +461,17 @@
id = #id#
</delete>
<delete id="delete_PropertyUniqueContextByValues" parameterClass="PropertyUniqueContext">
delete from
alf_prop_unique_ctx
where
value1_prop_id = #value1PropId#
<isNotNull property="value2PropId">
and value2_prop_id = #value2PropId#
</isNotNull>
<isNotNull property="value3PropId">
and value3_prop_id = #value3PropId#
</isNotNull>
</delete>
</sqlMap>

30
source/java/org/alfresco/repo/domain/propval/AbstractPropertyValueDAOImpl.java
View File

@@ -1147,10 +1147,40 @@ public abstract class AbstractPropertyValueDAOImpl implements PropertyValueDAO
}
}
public int deletePropertyUniqueContext(Serializable... values)
{
if (values.length < 1 || values.length > 3)
{
throw new IllegalArgumentException("Deletion of unique property sets must have 1, 2 or 3 values");
}
Long[] valueIds = new Long[values.length];
for (int i = 0; i < values.length; i++)
{
Pair<Long, Serializable> valuePair = getPropertyValue(values[i]);
if (valuePair == null)
{
// No such value, so no need to delete
return 0;
}
valueIds[i] = valuePair.getFirst();
}
int deleted = deletePropertyUniqueContexts(valueIds);
// Done
if (logger.isDebugEnabled())
{
logger.debug(
"Deleted " + deleted + " unique property contexts: \n" +
" Values: " + values + "\n" +
" IDs: " + valueIds);
}
return deleted;
}
protected abstract PropertyUniqueContextEntity createPropertyUniqueContext(Long valueId1, Long valueId2, Long valueId3);
protected abstract PropertyUniqueContextEntity getPropertyUniqueContextById(Long id);
protected abstract PropertyUniqueContextEntity getPropertyUniqueContextByValues(Long valueId1, Long valueId2, Long valueId3);
protected abstract PropertyUniqueContextEntity updatePropertyUniqueContext(PropertyUniqueContextEntity entity);
protected abstract int deletePropertyUniqueContexts(Long ... valueIds);
//================================
// Utility methods

7
source/java/org/alfresco/repo/domain/propval/PropertyValueDAO.java
View File

@@ -279,6 +279,13 @@ public interface PropertyValueDAO
* @see #createPropertyUniqueContext(Serializable, Serializable, Serializable)
*/
void deletePropertyUniqueContext(Long id);
/**
* Delete sets of unique contexts based on one, two or three context values.
*
* @param values a combination of one to three values in order
* @return Returns the number of unique contexts deleted
*/
int deletePropertyUniqueContext(Serializable ... values);
//================================
// Utility methods

25
source/java/org/alfresco/repo/domain/propval/ibatis/PropertyValueDAOImpl.java
View File

@@ -88,6 +88,7 @@ public class PropertyValueDAOImpl extends AbstractPropertyValueDAOImpl
private static final String INSERT_PROPERTY_UNIQUE_CTX = "alfresco.propval.insert_PropertyUniqueContext";
private static final String UPDATE_PROPERTY_UNIQUE_CTX = "alfresco.propval.update_PropertyUniqueContext";
private static final String DELETE_PROPERTY_UNIQUE_CTX_BY_ID = "alfresco.propval.delete_PropertyUniqueContextById";
private static final String DELETE_PROPERTY_UNIQUE_CTX_BY_VALUES = "alfresco.propval.delete_PropertyUniqueContextByValues";
private static final String INSERT_PROPERTY_LINK = "alfresco.propval.insert_PropertyLink";
private static final String DELETE_PROPERTY_LINKS_BY_ROOT_ID = "alfresco.propval.delete_PropertyLinksByRootId";
@@ -533,6 +534,30 @@ public class PropertyValueDAOImpl extends AbstractPropertyValueDAOImpl
template.delete(DELETE_PROPERTY_UNIQUE_CTX_BY_ID, entity);
}
@Override
protected int deletePropertyUniqueContexts(Long... valueIds)
{
PropertyUniqueContextEntity entity = new PropertyUniqueContextEntity();
for (int i = 0; i < valueIds.length; i++)
{
switch (i)
{
case 0:
entity.setValue1PropId(valueIds[i]);
break;
case 1:
entity.setValue2PropId(valueIds[i]);
break;
case 2:
entity.setValue3PropId(valueIds[i]);
break;
default:
throw new IllegalArgumentException("Only 3 ids allowed");
}
}
return template.delete(DELETE_PROPERTY_UNIQUE_CTX_BY_VALUES, entity);
}
@Override
protected void createPropertyLink(
Long rootPropId,

7
source/java/org/alfresco/repo/props/PropertyValueComponent.java
View File

@@ -143,9 +143,8 @@ public interface PropertyValueComponent
* Delete a combination of three unique properties. It doesn't matter if the unique combination
* already existed or not.
*
* @param value1 the first property (<tt>null</tt> allowed)
* @param value2 the second property (<tt>null</tt> allowed)
* @param value3 the third property (<tt>null</tt> allowed)
* @param values an array of one, two or three values, any of which may be <tt>null</tt>
* @return Returns the number of unique combinations deleted
*/
void deletePropertyUniqueContext(Serializable value1, Serializable value2, Serializable value3);
int deletePropertyUniqueContexts(Serializable ... values);
}

37
source/java/org/alfresco/repo/props/PropertyValueComponentImpl.java
View File

@@ -236,35 +236,16 @@ public class PropertyValueComponentImpl implements PropertyValueComponent
/**
* {@inheritDoc}
*/
public void deletePropertyUniqueContext(Serializable value1, Serializable value2, Serializable value3)
public int deletePropertyUniqueContexts(Serializable ... values)
{
// Get the ID of the values
Long id = getPropertyUniqueContext(value1, value2, value3);
if (id == null)
{
// No need to delete
if (logger.isDebugEnabled())
{
logger.debug(
"No unique property context exists: \n" +
" Value1: " + value1 + "\n" +
" Value2: " + value2 + "\n" +
" Value3: " + value3);
}
}
else
{
deletePropertyUniqueContext(id);
// Deleted
if (logger.isDebugEnabled())
{
logger.debug(
"Deleted unique property context: \n" +
" Value1: " + value1 + "\n" +
" Value2: " + value2 + "\n" +
" Value3: " + value3);
}
}
int deleted = propertyValueDAO.deletePropertyUniqueContext(values);
// Done
if (logger.isDebugEnabled())
{
logger.debug(
"Deleted " + deleted + " unique property contexts: \n" +
" Values: " + values);
}
return deleted;
}
}

26
source/java/org/alfresco/repo/props/PropertyValueComponentTest.java
View File

@@ -122,5 +122,31 @@ public class PropertyValueComponentTest extends TestCase
logger.debug("Expected exception: " + e.getMessage());
}
}
// Delete everything for the store and check that both are creatable again
RetryingTransactionCallback<Void> deleteStoreCallback = new RetryingTransactionCallback<Void>()
{
public Void execute() throws Throwable
{
propertyValueComponent.deletePropertyUniqueContexts(context, store);
propertyValueComponent.createPropertyUniqueContext(context, store, uuid1);
propertyValueComponent.createPropertyUniqueContext(context, store, uuid2);
return null;
}
};
transactionService.getRetryingTransactionHelper().doInTransaction(deleteStoreCallback);
// Delete everything for the context and check that both are creatable again
RetryingTransactionCallback<Void> deleteContextCallback = new RetryingTransactionCallback<Void>()
{
public Void execute() throws Throwable
{
propertyValueComponent.deletePropertyUniqueContexts(context);
propertyValueComponent.createPropertyUniqueContext(context, store, uuid1);
propertyValueComponent.createPropertyUniqueContext(context, store, uuid2);
return null;
}
};
transactionService.getRetryingTransactionHelper().doInTransaction(deleteContextCallback);
}
}