This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 90b80fd972944e5860dcef1855f9595227d28b79 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 13 15:45:08 2015 +0100 Correction de l'import du plan scléro (refs #2263) --- .../src/main/java/fr/ifremer/wao/entity/Companies.java | 2 +- .../src/main/java/fr/ifremer/wao/entity/Organisations.java | 12 ++++++++++++ .../service/csv/operations/OrganisationParserFormatter.java | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/entity/Companies.java b/wao-persistence/src/main/java/fr/ifremer/wao/entity/Companies.java index f8970fa..0b657ae 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/entity/Companies.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/entity/Companies.java @@ -26,7 +26,7 @@ import com.google.common.base.Function; public class Companies { public static Function<Company, String> getName() { - return Organisations.getFullName(); + return Organisations.getName(); } } diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/entity/Organisations.java b/wao-persistence/src/main/java/fr/ifremer/wao/entity/Organisations.java index 30efc81..b92e39e 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/entity/Organisations.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/entity/Organisations.java @@ -13,6 +13,10 @@ public class Organisations { return Ordering.natural().onResultOf(getFullName()); } + public static <T extends Organisation> Function<T, String> getName() { + return new GetName<>(); + } + protected static class GetFullName<T extends Organisation> implements Function<T, String> { @Override @@ -20,4 +24,12 @@ public class Organisations { return input.getFullName(); } } + + protected static class GetName<T extends Organisation> implements Function<T, String> { + + @Override + public String apply(T input) { + return input.getName(); + } + } } diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/OrganisationParserFormatter.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/OrganisationParserFormatter.java index 58ac330..472f0a2 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/OrganisationParserFormatter.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/OrganisationParserFormatter.java @@ -63,7 +63,7 @@ public class OrganisationParserFormatter implements ValueParserFormatter<Organis @Override public Organisation parse(String organisationName) throws ParseException { if (indexedOrganisations == null) { - indexedOrganisations = Maps.uniqueIndex(organisations, Organisations.getFullName()); + indexedOrganisations = Maps.uniqueIndex(organisations, Organisations.getName()); } Organisation organisation = null; if (StringUtils.isNotBlank(organisationName)) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.