Author: tchemit Date: 2012-08-16 18:13:00 +0200 (Thu, 16 Aug 2012) New Revision: 2619 Url: http://nuiton.org/repositories/revision/topia/2619 Log: fixes #2264: Add GET_TOPIA_ID function into TopiaId class (at last) Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaId.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaId.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaId.java 2012-08-16 15:56:13 UTC (rev 2618) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaId.java 2012-08-16 16:13:00 UTC (rev 2619) @@ -38,6 +38,7 @@ package org.nuiton.topia.persistence; +import com.google.common.base.Function; import org.nuiton.topia.TopiaNotFoundException; import java.io.Serializable; @@ -46,9 +47,11 @@ /** * TODO-fdesbois-20100508 : Need translation of javadoc. - * + * <p/> * Classe representant un Id, utilisable par JDO. Cette classe contient aussi un ensemble de methode - * static utile pour la manipulation des topiaId + * static utile pour la manipulation des topiaId. + * <p/> + * TODO-tchemit-2012-08-16 Rename this class to {@code TopiaIds}. * * @author poussin <poussing@codelutin.com> * @author tchemit <tchemit@codelutin.com> @@ -60,6 +63,19 @@ /** */ private static final long serialVersionUID = 1L; + /** + * Function to obtain {@link TopiaEntity#getTopiaId()} from any entity. + * + * @since 2.6.12 + */ + public static final Function<TopiaEntity, String> GET_TOPIA_ID = new Function<TopiaEntity, String>() { + + @Override + public String apply(TopiaEntity input) { + return input == null ? null : input.getTopiaId(); + } + }; + public String topiaId; public TopiaId() { @@ -106,7 +122,7 @@ random = Math.random(); } return clazz.getName() + '#' + System.currentTimeMillis() + '#' - + random; + + random; } /** @@ -124,7 +140,7 @@ return result; } catch (ClassNotFoundException eee) { throw new TopiaNotFoundException("Can't find class for " + topiaId, - eee); + eee); } } Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2012-08-16 15:56:13 UTC (rev 2618) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2012-08-16 16:13:00 UTC (rev 2619) @@ -74,19 +74,6 @@ "%1$s[@" + TopiaEntity.TOPIA_ID + "=\"%2$s\"]"; /** - * Function to obtain {@link TopiaEntity#getTopiaId()} form any entity. - * - * @since 2.6.12 - */ - public static final Function<TopiaEntity, String> TO_TOPIAID = new Function<TopiaEntity, String>() { - - @Override - public String apply(TopiaEntity input) { - return input.getTopiaId(); - } - }; - - /** * Bind les valeurs techniques depuis une entitée vers une autre. * * @param from l'entité source