This is an automated email from the git hooks/post-receive script. New commit to branch feature/6150 in repository tutti. See http://git.codelutin.com/tutti.git commit 3e89c693696b9f3d0da740f46ffc6a6b04099e8e Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 22 15:55:23 2014 +0100 refs #6096 renommage variable + methodes --- .../tutti/service/referential/ImportRequestResult.java | 14 +++----------- .../referential/ReferentialTemporaryGearService.java | 6 +++--- .../referential/ReferentialTemporaryPersonService.java | 6 +++--- .../referential/ReferentialTemporarySpeciesService.java | 6 +++--- .../referential/ReferentialTemporaryVesselService.java | 6 +++--- 5 files changed, 15 insertions(+), 23 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ImportRequestResult.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ImportRequestResult.java index 8abc642..d377b2c 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ImportRequestResult.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ImportRequestResult.java @@ -8,7 +8,6 @@ import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.entities.referential.TuttiReferentialEntity; import java.util.Collection; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -29,14 +28,11 @@ public class ImportRequestResult<E extends TuttiReferentialEntity, K> { private final Map<K, E> existingEntitiesById; - private final Set<K> existingIds; - private final Set<String> existingNaturalIds; public ImportRequestResult(List<E> existingEntities, Function<E, K> entityToIdFunction, Function<E, String> naturalIdFunction) { this.existingEntitiesById = Maps.uniqueIndex(existingEntities, entityToIdFunction); - this.existingIds = new HashSet<>(existingEntitiesById.keySet()); this.existingNaturalIds = Sets.newHashSet(Iterables.transform(existingEntities, naturalIdFunction)); } @@ -53,15 +49,15 @@ public class ImportRequestResult<E extends TuttiReferentialEntity, K> { toDelete.add(entityToDelete); } - public boolean withToAdd() { + public boolean withEntitiesToAdd() { return !toAdd.isEmpty(); } - public boolean withToupdate() { + public boolean withEntitiesToUpdate() { return !toUpdate.isEmpty(); } - public boolean withToDelete() { + public boolean withEntitiesToDelete() { return !toDelete.isEmpty(); } @@ -81,10 +77,6 @@ public class ImportRequestResult<E extends TuttiReferentialEntity, K> { return existingEntitiesById.get(id); } - public boolean addExistingEntityId(K id) { - return existingIds.add(id); - } - public boolean addExistingNaturalId(String naturalId) { return existingNaturalIds.add(naturalId); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java index 1909181..8149d8d 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java @@ -64,7 +64,7 @@ public class ReferentialTemporaryGearService extends AbstractTuttiService { ReferentialImportResult<Gear> result = new ReferentialImportResult<>(); - if (requestResult.withToDelete()) { + if (requestResult.withEntitiesToDelete()) { Collection<Integer> idsToDelete = requestResult.getIdsToDelete(); persistenceService.deleteTemporaryGears(idsToDelete); @@ -72,7 +72,7 @@ public class ReferentialTemporaryGearService extends AbstractTuttiService { } - if (requestResult.withToAdd()) { + if (requestResult.withEntitiesToAdd()) { Collection<Gear> entitiesToAdd = requestResult.getEntitiesToAdd(); Collection<Gear> entitiesAdded = persistenceService.importTemporaryGear(entitiesToAdd); @@ -80,7 +80,7 @@ public class ReferentialTemporaryGearService extends AbstractTuttiService { } - if (requestResult.withToupdate()) { + if (requestResult.withEntitiesToUpdate()) { Collection<Gear> entitiesToUpdate = requestResult.getEntitiesToUpdate(); Collection<Gear> entitiesUpdated = persistenceService.importTemporaryGear(entitiesToUpdate); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonService.java index 003dc34..325194a 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonService.java @@ -61,7 +61,7 @@ public class ReferentialTemporaryPersonService extends AbstractTuttiService { ReferentialImportResult<Person> result = new ReferentialImportResult<>(); - if (requestResult.withToDelete()) { + if (requestResult.withEntitiesToDelete()) { Collection<Integer> idsToDelete = requestResult.getIdsToDelete(); @@ -70,7 +70,7 @@ public class ReferentialTemporaryPersonService extends AbstractTuttiService { } - if (requestResult.withToAdd()) { + if (requestResult.withEntitiesToAdd()) { Collection<Person> entitiesToAdd = requestResult.getEntitiesToAdd(); @@ -78,7 +78,7 @@ public class ReferentialTemporaryPersonService extends AbstractTuttiService { result.addAllRefsAdded(entitiesAdded); } - if (requestResult.withToupdate()) { + if (requestResult.withEntitiesToUpdate()) { Collection<Person> entitiesToUpdate = requestResult.getEntitiesToUpdate(); Collection<Person> entitiesUpdated = persistenceService.importTemporaryPerson(entitiesToUpdate); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesService.java index 2d4d180..2a65f75 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesService.java @@ -61,7 +61,7 @@ public class ReferentialTemporarySpeciesService extends AbstractTuttiService { ReferentialImportResult<Species> result = new ReferentialImportResult<>(); - if (requestResult.withToDelete()) { + if (requestResult.withEntitiesToDelete()) { Collection<Integer> idsToDelete = requestResult.getIdsToDelete(); persistenceService.deleteTemporarySpecies(idsToDelete); @@ -69,14 +69,14 @@ public class ReferentialTemporarySpeciesService extends AbstractTuttiService { } - if (requestResult.withToAdd()) { + if (requestResult.withEntitiesToAdd()) { Collection<Species> entitiesToAdd = requestResult.getEntitiesToAdd(); Collection<Species> entitiesAdded = persistenceService.importTemporarySpecies(entitiesToAdd); result.addAllRefsAdded(entitiesAdded); } - if (requestResult.withToupdate()) { + if (requestResult.withEntitiesToUpdate()) { Collection<Species> entitiesToUpdate = requestResult.getEntitiesToUpdate(); Collection<Species> entitiesUpdated = persistenceService.importTemporarySpecies(entitiesToUpdate); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java index ae27251..97acac6 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java @@ -63,7 +63,7 @@ public class ReferentialTemporaryVesselService extends AbstractTuttiService { ReferentialImportResult<Vessel> result = new ReferentialImportResult<>(); - if (requestResult.withToDelete()) { + if (requestResult.withEntitiesToDelete()) { Collection<String> idsToDelete = requestResult.getIdsToDelete(); persistenceService.deleteTemporaryVessels(idsToDelete); @@ -71,14 +71,14 @@ public class ReferentialTemporaryVesselService extends AbstractTuttiService { } - if (requestResult.withToAdd()) { + if (requestResult.withEntitiesToAdd()) { Collection<Vessel> entitiesToAdd = requestResult.getEntitiesToAdd(); Collection<Vessel> entitiesAdded = persistenceService.importTemporaryVessel(entitiesToAdd); result.addAllRefsAdded(entitiesAdded); } - if (requestResult.withToupdate()) { + if (requestResult.withEntitiesToUpdate()) { Collection<Vessel> entitiesToUpdate = requestResult.getEntitiesToUpdate(); Collection<Vessel> entitiesUpdated = persistenceService.importTemporaryVessel(entitiesToUpdate); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.