This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See http://git.nuiton.org/topia.git commit 3820c41f846ef6790324064170a3283386f99b5d Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Dec 1 17:25:50 2014 +0100 Fix generic typing issues in TopiaEntities --- .../nuiton/topia/persistence/TopiaEntities.java | 24 ++++++++-------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntities.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntities.java index 340ea7c..54cf720 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntities.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntities.java @@ -40,26 +40,15 @@ import com.google.common.collect.Iterables; public class TopiaEntities { /** - * Guava's {@link com.google.common.base.Function} to get a topiaId from any - * {@link org.nuiton.topia.persistence.TopiaEntity} - */ - protected static final Function<TopiaEntity, String> GET_TOPIA_ID = new Function<TopiaEntity, String>() { - @Override - public String apply(TopiaEntity input) { - return input == null ? null : input.getTopiaId(); - } - }; - - /** * Creates a Guava's {@link com.google.common.base.Predicate} which tests if a * {@link org.nuiton.topia.persistence.TopiaEntity} has the given {@code topiaId} * * @param id the expected topiaId * @return the created Predicate */ - public static Predicate<TopiaEntity> entityHasId(String id) { + public static <E extends TopiaEntity> Predicate<E> entityHasId(String id) { Predicate<String> equalsPredicate = Predicates.equalTo(id); - Predicate<TopiaEntity> result = Predicates.compose(equalsPredicate, GET_TOPIA_ID); + Predicate<E> result = Predicates.compose(equalsPredicate, TopiaEntities.<E>getTopiaIdFunction()); return result; } @@ -88,8 +77,13 @@ public class TopiaEntities { * * @since 2.6.12 */ - public static Function<TopiaEntity, String> getTopiaIdFunction() { - return GET_TOPIA_ID; + public static <E extends TopiaEntity> Function<E, String> getTopiaIdFunction() { + return new Function<E, String>() { + @Override + public String apply(TopiaEntity input) { + return input == null ? null : input.getTopiaId(); + } + }; } } -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.