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

updates after review:

Browse Source 
update the getChildrenPropertyValues return type
update the existing tests from RecordsManagementQueryDAOImplTest that test getChildrenPropertyValues() method
This commit is contained in:
Rodica Sutu
2018-01-26 14:36:41 +02:00
parent 245ffee3e0
commit 0167d75c44
5 changed files with 99 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/query/PropertyValuesOfChildrenQueryParams.java
View File

@@ -27,7 +27,7 @@
package org.alfresco.module.org_alfresco_module_rm.query;
/**
* Select parameter for <b>select_GetPropertyValuesOfChildren</b>.
* Select parameter for <b>select_GetStringPropertyValuesOfChildren</b>.
*
* @author Ana Manolache
* @since 2.6

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

@@ -27,11 +27,12 @@
package org.alfresco.module.org_alfresco_module_rm.query;
import java.util.List;
import java.util.Set;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.QName;
/**
* Records management query DAO
*
@@ -57,7 +58,7 @@ public interface RecordsManagementQueryDAO
*
* @param parent the parent to evaluate
* @param property the QName of the property to evaluate
* @return list of property values
* @return list of distinct property values
*/
public List<String> getChildrenPropertyValues(NodeRef parent, QName property);
public Set<String> getChildrenStringPropertyValues(NodeRef parent, QName property);
}

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

@@ -29,8 +29,9 @@ package org.alfresco.module.org_alfresco_module_rm.query;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
import org.alfresco.repo.domain.node.NodeDAO;
@@ -51,8 +52,8 @@ import org.mybatis.spring.SqlSessionTemplate;
public class RecordsManagementQueryDAOImpl implements RecordsManagementQueryDAO, RecordsManagementModel
{
private static final String COUNT_IDENTIFIER = "alfresco.query.rm.select_CountRMIndentifier";
private static final String GET_CHILDREN_PROPERTY_VALUES = "select_GetPropertyValuesOfChildren";
private static final String GET_CHILDREN_PROPERTY_VALUES = "select_GetStringPropertyValuesOfChildren";
/** SQL session template */
protected SqlSessionTemplate template;
@@ -117,7 +118,7 @@ public class RecordsManagementQueryDAOImpl implements RecordsManagementQueryDAO,
}
@Override
public List<String> getChildrenPropertyValues(NodeRef parent, QName property)
public Set<String> getChildrenStringPropertyValues(NodeRef parent, QName property)
{
PropertyValuesOfChildrenQueryParams queryParams = new PropertyValuesOfChildrenQueryParams();
@@ -134,12 +135,12 @@ public class RecordsManagementQueryDAOImpl implements RecordsManagementQueryDAO,
Pair<Long, QName> pair = qnameDAO.getQName(property);
if (pair == null)
{
return Collections.emptyList();
return Collections.emptySet();
}
queryParams.setPropertyQnameId(pair.getFirst());
// Perform the query
return template.selectList(GET_CHILDREN_PROPERTY_VALUES, queryParams);
return new HashSet<String>(template.selectList(GET_CHILDREN_PROPERTY_VALUES, queryParams));
}
}