This is an automated email from the git hooks/post-receive script. New commit to branch feature/8148-correctionParanamer in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit edef71510ca2be0462b5217f33a7a40252bc92bc Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Mar 21 11:09:11 2016 +0100 utiliser dans l'implemenation les même noms de pramétre des méthode que l'interface (see #8148). --- .../services/service/ReferentialServiceTopia.java | 57 +++++++++------------- 1 file changed, 23 insertions(+), 34 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java index 40b233e..14ec415 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java @@ -25,17 +25,11 @@ package fr.ird.observe.services.service; import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import fr.ird.observe.entities.EntityMap; -import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; -import fr.ird.observe.entities.referentiel.Ocean; import fr.ird.observe.entities.referentiel.Species; -import fr.ird.observe.entities.referentiel.Species2; -import fr.ird.observe.entities.referentiel.SpeciesList; -import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.binder.BinderEngine; import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; @@ -43,10 +37,7 @@ import fr.ird.observe.services.dto.AbstractReferenceSet; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DtoMap; import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.IdDtos; import fr.ird.observe.services.dto.constants.ReferenceStatus; -import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinition; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; @@ -54,9 +45,7 @@ import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; import fr.ird.observe.services.dto.referential.SpeciesDto; -import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.seine.TripSeineDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaDao; @@ -147,14 +136,14 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe } @Override - public <D extends ReferentialDto> Form<D> loadForm(Class<D> dtoType, String id) { + public <D extends ReferentialDto> Form<D> loadForm(Class<D> type, String id) { if (log.isTraceEnabled()) { - log.trace("loadForm(" + dtoType.getName() + ", " + id + ")"); + log.trace("loadForm(" + type.getName() + ", " + id + ")"); } - ObserveReferentialEntity entity = loadEntity(dtoType, id); + ObserveReferentialEntity entity = loadEntity(type, id); //FIXME Definir une definition pour chaque formulaire de référentiel - Form<D> form = referentialEntityToForm(dtoType, entity, null); + Form<D> form = referentialEntityToForm(type, entity, null); D dto = form.getObject(); dto.setVersion(entity.getTopiaVersion()); @@ -181,48 +170,48 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe } @Override - public <D extends ReferentialDto> Form<D> preCreate(Class<D> dtoType) { + public <D extends ReferentialDto> Form<D> preCreate(Class<D> type) { if (log.isTraceEnabled()) { - log.trace("preCreate(" + dtoType.getName() + ")"); + log.trace("preCreate(" + type.getName() + ")"); } - Class<ObserveReferentialEntity> entityType = getReferentialEntityType(dtoType); + Class<ObserveReferentialEntity> entityType = getReferentialEntityType(type); ObserveReferentialEntity entity = newEntity(entityType); //TODO Voir selon le type d'entité si il y a des valeurs par défaut à utiliser //FIXME Definir une definition pour chaque formulaire de référentiel - Form<D> form = referentialEntityToForm(dtoType, entity, null); + Form<D> form = referentialEntityToForm(type, entity, null); return form; } - public <D extends ReferentialDto> SaveResultDto save(D dto) { + public <D extends ReferentialDto> SaveResultDto save(D bean) { if (log.isTraceEnabled()) { - log.trace("save(" + dto.getId() + ")"); + log.trace("save(" + bean.getId() + ")"); } - ObserveReferentialEntity entity = loadOrCreateEntityFromReferentialDto(dto); - copyReferentialDtoToEntity(dto, entity); + ObserveReferentialEntity entity = loadOrCreateEntityFromReferentialDto(bean); + copyReferentialDtoToEntity(bean, entity); return saveEntity(entity); } @Override - public <D extends ReferentialDto> void delete(Class<D> dtoType, String id) { + public <D extends ReferentialDto> void delete(Class<D> type, String id) { if (log.isTraceEnabled()) { - log.trace("delete(" + dtoType.getName() + ", " + id + ")"); + log.trace("delete(" + type.getName() + ", " + id + ")"); } - Class<? extends ObserveReferentialEntity> entityType = getReferentialEntityType(dtoType); - deleteEntity(dtoType, entityType, Collections.singleton(id)); + Class<? extends ObserveReferentialEntity> entityType = getReferentialEntityType(type); + deleteEntity(type, entityType, Collections.singleton(id)); } @Override - public <D extends ReferentialDto> void delete(Class<D> dtoType, Collection<String> ids) { + public <D extends ReferentialDto> void delete(Class<D> type, Collection<String> ids) { if (log.isTraceEnabled()) { - log.trace("delete(" + dtoType.getName() + ", [" + Joiner.on(", ").join(ids) + "])"); + log.trace("delete(" + type.getName() + ", [" + Joiner.on(", ").join(ids) + "])"); } - Class<? extends ObserveReferentialEntity> entityType = getReferentialEntityType(dtoType); - deleteEntity(dtoType, entityType, ids); + Class<? extends ObserveReferentialEntity> entityType = getReferentialEntityType(type); + deleteEntity(type, entityType, ids); } @Override @@ -266,12 +255,12 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe } @Override - public <D extends ReferentialDto> boolean exists(Class<D> dtoType, String id) { + public <D extends ReferentialDto> boolean exists(Class<D> type, String id) { if (log.isTraceEnabled()) { - log.trace("exists(" + dtoType.getName() + ", " + id + ")"); + log.trace("exists(" + type.getName() + ", " + id + ")"); } - Class<? extends ObserveReferentialEntity> entityType = getReferentialEntityType(dtoType); + Class<? extends ObserveReferentialEntity> entityType = getReferentialEntityType(type); return existsEntity(entityType, id); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.