Author: bleny Date: 2013-10-04 18:32:01 +0200 (Fri, 04 Oct 2013) New Revision: 2812 Url: http://nuiton.org/projects/topia/repository/revisions/2812 Log: revert deprecation of TopiaEntities#getTopiaIdFunction() calling a method is more maintenable thant using a constant Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntities.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaId.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntities.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntities.java 2013-10-04 12:26:57 UTC (rev 2811) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntities.java 2013-10-04 16:32:01 UTC (rev 2812) @@ -32,7 +32,7 @@ public class TopiaEntities { - public static final Function<TopiaEntity, String> GET_TOPIA_ID = new Function<TopiaEntity, String>() { + protected static final Function<TopiaEntity, String> GET_TOPIA_ID = new Function<TopiaEntity, String>() { @Override public String apply(TopiaEntity input) { @@ -40,7 +40,7 @@ } }; - public static Predicate<TopiaEntity> entityHasId(String id) { + protected static Predicate<TopiaEntity> entityHasId(String id) { return Predicates.compose(Predicates.equalTo(id), GET_TOPIA_ID); } @@ -59,9 +59,7 @@ * Function to obtain {@link TopiaEntity#getTopiaId()} from any entity. * * @since 2.6.12 - * @deprecated use directly {@link #GET_TOPIA_ID} function */ - @Deprecated public static Function<TopiaEntity, String> getTopiaIdFunction() { return GET_TOPIA_ID; } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaId.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaId.java 2013-10-04 12:26:57 UTC (rev 2811) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaId.java 2013-10-04 16:32:01 UTC (rev 2812) @@ -69,10 +69,10 @@ * Function to obtain {@link TopiaEntity#getTopiaId()} from any entity. * * @since 2.6.12 - * @deprecated since 3.0 use {@link org.nuiton.topia.persistence.TopiaEntities#GET_TOPIA_ID} + * @deprecated since 3.0 use {@link TopiaEntities#getTopiaIdFunction()} */ @Deprecated - public static final Function<TopiaEntity, String> GET_TOPIA_ID = TopiaEntities.GET_TOPIA_ID; + public static final Function<TopiaEntity, String> GET_TOPIA_ID = TopiaEntities.getTopiaIdFunction(); public String topiaId; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java 2013-10-04 12:26:57 UTC (rev 2811) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java 2013-10-04 16:32:01 UTC (rev 2812) @@ -131,7 +131,7 @@ Collection<E> entities) { Map<String, E> universe = Maps.uniqueIndex(entities, - TopiaEntities.GET_TOPIA_ID); + TopiaEntities.getTopiaIdFunction()); newMandatoryColumn(propertyName, TopiaCsvCommons.newForeignKeyValue(entityType,