Author: sletellier Date: 2011-10-12 18:14:50 +0200 (Wed, 12 Oct 2011) New Revision: 1236 Url: http://nuiton.org/repositories/revision/wikitty/1236 Log: - Fix some doc - Add getIds utility method to extract wikittyId - Add getFieldValuesFromFQFieldName to extract field value on list of businessEntity Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2011-10-12 16:11:29 UTC (rev 1235) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2011-10-12 16:14:50 UTC (rev 1236) @@ -575,7 +575,7 @@ * * @param <E> object type * @param clazz entity class - * @param criteria criteria + * @param criterias criterias * @return paged result */ public <E extends BusinessEntity> List<PagedResult<E>> findAllByCriteria( @@ -650,7 +650,9 @@ * * @param <E> object type * @param clazz entity class - * @param criteria criteria + * @param c1 criteria 1 + * @param c2 criteria 2 + * @param otherCriteria otherCriteria * @return paged result */ public <E extends BusinessEntity> PagedResult<E>[] findAllByCriteria( @@ -910,13 +912,12 @@ * * Return Wikitty in result, those Wikitties have WikittyTreeNode extension * - * @param clazz business class wanted to replace id in TreeNodeResult * @param wikittyId root * @param depth profondeur de noeud a recuperer * @param count vrai si l'on veut le nombre de piece attaches sur le noeud * (piece des enfants compris) * @param filter filter pour compter les pieces attachees - * @return + * @return treeNodeResult of wikitty * * @since 3.1 */ Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2011-10-12 16:11:29 UTC (rev 1235) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2011-10-12 16:14:50 UTC (rev 1236) @@ -46,6 +46,7 @@ import java.net.NetworkInterface; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -545,6 +546,7 @@ * @param clazz element class * @return unmodifiable list */ + @SuppressWarnings({"unchecked"}) static public <E> List<E> toList(Object value, Class<E> clazz) { try { List<E> result = (List<E>) value; @@ -955,7 +957,68 @@ return metaFieldName; } + /* + * For BusinessEntities + */ + /** + * Extract all id for beans + * + * @param entities to extract ids + * @return ids of entities + */ + public static List<String> getIds(Iterable<? extends BusinessEntity> entities) { + List<String> ids = new ArrayList<String>(); + if (entities != null) { + for (BusinessEntity bean : entities) { + if (bean != null) { + ids.add(bean.getWikittyId()); + } + } + } + return ids; + } + + /** + * Extract field value corresponding of fqField in entity + * + * @param fqField fqField concerned + * @param entity entity concerned + * @param <E> return type + * @return value of field + */ + @SuppressWarnings({"unchecked"}) + public static <E> E getFieldValueFromFQFieldName(String fqField, BusinessEntity entity) { + + return (E) entity.getField(WikittyUtil.getExtensionNameFromFQFieldName(fqField), + WikittyUtil.getFieldNameFromFQFieldName(fqField)); + } + + /** + * Extract all field values corresponding of fqField in entity + * + * @param fqField fqField concerned + * @param entities entities concerned + * @param <E> return type + * @return value of field + */ + public static <E> List<E> getFieldValuesFromFQFieldName(String fqField, Iterable<? extends BusinessEntity> entities) { + List<E> fieldValues = new ArrayList<E>(); + if (entities != null) { + for (BusinessEntity entity : entities) { + + if (entity != null) { + // Get field for specified fqField + E field = getFieldValueFromFQFieldName(fqField, entity); + + fieldValues.add(field); + } + } + } + return fieldValues; + } + + /** * Recherche le meilleur nom a utiliser comme pseudo pour cette machine. * Un UUID est toujours ajouter en debut, pour potentiellement lancer * plusieurs application en meme temps sur la meme machine et etre sur que @@ -1097,7 +1160,6 @@ * @param type Data type to which this value should be converted * @param value The input value to be converted * @return The converted value. - * @throws ConversionException if conversion cannot be performed * successfully and no default is specified. */ @Override Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java 2011-10-12 16:11:29 UTC (rev 1235) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java 2011-10-12 16:14:50 UTC (rev 1236) @@ -52,7 +52,7 @@ import org.nuiton.wikitty.entities.WikittyUserImpl; import org.nuiton.wikitty.WikittyUtil; -/** test {@link org.nuiton.wikitty.WikittyServiceSecurity}. */ +/** test {@link org.nuiton.wikitty.services.WikittyServiceSecurity}. */ public class WikittyServiceSecurityTest extends AbstractWikittyServiceTest { // FIXME 20101112 poussin classe a revoir suite au refactoring de la secu