This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 1955721439bc71898b7d4453baa58eada4b1ff59 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 25 11:14:46 2015 +0100 refs #6805 Correction du non import de personne si existe déjà --- .../ifremer/tutti/persistence/entities/referential/Persons.java | 8 ++------ .../referential/consumer/CsvConsumerForTemporaryPerson.java | 3 ++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Persons.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Persons.java index 7846cd4..b82527f 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Persons.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Persons.java @@ -27,12 +27,8 @@ package fr.ifremer.tutti.persistence.entities.referential; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; -import com.google.common.collect.Maps; import org.apache.commons.lang3.StringUtils; -import java.util.List; -import java.util.Map; - public class Persons extends AbstractPersons { /** @@ -65,8 +61,8 @@ public class Persons extends AbstractPersons { } - public static Map<String, Person> splitByFullName(List<Person> persons) { - return Maps.uniqueIndex(persons, GET_FULL_NAME); + public static String getFullName(Person person) { + return GET_FULL_NAME.apply(person); } public static final Predicate<Person> IS_TEMPORARY = new Predicate<Person>() { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryPerson.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryPerson.java index e19a69e..e9c7543 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryPerson.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryPerson.java @@ -220,7 +220,8 @@ public class CsvConsumerForTemporaryPerson extends CsvComsumer<PersonRow, Person throw new ApplicationBusinessException(t("tutti.service.referential.import.person.error.noName", id)); } - if (!name.equals(person.getName()) && !requestResult.addExistingNaturalId(name)) { + String previousFullName = Persons.getFullName(person); + if (!previousFullName.equals(name) && !requestResult.addExistingNaturalId(name)) { throw new ApplicationBusinessException(t("tutti.service.referential.import.person.error.existingName", name)); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.