August 2015 - Observe-commits - mailman.cloud.codelutin.com

25/50: On retourne des universes de références vides en mode lecture
by codelutin.com scm 20 Aug '15

20 Aug '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 2f63e0b41cfc83a31580c4796d4f4c7b3cc0d2df Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 15:01:47 2015 +0200 On retourne des universes de références vides en mode lecture --- .../dto/referential/ReferentialLabelSetDtos.java | 6 ++++++ .../services/service/ReferentialDtoBuilder.java | 19 ++++++++----------- .../services/service/ReferentialServiceTopia.java | 19 +++++++------------ .../services/service/ReferentialDtoBuilderTest.java | 5 ++--- .../services/service/ReferentialServiceTopiaTest.java | 3 +-- 5 files changed, 24 insertions(+), 28 deletions(-) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelSetDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelSetDtos.java index 0baa167..db70705 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelSetDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelSetDtos.java @@ -4,6 +4,12 @@ import java.util.LinkedHashSet; public class ReferentialLabelSetDtos extends AbstractReferentialLabelSetDtos { + public static <R extends ReferentialDto> ReferentialLabelSetDto<R> newEmptyReferentialLabelSetDto(Class<R> type) { + ReferentialLabelSetDto<R> dto = new ReferentialLabelSetDto<>(type); + dto.setReferentialLabel(new LinkedHashSet<ReferentialLabelDto>()); + return dto; + } + public static <R extends ReferentialDto> ReferentialLabelSetDto<R> newReferentialLabelSetDto(Class<R> type, LinkedHashSet<ReferentialLabelDto<R>> labels) { ReferentialLabelSetDto<R> dto = new ReferentialLabelSetDto<>(type); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java index 726663c..b373bca 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java @@ -13,7 +13,6 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialLabelDto; import fr.ird.observe.services.dto.referential.ReferentialLabelDtos; -import org.apache.commons.lang3.tuple.Pair; import org.nuiton.topia.persistence.EntityVisitor; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.beans.Binder; @@ -40,16 +39,16 @@ public class ReferentialDtoBuilder<M extends ReferentialDto> implements Closeabl private final EntityVisitor visitor; - private ImmutableSet.Builder<Pair<Class<? extends ReferentialDto>, String>> referentialDtoTypesBuilder; + private ImmutableSet.Builder<Class<? extends ReferentialDto>> referentialDtoTypesBuilder; - public static <M extends ReferentialDto> ReferentialDtoBuilder<M> create(Class<M> modelType, ReferentialLocale referentialLocale) { + public static <M extends ReferentialDto> ReferentialDtoBuilder<M> create(Class<M> dtoType, ReferentialLocale referentialLocale) { - Preconditions.checkNotNull(modelType, "modelType can't be null."); + Preconditions.checkNotNull(dtoType, "dtoType can't be null."); M result; try { - result = modelType.newInstance(); + result = dtoType.newInstance(); } catch (InstantiationException | IllegalAccessException e) { - throw new IllegalStateException("Could not instanciate model of type: " + modelType.getName()); + throw new IllegalStateException("Could not instanciate dto of type: " + dtoType.getName()); } ReferentialDtoBuilder<M> visitor = new ReferentialDtoBuilder<>(result, referentialLocale); return visitor; @@ -68,7 +67,7 @@ public class ReferentialDtoBuilder<M extends ReferentialDto> implements Closeabl } - public ImmutableSet<Pair<Class<? extends ReferentialDto>, String>> getReferentialDtoTypes() { + public ImmutableSet<Class<? extends ReferentialDto>> getReferentialDtoTypes() { return referentialDtoTypesBuilder.build(); } @@ -123,11 +122,9 @@ public class ReferentialDtoBuilder<M extends ReferentialDto> implements Closeabl protected <R extends ReferentialDto> ReferentialLabelDto<R> entityToRef(Class<R> dtoType, TopiaEntity entityValue) { - String id = entityValue.getTopiaId(); - Pair<Class<R>, String> ref = Pair.of(dtoType, id); - referentialDtoTypesBuilder.add((Pair) ref); + referentialDtoTypesBuilder.add(dtoType); ReferentialLabelDto<R> label = ReferentialLabelDtos.newReferentialLabelDto(dtoType, referentialLocale, entityValue); - label.setId(id); + label.setId(entityValue.getTopiaId()); return label; } 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 32e6d52..ee9a73f 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 @@ -129,7 +129,6 @@ import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.referential.seine.WindDto; -import org.apache.commons.lang3.tuple.Pair; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; @@ -346,10 +345,10 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe D dto = dtoBuilder.build(); // build label sets detected while copy - ImmutableSet<Pair<Class<? extends ReferentialDto>, String>> referentialDtoTypes = dtoBuilder.getReferentialDtoTypes(); + ImmutableSet<Class<? extends ReferentialDto>> referentialDtoTypes = dtoBuilder.getReferentialDtoTypes(); ImmutableSet.Builder<ReferentialLabelSetDto> labels = new ImmutableSet.Builder<>(); - for (Pair<Class<? extends ReferentialDto>, String> ref : referentialDtoTypes) { - ReferentialLabelSetDto referentialLabelSet = getReferentialLabelSet(ref.getKey()); + for (Class<? extends ReferentialDto> referenceDtoType : referentialDtoTypes) { + ReferentialLabelSetDto referentialLabelSet = getReferentialLabelSet(referenceDtoType); labels.add(referentialLabelSet); } FormDto<D> form = FormDtos.newFormDto(dtoType, dto, labels.build()); @@ -366,16 +365,12 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe D dto = dtoBuilder.build(); // build label sets detected while copy (keep the reference for each label, or nothing if value not set) - ImmutableSet<Pair<Class<? extends ReferentialDto>, String>> referentialDtoTypes = dtoBuilder.getReferentialDtoTypes(); + ImmutableSet<Class<? extends ReferentialDto>> referentialDtoTypes = dtoBuilder.getReferentialDtoTypes(); ImmutableSet.Builder<ReferentialLabelSetDto> labels = new ImmutableSet.Builder<>(); - for (Pair<Class<? extends ReferentialDto>, String> ref : referentialDtoTypes) { - String id = ref.getRight(); - if (id != null) { + for (Class<? extends ReferentialDto> referentialDtoType : referentialDtoTypes) { - ReferentialLabelSetDto referentialLabelSet = getReferentialLabelSet(ref.getLeft(), id); - labels.add(referentialLabelSet); - - } + ReferentialLabelSetDto referentialLabelSet = ReferentialLabelSetDtos.newEmptyReferentialLabelSetDto(referentialDtoType); + labels.add(referentialLabelSet); } FormDto<D> form = FormDtos.newFormDto(dtoType, dto, labels.build()); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java index 169ba30..3e54fa1 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java @@ -14,7 +14,6 @@ import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialLabelDto; import fr.ird.observe.services.dto.referential.ReferentielLabelValueNotFoundException; -import org.apache.commons.lang3.tuple.Pair; import org.junit.Assert; import org.junit.Test; import org.nuiton.util.DateUtil; @@ -62,13 +61,13 @@ public class ReferentialDtoBuilderTest { ReferentialDtoBuilder<ProgramDto> builder = ReferentialDtoBuilder.create(ProgramDto.class, ReferentialLocale.FR); builder.copyEntity(program); ProgramDto programDto = builder.build(); - ImmutableSet<Pair<Class<? extends ReferentialDto>, String>> referentialDtoTypes = builder.getReferentialDtoTypes(); + ImmutableSet<Class<? extends ReferentialDto>> referentialDtoTypes = builder.getReferentialDtoTypes(); // On verifie les types de listes de labels détectées Assert.assertNotNull(referentialDtoTypes); Assert.assertEquals(1, referentialDtoTypes.size()); - Assert.assertTrue(referentialDtoTypes.contains(Pair.of(OrganismDto.class,"Organism1"))); + Assert.assertTrue(referentialDtoTypes.contains(OrganismDto.class)); // On vérife que le program a bien été copié Assert.assertEquals(program.getCode(), programDto.getCode()); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java index 3bcb151..cbcf107 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java @@ -145,8 +145,7 @@ public class ReferentialServiceTopiaTest { Assert.assertEquals(o.getTopiaId(), form.getId()); for (ReferentialLabelSetDto labelSetDto : formDto.getLabels()) { - Assert.assertTrue(0 <= labelSetDto.sizeReferentialLabel()); - Assert.assertTrue(labelSetDto.sizeReferentialLabel() < 2); + Assert.assertTrue(labelSetDto.isReferentialLabelEmpty()); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

24/50: update model longline dto (refs #7458).
by codelutin.com scm 20 Aug '15

20 Aug '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit dc03b68ee60f7bf2382db4e0ab5bd4463f51d549 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Aug 18 16:31:28 2015 +0200 update model longline dto (refs #7458). --- .../main/xmi/observe-services-dto-longline.zargo | Bin 75604 -> 75679 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo index 61cf0e8..7208e8c 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

23/50: update model seine dto (refs #7458).
by codelutin.com scm 20 Aug '15

20 Aug '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit d457cd30d07e42ec980aacb343fff5cb5156cf15 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Aug 18 16:19:05 2015 +0200 update model seine dto (refs #7458). --- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 55176 -> 54650 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo index 4896129..4552de9 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

22/50: Ajout d'une exception lorsqu'on a pas pas trouvé une donnée + test de suppression
by codelutin.com scm 20 Aug '15

20 Aug '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit ea86ae6913b46c64f4b9be640feb55014525a710 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 14:22:47 2015 +0200 Ajout d'une exception lorsqu'on a pas pas trouvé une donnée + test de suppression --- .../services/service/DataNotFoundException.java | 30 ++++++++++++++++ .../services/service/ReferentialService.java | 8 ++--- .../services/service/ReferentialServiceTopia.java | 21 ++++++----- .../service/ReferentialServiceTopiaTest.java | 42 ++++++++++++++++++++++ 4 files changed, 89 insertions(+), 12 deletions(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/DataNotFoundException.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/DataNotFoundException.java new file mode 100644 index 0000000..1653e5e --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/DataNotFoundException.java @@ -0,0 +1,30 @@ +package fr.ird.observe.services.service; + +import fr.ird.observe.services.dto.IdDto; + +/** + * Pour signifier qu'on a demandé une resources non existente. + * Created on 18/08/15. + * + * @author Tony Chemit - chemit(a)codelutin.com + */ +public class DataNotFoundException extends RuntimeException { + + private static final long serialVersionUID = 1L; + + private final Class<? extends IdDto> type; + private final String id; + + public DataNotFoundException(Class<? extends IdDto> type, String id) { + this.type = type; + this.id = id; + } + + public Class<? extends IdDto> getType() { + return type; + } + + public String getId() { + return id; + } +} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java index 36690b5..1ef629f 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java @@ -17,9 +17,9 @@ public interface ReferentialService extends ObserveService { <R extends ReferentialDto> ReferentialLabelSetDto getReferentialLabelSet(Class<R> type); - <R extends ReferentialDto> FormDto<R> loadToRead(Class<R> type, String id); + <R extends ReferentialDto> FormDto<R> loadToRead(Class<R> type, String id) throws DataNotFoundException; - <R extends ReferentialDto> FormDto<R> loadToEdit(Class<R> type, String id); + <R extends ReferentialDto> FormDto<R> loadToEdit(Class<R> type, String id) throws DataNotFoundException; <R extends ReferentialDto> FormDto<R> preCreate(Class<R> type); @@ -27,9 +27,9 @@ public interface ReferentialService extends ObserveService { <R extends ReferentialDto> String save(FormDto<R> form); @Write - <R extends ReferentialDto> void delete(Class<R> type, String id); + <R extends ReferentialDto> void delete(Class<R> type, String id) throws DataNotFoundException; @Write - <R extends ReferentialDto> void delete(Class<R> type, Collection<String> ids); + <R extends ReferentialDto> void delete(Class<R> type, Collection<String> ids) throws DataNotFoundException; } 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 ce04fb3..32e6d52 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 @@ -241,7 +241,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe public <D extends ReferentialDto> ReferentialLabelSetDto getReferentialLabelSet(Class<D> dtoType, String id) { Class<TopiaEntity> entityType = getEntityType(dtoType); - TopiaEntity entity = loadEntity(entityType, id); + TopiaEntity entity = loadEntity(dtoType, entityType, id); LinkedHashSet<ReferentialLabelDto<D>> labels = new LinkedHashSet<>(1); ReferentialLabelDto<D> dto = ReferentialLabelDtos.newReferentialLabelDto(dtoType, serviceContext.getReferentialLocale(), entity); labels.add(dto); @@ -252,7 +252,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe @Override public <D extends ReferentialDto> FormDto<D> loadToRead(Class<D> dtoType, String id) { Class<? extends TopiaEntity> entityType = getEntityType(dtoType); - TopiaEntity entity = loadEntity(entityType, id); + TopiaEntity entity = loadEntity(dtoType, entityType, id); FormDto<D> form = entityToReadReferentialFormDto(dtoType, entity); return form; } @@ -260,7 +260,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe @Override public <D extends ReferentialDto> FormDto<D> loadToEdit(Class<D> dtoType, String id) { Class<? extends TopiaEntity> entityType = getEntityType(dtoType); - TopiaEntity entity = loadEntity(entityType, id); + TopiaEntity entity = loadEntity(dtoType, entityType, id); FormDto<D> form = entityToEditReferentialFormDto(dtoType, entity); return form; } @@ -274,7 +274,6 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe return form; } - public <D extends ReferentialDto> String save(FormDto<D> form) { Class<D> dtoType = form.getType(); TopiaEntity entity = referentialDtoToEntity(form.getForm()); @@ -287,13 +286,13 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe @Override public <D extends ReferentialDto> void delete(Class<D> dtoType, String id) { Class<? extends TopiaEntity> entityType = getEntityType(dtoType); - deleteEntity(entityType, Collections.singleton(id)); + deleteEntity(dtoType, entityType, Collections.singleton(id)); } @Override public <D extends ReferentialDto> void delete(Class<D> dtoType, Collection<String> ids) { Class<? extends TopiaEntity> entityType = getEntityType(dtoType); - deleteEntity(entityType, ids); + deleteEntity(dtoType, entityType, ids); } protected <E extends TopiaEntity> List<E> loadEntities(Class<E> entityType) { @@ -303,10 +302,13 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe return entities; } - protected <E extends TopiaEntity> E loadEntity(Class<E> entityType, String id) { + protected <D extends ReferentialDto, E extends TopiaEntity> E loadEntity(Class<D> dtoType, Class<E> entityType, String id) { TopiaContext transaction = serviceContext.getTransaction(); TopiaDAO<E> dao = ObserveDAOHelper.getDAO(transaction, entityType); E entity = dao.findByTopiaId(id); + if (entity == null) { + throw new DataNotFoundException(dtoType, id); + } return entity; } @@ -324,11 +326,14 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe return entity; } - protected <E extends TopiaEntity> void deleteEntity(Class<E> entityType, Iterable<String> ids) { + protected <D extends ReferentialDto, E extends TopiaEntity> void deleteEntity(Class<D> dtoType, Class<E> entityType, Iterable<String> ids) { TopiaContext transaction = serviceContext.getTransaction(); TopiaDAO<E> dao = ObserveDAOHelper.getDAO(transaction, entityType); for (String id : ids) { E entity = dao.findByTopiaId(id); + if (entity == null) { + throw new DataNotFoundException(dtoType, id); + } dao.delete(entity); } } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java index df8c676..3bcb151 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java @@ -2,11 +2,15 @@ package fr.ird.observe.services.service; import fr.ird.observe.db.DataSource; import fr.ird.observe.entities.migration.H2DataSourceMigration; +import fr.ird.observe.entities.referentiel.LengthWeightParameter; +import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.services.ObserveServiceContextTopia; import fr.ird.observe.services.ObserveServiceMainFactory; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; +import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; +import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -107,6 +111,17 @@ public class ReferentialServiceTopiaTest { } + @Test + public void testDelete() throws Exception { + + TopiaContext tx = dataSourceResource.newTransaction("testDelete"); + + delete(tx, ProgramDto.class, Program.class); + delete(tx, LengthWeightParameterDto.class, LengthWeightParameter.class); + + + } + protected void loadToRead(TopiaContext tx, Class dtoType, Class entityType) { TopiaDAO<?> dao = dataSourceResource.getDataSource().getDAO(tx, entityType); long expectedCount = dao.count(); @@ -170,4 +185,31 @@ public class ReferentialServiceTopiaTest { } } + protected void delete(TopiaContext tx, Class dtoType, Class entityType) { + + TopiaDAO<?> dao = dataSourceResource.getDataSource().getDAO(tx, entityType); + long expectedCount = dao.count(); + + TopiaEntity entity = dao.iterator().next(); + if (log.isInfoEnabled()) { + log.info("Test delete: " + entity.getTopiaId()); + } + + FormDto formDto = service.loadToRead(dtoType, entity.getTopiaId()); + Assert.assertNotNull(formDto); + Assert.assertNotNull(formDto.getForm()); + Assert.assertNotNull(formDto.getForm().getId()); + + service.delete(dtoType, entity.getTopiaId()); + + Assert.assertEquals(expectedCount - 1, dao.count()); + + try { + service.loadToRead(dtoType, entity.getTopiaId()); + Assert.fail(); + } catch (DataNotFoundException e) { + Assert.assertTrue(true); + } + + } } \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

21/50: Pour les référentiels en lecture seule, on ne prend que la label des références rencontrées
by codelutin.com scm 20 Aug '15

20 Aug '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 6e008ba2a5289fe5b65130cb15598b8bbebe6dae Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 13:36:19 2015 +0200 Pour les référentiels en lecture seule, on ne prend que la label des références rencontrées --- .../services/service/ReferentialDtoBuilder.java | 13 ++++-- .../services/service/ReferentialServiceTopia.java | 54 ++++++++++++++++++---- .../service/ReferentialDtoBuilderTest.java | 11 +++-- .../service/ReferentialServiceTopiaTest.java | 13 ++++++ 4 files changed, 72 insertions(+), 19 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java index 3bf82d3..726663c 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java @@ -13,6 +13,7 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialLabelDto; import fr.ird.observe.services.dto.referential.ReferentialLabelDtos; +import org.apache.commons.lang3.tuple.Pair; import org.nuiton.topia.persistence.EntityVisitor; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.beans.Binder; @@ -21,7 +22,6 @@ import org.nuiton.util.beans.BinderFactory; import java.io.Closeable; import java.util.Collection; import java.util.LinkedHashSet; -import java.util.Set; /** * Created on 16/08/15. @@ -40,7 +40,7 @@ public class ReferentialDtoBuilder<M extends ReferentialDto> implements Closeabl private final EntityVisitor visitor; - private ImmutableSet.Builder<Class<? extends ReferentialDto>> referentialDtoTypesBuilder; + private ImmutableSet.Builder<Pair<Class<? extends ReferentialDto>, String>> referentialDtoTypesBuilder; public static <M extends ReferentialDto> ReferentialDtoBuilder<M> create(Class<M> modelType, ReferentialLocale referentialLocale) { @@ -68,7 +68,7 @@ public class ReferentialDtoBuilder<M extends ReferentialDto> implements Closeabl } - public Set<Class<? extends ReferentialDto>> getReferentialDtoTypes() { + public ImmutableSet<Pair<Class<? extends ReferentialDto>, String>> getReferentialDtoTypes() { return referentialDtoTypesBuilder.build(); } @@ -122,9 +122,12 @@ public class ReferentialDtoBuilder<M extends ReferentialDto> implements Closeabl } protected <R extends ReferentialDto> ReferentialLabelDto<R> entityToRef(Class<R> dtoType, TopiaEntity entityValue) { - referentialDtoTypesBuilder.add(dtoType); + + String id = entityValue.getTopiaId(); + Pair<Class<R>, String> ref = Pair.of(dtoType, id); + referentialDtoTypesBuilder.add((Pair) ref); ReferentialLabelDto<R> label = ReferentialLabelDtos.newReferentialLabelDto(dtoType, referentialLocale, entityValue); - label.setId(entityValue.getTopiaId()); + label.setId(id); return label; } 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 33518d8..ce04fb3 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 @@ -129,6 +129,7 @@ import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.referential.seine.WindDto; +import org.apache.commons.lang3.tuple.Pair; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; @@ -138,7 +139,6 @@ import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Set; /** * Created on 16/08/15. @@ -239,11 +239,21 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe return labelSetDto; } + public <D extends ReferentialDto> ReferentialLabelSetDto getReferentialLabelSet(Class<D> dtoType, String id) { + Class<TopiaEntity> entityType = getEntityType(dtoType); + TopiaEntity entity = loadEntity(entityType, id); + LinkedHashSet<ReferentialLabelDto<D>> labels = new LinkedHashSet<>(1); + ReferentialLabelDto<D> dto = ReferentialLabelDtos.newReferentialLabelDto(dtoType, serviceContext.getReferentialLocale(), entity); + labels.add(dto); + ReferentialLabelSetDto labelSetDto = ReferentialLabelSetDtos.newReferentialLabelSetDto(dtoType, labels); + return labelSetDto; + } + @Override public <D extends ReferentialDto> FormDto<D> loadToRead(Class<D> dtoType, String id) { Class<? extends TopiaEntity> entityType = getEntityType(dtoType); TopiaEntity entity = loadEntity(entityType, id); - FormDto<D> form = entityToReferentialFormDto(dtoType, entity); + FormDto<D> form = entityToReadReferentialFormDto(dtoType, entity); return form; } @@ -251,7 +261,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe public <D extends ReferentialDto> FormDto<D> loadToEdit(Class<D> dtoType, String id) { Class<? extends TopiaEntity> entityType = getEntityType(dtoType); TopiaEntity entity = loadEntity(entityType, id); - FormDto<D> form = entityToReferentialFormDto(dtoType, entity); + FormDto<D> form = entityToEditReferentialFormDto(dtoType, entity); return form; } @@ -260,7 +270,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe Class<? extends TopiaEntity> entityType = getEntityType(dtoType); TopiaEntity entity = newEntity(entityType); //TODO Voir selon le type d'entité si il y a des valeurs par défaut à utiliser - FormDto<D> form = entityToReferentialFormDto(dtoType, entity); + FormDto<D> form = entityToEditReferentialFormDto(dtoType, entity); return form; } @@ -270,7 +280,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe TopiaEntity entity = referentialDtoToEntity(form.getForm()); Class<TopiaEntity> entityType = getEntityType(dtoType); entity = saveEntity(entityType, entity); - FormDto<D> model = entityToReferentialFormDto(dtoType, entity); + FormDto<D> model = entityToEditReferentialFormDto(dtoType, entity); return model.getForm().getId(); } @@ -323,7 +333,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe } } - protected <D extends ReferentialDto> FormDto<D> entityToReferentialFormDto(Class<D> dtoType, TopiaEntity entity) { + protected <D extends ReferentialDto> FormDto<D> entityToEditReferentialFormDto(Class<D> dtoType, TopiaEntity entity) { try (ReferentialDtoBuilder<D> dtoBuilder = ReferentialDtoBuilder.create(dtoType, serviceContext.getReferentialLocale())) { // copy entity @@ -331,10 +341,10 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe D dto = dtoBuilder.build(); // build label sets detected while copy - Set<Class<? extends ReferentialDto>> referentialDtoTypes = dtoBuilder.getReferentialDtoTypes(); + ImmutableSet<Pair<Class<? extends ReferentialDto>, String>> referentialDtoTypes = dtoBuilder.getReferentialDtoTypes(); ImmutableSet.Builder<ReferentialLabelSetDto> labels = new ImmutableSet.Builder<>(); - for (Class<? extends ReferentialDto> referentialDtoType : referentialDtoTypes) { - ReferentialLabelSetDto referentialLabelSet = getReferentialLabelSet(referentialDtoType); + for (Pair<Class<? extends ReferentialDto>, String> ref : referentialDtoTypes) { + ReferentialLabelSetDto referentialLabelSet = getReferentialLabelSet(ref.getKey()); labels.add(referentialLabelSet); } FormDto<D> form = FormDtos.newFormDto(dtoType, dto, labels.build()); @@ -343,6 +353,32 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe } } + protected <D extends ReferentialDto> FormDto<D> entityToReadReferentialFormDto(Class<D> dtoType, TopiaEntity entity) { + try (ReferentialDtoBuilder<D> dtoBuilder = ReferentialDtoBuilder.create(dtoType, serviceContext.getReferentialLocale())) { + + // copy entity + dtoBuilder.copyEntity(entity); + D dto = dtoBuilder.build(); + + // build label sets detected while copy (keep the reference for each label, or nothing if value not set) + ImmutableSet<Pair<Class<? extends ReferentialDto>, String>> referentialDtoTypes = dtoBuilder.getReferentialDtoTypes(); + ImmutableSet.Builder<ReferentialLabelSetDto> labels = new ImmutableSet.Builder<>(); + for (Pair<Class<? extends ReferentialDto>, String> ref : referentialDtoTypes) { + String id = ref.getRight(); + if (id != null) { + + ReferentialLabelSetDto referentialLabelSet = getReferentialLabelSet(ref.getLeft(), id); + labels.add(referentialLabelSet); + + } + + } + FormDto<D> form = FormDtos.newFormDto(dtoType, dto, labels.build()); + return form; + + } + } + protected <D extends ReferentialDto, E extends TopiaEntity> E referentialDtoToEntity(D dto) { Class<D> aClass = (Class<D>) dto.getClass(); Class<TopiaEntity> entityType = getEntityType(aClass); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java index 78bba4a..169ba30 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java @@ -1,5 +1,6 @@ package fr.ird.observe.services.service; +import com.google.common.collect.ImmutableSet; import fr.ird.observe.entities.constants.GearType; import fr.ird.observe.entities.constants.ReferenceStatus; import fr.ird.observe.entities.referentiel.Organism; @@ -13,12 +14,11 @@ import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialLabelDto; import fr.ird.observe.services.dto.referential.ReferentielLabelValueNotFoundException; +import org.apache.commons.lang3.tuple.Pair; import org.junit.Assert; import org.junit.Test; import org.nuiton.util.DateUtil; -import java.util.Set; - /** * Created on 17/08/15. * @@ -47,7 +47,7 @@ public class ReferentialDtoBuilderTest { program.setGearType(GearType.seine); program.setTargetDiscardsObservation(1); Organism organism = new OrganismImpl(); - organism.setTopiaId("Oraganism1"); + organism.setTopiaId("Organism1"); organism.setLabel1("organism1"); organism.setLabel2("organism2"); organism.setLabel3("organism3"); @@ -62,12 +62,13 @@ public class ReferentialDtoBuilderTest { ReferentialDtoBuilder<ProgramDto> builder = ReferentialDtoBuilder.create(ProgramDto.class, ReferentialLocale.FR); builder.copyEntity(program); ProgramDto programDto = builder.build(); - Set<Class<? extends ReferentialDto>> referentialDtoTypes = builder.getReferentialDtoTypes(); + ImmutableSet<Pair<Class<? extends ReferentialDto>, String>> referentialDtoTypes = builder.getReferentialDtoTypes(); // On verifie les types de listes de labels détectées Assert.assertNotNull(referentialDtoTypes); Assert.assertEquals(1, referentialDtoTypes.size()); - Assert.assertTrue(referentialDtoTypes.contains(OrganismDto.class)); + + Assert.assertTrue(referentialDtoTypes.contains(Pair.of(OrganismDto.class,"Organism1"))); // On vérife que le program a bien été copié Assert.assertEquals(program.getCode(), programDto.getCode()); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java index 9947348..df8c676 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java @@ -129,6 +129,11 @@ public class ReferentialServiceTopiaTest { Assert.assertNotNull(form); Assert.assertEquals(o.getTopiaId(), form.getId()); + for (ReferentialLabelSetDto labelSetDto : formDto.getLabels()) { + Assert.assertTrue(0 <= labelSetDto.sizeReferentialLabel()); + Assert.assertTrue(labelSetDto.sizeReferentialLabel() < 2); + } + } } @@ -154,6 +159,14 @@ public class ReferentialServiceTopiaTest { Assert.assertNotNull(form); Assert.assertEquals(o.getTopiaId(), form.getId()); + for (ReferentialLabelSetDto labelSetDto : formDto.getLabels()) { + + Class refEntityType = ReferentialServiceTopia.modelToEntityTypeCache.get(labelSetDto.getType()); + long refExpected = dataSourceResource.getDataSource().getDAO(tx, refEntityType).count(); + Assert.assertEquals(refExpected, labelSetDto.sizeReferentialLabel()); + + } + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

20/50: Correction des liens sur certains référentiels + tester le chargement de tous les référentiels
by codelutin.com scm 20 Aug '15

20 Aug '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit c6e7300cad250e52f3a0e038dacef38745d730af Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 13:18:53 2015 +0200 Correction des liens sur certains référentiels + tester le chargement de tous les référentiels --- .../src/main/xmi/observe-services-dto-common.zargo | Bin 32889 -> 33042 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 75755 -> 75604 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 54561 -> 55176 bytes observe-services-topia/pom.xml | 2 +- .../services/service/ReferentialDtoBuilder.java | 6 +- .../service/ReferentialServiceTopiaTest.java | 83 +++++++++++++++++++++ 6 files changed, 87 insertions(+), 4 deletions(-) diff --git a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo index 6ca3d46..862033a 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo differ diff --git a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo index 6ed2246..61cf0e8 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo differ diff --git a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo index 2745504..4896129 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-seine.zargo differ diff --git a/observe-services-topia/pom.xml b/observe-services-topia/pom.xml index 6c297c8..f5560e2 100644 --- a/observe-services-topia/pom.xml +++ b/observe-services-topia/pom.xml @@ -71,7 +71,7 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> - +  <!--dependency> <groupId>org.hibernate</groupId> diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java index 10d7157..3bf82d3 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java @@ -6,10 +6,10 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.entities.constants.GearType; import fr.ird.observe.entities.constants.ReferenceStatus; import fr.ird.observe.entities.constants.seine.NonTargetCatchComputedValueSource; +import fr.ird.observe.entities.constants.seine.Ownership; +import fr.ird.observe.entities.constants.seine.SchoolType; +import fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperation; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.constants.seine.Ownership; -import fr.ird.observe.services.dto.constants.seine.SchoolType; -import fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialLabelDto; import fr.ird.observe.services.dto.referential.ReferentialLabelDtos; diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java index 9564a03..9947348 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java @@ -4,6 +4,8 @@ import fr.ird.observe.db.DataSource; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.services.ObserveServiceContextTopia; import fr.ird.observe.services.ObserveServiceMainFactory; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; import org.apache.commons.logging.Log; @@ -15,6 +17,7 @@ import org.junit.Rule; import org.junit.Test; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaEntity; import java.util.Map; @@ -74,4 +77,84 @@ public class ReferentialServiceTopiaTest { } + @Test + public void testLoadToRead() throws Exception { + + TopiaContext tx = dataSourceResource.newTransaction("testLoadToRead"); + + for (Map.Entry<Class<?>, Class<?>> entry : ReferentialServiceTopia.modelToEntityTypeCache.entrySet()) { + + Class dtoType = entry.getKey(); + Class entityType = entry.getValue(); + loadToRead(tx, dtoType, entityType); + + } + + } + + @Test + public void testLoadToEdit() throws Exception { + + TopiaContext tx = dataSourceResource.newTransaction("testLoadToEdit"); + + for (Map.Entry<Class<?>, Class<?>> entry : ReferentialServiceTopia.modelToEntityTypeCache.entrySet()) { + + Class dtoType = entry.getKey(); + Class entityType = entry.getValue(); + loadToEdit(tx, dtoType, entityType); + + } + + } + + protected void loadToRead(TopiaContext tx, Class dtoType, Class entityType) { + TopiaDAO<?> dao = dataSourceResource.getDataSource().getDAO(tx, entityType); + long expectedCount = dao.count(); + + if (log.isInfoEnabled()) { + log.info("Test referential of type: " + dtoType.getSimpleName() + " expected count: " + expectedCount); + } + + for (TopiaEntity o : dao) { + + if (log.isDebugEnabled()) { + log.debug("Load to read entity: " + o.getTopiaId()); + } + + FormDto formDto = service.loadToRead(dtoType, o.getTopiaId()); + Assert.assertNotNull(formDto); + Assert.assertEquals(dtoType, formDto.getType()); + + IdDto form = formDto.getForm(); + Assert.assertNotNull(form); + Assert.assertEquals(o.getTopiaId(), form.getId()); + + } + } + + protected void loadToEdit(TopiaContext tx, Class dtoType, Class entityType) { + TopiaDAO<?> dao = dataSourceResource.getDataSource().getDAO(tx, entityType); + long expectedCount = dao.count(); + + if (log.isInfoEnabled()) { + log.info("Test referential of type: " + dtoType.getSimpleName() + " expected count: " + expectedCount); + } + + for (TopiaEntity o : dao) { + + if (log.isDebugEnabled()) { + log.debug("Load to edit entity: " + o.getTopiaId()); + } + + FormDto formDto = service.loadToEdit(dtoType, o.getTopiaId()); + Assert.assertNotNull(formDto); + Assert.assertEquals(dtoType, formDto.getType()); + + IdDto form = formDto.getForm(); + Assert.assertNotNull(form); + Assert.assertEquals(o.getTopiaId(), form.getId()); + + } + } + } \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

19/50: Correction d'un test + optimisation des dépendances
by codelutin.com scm 20 Aug '15

20 Aug '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 5eda0387cd3024c01eeba176fb3c30db5dcbc347 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 12:28:55 2015 +0200 Correction d'un test + optimisation des dépendances --- observe-services-topia/pom.xml | 30 +++++----------------- .../service/ReferentialServiceTopiaTest.java | 2 ++ 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/observe-services-topia/pom.xml b/observe-services-topia/pom.xml index cdab983..6c297c8 100644 --- a/observe-services-topia/pom.xml +++ b/observe-services-topia/pom.xml @@ -53,22 +53,14 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> - <dependency> - <groupId>commons-primitives</groupId> - <artifactId>commons-primitives</artifactId> - </dependency> - <dependency> +  <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> @@ -79,28 +71,20 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-decorator</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> - +  - <dependency> +  <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> </dependency> - <dependency> +   <dependency> diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java index 4353ea7..9564a03 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java @@ -4,6 +4,7 @@ import fr.ird.observe.db.DataSource; import fr.ird.observe.entities.migration.H2DataSourceMigration; import fr.ird.observe.services.ObserveServiceContextTopia; import fr.ird.observe.services.ObserveServiceMainFactory; +import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -42,6 +43,7 @@ public class ReferentialServiceTopiaTest { ObserveServiceContextTopia context = new ObserveServiceContextTopia(); context.setDataSource(localDataSource); + context.setReferentialLocale(ReferentialLocale.FR); ObserveServiceMainFactory serviceFactory = ObserveServiceMainFactory.get(); service = serviceFactory.newService(context, ReferentialService.class); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

18/50: Ajout commentaires sur un test
by codelutin.com scm 20 Aug '15

20 Aug '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 6c688a16bb382ff3a04948153893f30c8cd18dce Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 12:23:13 2015 +0200 Ajout commentaires sur un test --- .../observe/services/service/ReferentialDtoBuilderTest.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java index 5c1dcb4..78bba4a 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java @@ -8,6 +8,7 @@ import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.entities.referentiel.ProgramImpl; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.I18nReferentialDto; +import fr.ird.observe.services.dto.referential.OrganismDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialLabelDto; @@ -16,6 +17,8 @@ import org.junit.Assert; import org.junit.Test; import org.nuiton.util.DateUtil; +import java.util.Set; + /** * Created on 17/08/15. * @@ -59,7 +62,14 @@ public class ReferentialDtoBuilderTest { ReferentialDtoBuilder<ProgramDto> builder = ReferentialDtoBuilder.create(ProgramDto.class, ReferentialLocale.FR); builder.copyEntity(program); ProgramDto programDto = builder.build(); + Set<Class<? extends ReferentialDto>> referentialDtoTypes = builder.getReferentialDtoTypes(); + + // On verifie les types de listes de labels détectées + Assert.assertNotNull(referentialDtoTypes); + Assert.assertEquals(1, referentialDtoTypes.size()); + Assert.assertTrue(referentialDtoTypes.contains(OrganismDto.class)); + // On vérife que le program a bien été copié Assert.assertEquals(program.getCode(), programDto.getCode()); Assert.assertEquals(program.isNeedComment(), programDto.isNeedComment()); Assert.assertNotNull(programDto.getStatus()); @@ -78,6 +88,7 @@ public class ReferentialDtoBuilderTest { Assert.assertEquals(program.getGearType().name(), programDto.getGearType().name()); Assert.assertEquals(program.getTargetDiscardsObservation(), programDto.getTargetDiscardsObservation()); + // On vérife que la référence sur l'organisme a bien été copiée ReferentialLabelDto organismDto = programDto.getOrganism(); Assert.assertNotNull(organismDto); Assert.assertEquals(organism.getTopiaId(), organismDto.getId()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

17/50: Gestion de la locale des référentiels
by codelutin.com scm 20 Aug '15

20 Aug '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 497ba0087fc05db383796d1ad532ce409989b592 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 12:19:42 2015 +0200 Gestion de la locale des référentiels --- .../observe/services/ObserveServiceContext.java | 4 + .../services/FakeObserveServiceContext.java | 12 ++ .../services/dto/constants/ReferentialLocale.java | 124 +++++++++++++++++++++ .../dto/referential/ReferentialLabelDto.java | 52 ++++++++- .../dto/referential/ReferentialLabelDtos.java | 13 ++- .../ReferentielLabelValueNotFoundException.java | 27 +++++ .../services/ObserveServiceContextRest.java | 12 ++ .../services/ObserveServiceContextTopia.java | 12 ++ .../services/service/ReferentialDtoBuilder.java | 12 +- .../services/service/ReferentialServiceTopia.java | 4 +- .../service/ReferentialDtoBuilderTest.java | 73 ++++++++---- 11 files changed, 304 insertions(+), 41 deletions(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceContext.java b/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceContext.java index 31c201b..9b1a3e2 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceContext.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/ObserveServiceContext.java @@ -1,5 +1,7 @@ package fr.ird.observe.services; +import fr.ird.observe.services.dto.constants.ReferentialLocale; + /** * Created on 16/08/15. * @@ -7,4 +9,6 @@ package fr.ird.observe.services; */ public interface ObserveServiceContext { + ReferentialLocale getReferentialLocale(); + } diff --git a/observe-services-api/src/test/java/fr/ird/observe/services/FakeObserveServiceContext.java b/observe-services-api/src/test/java/fr/ird/observe/services/FakeObserveServiceContext.java index b26f3a6..5ab54bb 100644 --- a/observe-services-api/src/test/java/fr/ird/observe/services/FakeObserveServiceContext.java +++ b/observe-services-api/src/test/java/fr/ird/observe/services/FakeObserveServiceContext.java @@ -1,5 +1,7 @@ package fr.ird.observe.services; +import fr.ird.observe.services.dto.constants.ReferentialLocale; + /** * Created on 16/08/15. * @@ -7,4 +9,14 @@ package fr.ird.observe.services; */ public class FakeObserveServiceContext implements ObserveServiceContext { + private ReferentialLocale referentialLocale; + + @Override + public ReferentialLocale getReferentialLocale() { + return referentialLocale; + } + + public void setReferentialLocale(ReferentialLocale referentialLocale) { + this.referentialLocale = referentialLocale; + } } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferentialLocale.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferentialLocale.java new file mode 100644 index 0000000..60d3a24 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferentialLocale.java @@ -0,0 +1,124 @@ +/* + * #%L + * ObServe :: Entities + * %% + * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ird.observe.services.dto.constants; + + +import fr.ird.observe.services.dto.referential.I18nReferentialDto; +import fr.ird.observe.services.dto.referential.ReferentialDto; + +import java.util.Locale; + +/** + * Pour définir les différentes langues du référentiel. + * <p/> + * La position de chaque constante définit l'index du champs libelleXXX à + * utiliser. + * <p/> + * En base on a actuellement 8 langues possibles, pour gérer une nouvelle + * langue, il faut définir une nouvelle constante ici. + * + * @author Tony Chemit - chemit(a)codelutin.com + */ +public enum ReferentialLocale { + /** + * correspond a la propriete {@code label1} d'un {@link I18nReferentialDto}. + * + * @see I18nReferentialDto#getLabel1() + */ + UK(Locale.UK), + /** + * correspond a la propriete {@code label2} d'un {@link ReferentialDto}. + * + * @see I18nReferentialDto#getLabel2() + */ + FR(Locale.FRANCE), + /** + * correspond a la propriete {@code label3} d'un {@link ReferentialDto}. + * + * @see I18nReferentialDto#getLabel3() + */ + ES(new Locale("es", "ES")); + + private final Locale locale; + + ReferentialLocale(Locale locale) { + this.locale = locale; + } + + public Locale getLocale() { + return locale; + } + + public String getLibelle() { + return "label" + (ordinal() + 1); + } + + public static ReferentialLocale valueOf(Locale locale) { + for (ReferentialLocale anEnum : values()) { + if (locale.equals(anEnum.getLocale())) { + return anEnum; + } + } + throw new IllegalArgumentException( + "could not find referentiel locale from locale " + locale); + } + + public String getColumnName() { + return "label" + (ordinal() + 1); + } + + @Override + public String toString() { + return "<ReferentialLocale: " + locale + ", index: " + name() + ">"; + } + + public <E extends I18nReferentialDto> void setLabel(String label, E i18nEntity) { + + switch (ordinal() + 1) { + case 1: + i18nEntity.setLabel1(label); + break; + case 2: + i18nEntity.setLabel2(label); + break; + case 3: + i18nEntity.setLabel3(label); + break; + case 4: + i18nEntity.setLabel4(label); + break; + case 5: + i18nEntity.setLabel5(label); + break; + case 6: + i18nEntity.setLabel6(label); + break; + case 7: + i18nEntity.setLabel7(label); + break; + case 8: + i18nEntity.setLabel8(label); + break; + } + + } +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelDto.java index ac89343..f5550e1 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelDto.java @@ -2,6 +2,8 @@ package fr.ird.observe.services.dto.referential; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; +import fr.ird.observe.services.dto.constants.ReferentialLocale; import java.io.Serializable; @@ -9,15 +11,40 @@ public class ReferentialLabelDto<R extends ReferentialDto> extends AbstractRefer private static final long serialVersionUID = 1L; + public static final String PROPERTY_LABEL = "label"; + protected final Class<R> type; protected final ImmutableList<String> labelPropertyNames; protected final Serializable[] labelPropertyValues; - public ReferentialLabelDto(Class<R> type, String... labelPropertyNames) { + public static final ImmutableSet<String> I18N_PROPERTY_NAMES = ImmutableSet.of( + I18nReferentialDto.PROPERTY_LABEL1, + I18nReferentialDto.PROPERTY_LABEL2, + I18nReferentialDto.PROPERTY_LABEL3, + I18nReferentialDto.PROPERTY_LABEL4, + I18nReferentialDto.PROPERTY_LABEL5, + I18nReferentialDto.PROPERTY_LABEL6, + I18nReferentialDto.PROPERTY_LABEL7, + I18nReferentialDto.PROPERTY_LABEL8 + ); + + public ReferentialLabelDto(Class<R> type, ReferentialLocale referentialLocale, String... labelPropertyNames) { this.type = type; - this.labelPropertyNames = ImmutableList.copyOf(labelPropertyNames); + String libelle = referentialLocale.getLibelle(); + ImmutableList.Builder<String> labelPropertyNamesBuilder = new ImmutableList.Builder<>(); + for (String labelPropertyName : labelPropertyNames) { + if (I18N_PROPERTY_NAMES.contains(labelPropertyName)) { + if (libelle.endsWith(labelPropertyName)) { + labelPropertyName = PROPERTY_LABEL; + } else { + continue; + } + } + labelPropertyNamesBuilder.add(labelPropertyName); + } + this.labelPropertyNames = labelPropertyNamesBuilder.build(); this.labelPropertyValues = new Serializable[labelPropertyNames.length]; } @@ -34,14 +61,27 @@ public class ReferentialLabelDto<R extends ReferentialDto> extends AbstractRefer return labelPropertyNames; } - public void setLabelPropertyValue(String propertyName, Serializable propertyValue) { - int propertyIndex = getPropertyIndex(propertyName); - labelPropertyValues[propertyIndex] = propertyValue; + public void setLabelPropertyValue(ReferentialLocale referentialLocale, String propertyName, Serializable propertyValue) { + Preconditions.checkNotNull(referentialLocale, "referentialLocale parameter can't be null"); + Preconditions.checkNotNull(propertyName, "propertyName parameter can't be null"); + if (I18N_PROPERTY_NAMES.contains(propertyName)) { + if (referentialLocale.getLibelle().equals(propertyName)) { + propertyName = PROPERTY_LABEL; + } else { + propertyName = null; + } + } + if (propertyName != null) { + int propertyIndex = getPropertyIndex(propertyName); + labelPropertyValues[propertyIndex] = propertyValue; + } } protected int getPropertyIndex(String propertyName) { int index = labelPropertyNames.indexOf(propertyName); - Preconditions.checkArgument(index > -1, "Property " + propertyName + " not found for this label, " + labelPropertyNames); + if (index == -1) { + throw new ReferentielLabelValueNotFoundException(type, propertyName); + } return index; } } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelDtos.java index b914192..779b0fb 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelDtos.java @@ -1,6 +1,7 @@ package fr.ird.observe.services.dto.referential; import com.google.common.collect.ImmutableMap; +import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto; import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; @@ -128,21 +129,23 @@ public class ReferentialLabelDtos extends AbstractReferentialLabelDtos { } - public static <R extends ReferentialDto> ReferentialLabelDto<R> newReferentialLabelDto(Class<R> type) { + public static <R extends ReferentialDto> ReferentialLabelDto<R> newReferentialLabelDto(Class<R> type, ReferentialLocale referentialLocale) { String[] propertyNames = LABEL_PROPERTY_NAMES_MAPPING.get(type); - return new ReferentialLabelDto<>(type, propertyNames); + return new ReferentialLabelDto<>(type, referentialLocale, propertyNames); } - public static <R extends ReferentialDto> ReferentialLabelDto<R> newReferentialLabelDto(Class<R> type, Object source) { + public static <R extends ReferentialDto> ReferentialLabelDto<R> newReferentialLabelDto(Class<R> type, + ReferentialLocale referentialLocale, + Object source) { String[] propertyNames = LABEL_PROPERTY_NAMES_MAPPING.get(type); - ReferentialLabelDto<R> dto = new ReferentialLabelDto<>(type, propertyNames); + ReferentialLabelDto<R> dto = new ReferentialLabelDto<>(type, referentialLocale, propertyNames); Binder binder = BinderFactory.newBinder(source.getClass()); Map<String, Object> properties = binder.obtainProperties(source, propertyNames); for (Map.Entry<String, Object> entry : properties.entrySet()) { String propertyName = entry.getKey(); Object propertyValue = entry.getValue(); - dto.setLabelPropertyValue(propertyName, (Serializable) propertyValue); + dto.setLabelPropertyValue(referentialLocale, propertyName, (Serializable) propertyValue); } return dto; } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentielLabelValueNotFoundException.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentielLabelValueNotFoundException.java new file mode 100644 index 0000000..6a2f092 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentielLabelValueNotFoundException.java @@ -0,0 +1,27 @@ +package fr.ird.observe.services.dto.referential; + +/** + * Created on 18/08/15. + * + * @author Tony Chemit - chemit(a)codelutin.com + */ +public class ReferentielLabelValueNotFoundException extends RuntimeException { + + private static final long serialVersionUID = 1L; + + protected final Class<? extends ReferentialDto> dtoType; + protected final String propertyName; + + public ReferentielLabelValueNotFoundException(Class<? extends ReferentialDto> dtoType, String propertyName) { + this.dtoType = dtoType; + this.propertyName = propertyName; + } + + public String getPropertyName() { + return propertyName; + } + + public Class<? extends ReferentialDto> getDtoType() { + return dtoType; + } +} diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceContextRest.java b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceContextRest.java index 51c1e70..d9efbdf 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceContextRest.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceContextRest.java @@ -1,5 +1,7 @@ package fr.ird.observe.services; +import fr.ird.observe.services.dto.constants.ReferentialLocale; + /** * Created on 16/08/15. * @@ -7,4 +9,14 @@ package fr.ird.observe.services; */ public class ObserveServiceContextRest implements ObserveServiceContext { + protected ReferentialLocale referentialLocale; + + @Override + public ReferentialLocale getReferentialLocale() { + return referentialLocale; + } + + public void setReferentialLocale(ReferentialLocale referentialLocale) { + this.referentialLocale = referentialLocale; + } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java index 474607e..587b9ae 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceContextTopia.java @@ -1,6 +1,7 @@ package fr.ird.observe.services; import fr.ird.observe.db.DataSource; +import fr.ird.observe.services.dto.constants.ReferentialLocale; import org.nuiton.topia.TopiaContext; /** @@ -14,6 +15,8 @@ public class ObserveServiceContextTopia implements ObserveServiceContext { protected TopiaContext transaction; + protected ReferentialLocale referentialLocale; + public DataSource getDataSource() { return dataSource; } @@ -30,4 +33,13 @@ public class ObserveServiceContextTopia implements ObserveServiceContext { this.transaction = transaction; } + @Override + public ReferentialLocale getReferentialLocale() { + return referentialLocale; + } + + public void setReferentialLocale(ReferentialLocale referentialLocale) { + this.referentialLocale = referentialLocale; + } + } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java index bf9ccb0..10d7157 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialDtoBuilder.java @@ -6,6 +6,7 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.entities.constants.GearType; import fr.ird.observe.entities.constants.ReferenceStatus; import fr.ird.observe.entities.constants.seine.NonTargetCatchComputedValueSource; +import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.constants.seine.Ownership; import fr.ird.observe.services.dto.constants.seine.SchoolType; import fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation; @@ -31,6 +32,8 @@ public class ReferentialDtoBuilder<M extends ReferentialDto> implements Closeabl private M result; + private final ReferentialLocale referentialLocale; + private ImmutableMap.Builder<String, Object> valuesBuilder; private Binder<M, M> binder; @@ -39,7 +42,7 @@ public class ReferentialDtoBuilder<M extends ReferentialDto> implements Closeabl private ImmutableSet.Builder<Class<? extends ReferentialDto>> referentialDtoTypesBuilder; - public static <M extends ReferentialDto> ReferentialDtoBuilder<M> create(Class<M> modelType) { + public static <M extends ReferentialDto> ReferentialDtoBuilder<M> create(Class<M> modelType, ReferentialLocale referentialLocale) { Preconditions.checkNotNull(modelType, "modelType can't be null."); M result; @@ -48,7 +51,7 @@ public class ReferentialDtoBuilder<M extends ReferentialDto> implements Closeabl } catch (InstantiationException | IllegalAccessException e) { throw new IllegalStateException("Could not instanciate model of type: " + modelType.getName()); } - ReferentialDtoBuilder<M> visitor = new ReferentialDtoBuilder<>(result); + ReferentialDtoBuilder<M> visitor = new ReferentialDtoBuilder<>(result, referentialLocale); return visitor; } @@ -69,8 +72,9 @@ public class ReferentialDtoBuilder<M extends ReferentialDto> implements Closeabl return referentialDtoTypesBuilder.build(); } - protected ReferentialDtoBuilder(M result) { + protected ReferentialDtoBuilder(M result, ReferentialLocale referentialLocale) { this.result = result; + this.referentialLocale = referentialLocale; this.binder = (Binder<M, M>) BinderFactory.newBinder(result.getClass()); this.valuesBuilder = new ImmutableMap.Builder<>(); this.visitor = new ToModelVisitor(); @@ -119,7 +123,7 @@ public class ReferentialDtoBuilder<M extends ReferentialDto> implements Closeabl protected <R extends ReferentialDto> ReferentialLabelDto<R> entityToRef(Class<R> dtoType, TopiaEntity entityValue) { referentialDtoTypesBuilder.add(dtoType); - ReferentialLabelDto<R> label = ReferentialLabelDtos.newReferentialLabelDto(dtoType, entityValue); + ReferentialLabelDto<R> label = ReferentialLabelDtos.newReferentialLabelDto(dtoType, referentialLocale, entityValue); label.setId(entityValue.getTopiaId()); return label; 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 4214bf6..33518d8 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 @@ -232,7 +232,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe List<TopiaEntity> entities = loadEntities(entityType); LinkedHashSet<ReferentialLabelDto<D>> labels = new LinkedHashSet<>(); for (TopiaEntity entity : entities) { - ReferentialLabelDto<D> dto = ReferentialLabelDtos.newReferentialLabelDto(dtoType, entity); + ReferentialLabelDto<D> dto = ReferentialLabelDtos.newReferentialLabelDto(dtoType, serviceContext.getReferentialLocale(), entity); labels.add(dto); } ReferentialLabelSetDto labelSetDto = ReferentialLabelSetDtos.newReferentialLabelSetDto(dtoType, labels); @@ -324,7 +324,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe } protected <D extends ReferentialDto> FormDto<D> entityToReferentialFormDto(Class<D> dtoType, TopiaEntity entity) { - try (ReferentialDtoBuilder<D> dtoBuilder = ReferentialDtoBuilder.create(dtoType)) { + try (ReferentialDtoBuilder<D> dtoBuilder = ReferentialDtoBuilder.create(dtoType, serviceContext.getReferentialLocale())) { // copy entity dtoBuilder.copyEntity(entity); diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java index a0fb4e6..5c1dcb4 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialDtoBuilderTest.java @@ -6,7 +6,12 @@ import fr.ird.observe.entities.referentiel.Organism; import fr.ird.observe.entities.referentiel.OrganismImpl; import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.entities.referentiel.ProgramImpl; +import fr.ird.observe.services.dto.constants.ReferentialLocale; +import fr.ird.observe.services.dto.referential.I18nReferentialDto; import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.ReferentialLabelDto; +import fr.ird.observe.services.dto.referential.ReferentielLabelValueNotFoundException; import org.junit.Assert; import org.junit.Test; import org.nuiton.util.DateUtil; @@ -51,33 +56,53 @@ public class ReferentialDtoBuilderTest { organism.setCode("organismCode"); program.setOrganism(organism); - ReferentialDtoBuilder<ProgramDto> builder = ReferentialDtoBuilder.create(ProgramDto.class); + ReferentialDtoBuilder<ProgramDto> builder = ReferentialDtoBuilder.create(ProgramDto.class, ReferentialLocale.FR); builder.copyEntity(program); - ProgramDto programModel = builder.build(); + ProgramDto programDto = builder.build(); - Assert.assertEquals(program.getCode(), programModel.getCode()); - Assert.assertEquals(program.isNeedComment(), programModel.isNeedComment()); - Assert.assertNotNull(programModel.getStatus()); - Assert.assertEquals(program.getStatus().name(), programModel.getStatus().name()); + Assert.assertEquals(program.getCode(), programDto.getCode()); + Assert.assertEquals(program.isNeedComment(), programDto.isNeedComment()); + Assert.assertNotNull(programDto.getStatus()); + Assert.assertEquals(program.getStatus().name(), programDto.getStatus().name()); - Assert.assertEquals(program.getLabel1(), programModel.getLabel1()); - Assert.assertEquals(program.getLabel2(), programModel.getLabel2()); - Assert.assertEquals(program.getLabel3(), programModel.getLabel3()); - Assert.assertEquals(program.getLabel4(), programModel.getLabel4()); - Assert.assertEquals(program.getLabel5(), programModel.getLabel5()); - Assert.assertEquals(program.getLabel6(), programModel.getLabel6()); - Assert.assertEquals(program.getLabel7(), programModel.getLabel7()); - Assert.assertEquals(program.getLabel8(), programModel.getLabel8()); - Assert.assertEquals(program.getTopiaId(), programModel.getId()); - Assert.assertNotNull(programModel.getGearType()); - Assert.assertEquals(program.getGearType().name(), programModel.getGearType().name()); - Assert.assertEquals(program.getTargetDiscardsObservation(), programModel.getTargetDiscardsObservation()); - Assert.assertNotNull(programModel.getOrganism()); - Assert.assertEquals(program.getOrganism().getTopiaId(), programModel.getOrganism().getId()); - Assert.assertEquals(program.getOrganism().getCode(), programModel.getOrganism().getLabelPropertyValue("code")); - Assert.assertEquals(program.getOrganism().getLabel1(), programModel.getOrganism().getLabelPropertyValue("label1")); - Assert.assertEquals(program.getOrganism().getLabel2(), programModel.getOrganism().getLabelPropertyValue("label2")); - Assert.assertEquals(program.getOrganism().getLabel3(), programModel.getOrganism().getLabelPropertyValue("label3")); + Assert.assertEquals(program.getLabel1(), programDto.getLabel1()); + Assert.assertEquals(program.getLabel2(), programDto.getLabel2()); + Assert.assertEquals(program.getLabel3(), programDto.getLabel3()); + Assert.assertEquals(program.getLabel4(), programDto.getLabel4()); + Assert.assertEquals(program.getLabel5(), programDto.getLabel5()); + Assert.assertEquals(program.getLabel6(), programDto.getLabel6()); + Assert.assertEquals(program.getLabel7(), programDto.getLabel7()); + Assert.assertEquals(program.getLabel8(), programDto.getLabel8()); + Assert.assertEquals(program.getTopiaId(), programDto.getId()); + Assert.assertNotNull(programDto.getGearType()); + Assert.assertEquals(program.getGearType().name(), programDto.getGearType().name()); + Assert.assertEquals(program.getTargetDiscardsObservation(), programDto.getTargetDiscardsObservation()); + + ReferentialLabelDto organismDto = programDto.getOrganism(); + Assert.assertNotNull(organismDto); + Assert.assertEquals(organism.getTopiaId(), organismDto.getId()); + Assert.assertEquals(organism.getCode(), organismDto.getLabelPropertyValue(ReferentialDto.PROPERTY_CODE)); + Assert.assertEquals(organism.getLabel2(), organismDto.getLabelPropertyValue(ReferentialLabelDto.PROPERTY_LABEL)); + + assertPropertyNameDoesNotFound(organismDto, I18nReferentialDto.PROPERTY_LABEL1); + assertPropertyNameDoesNotFound(organismDto, I18nReferentialDto.PROPERTY_LABEL2); + assertPropertyNameDoesNotFound(organismDto, I18nReferentialDto.PROPERTY_LABEL3); + assertPropertyNameDoesNotFound(organismDto, I18nReferentialDto.PROPERTY_LABEL4); + assertPropertyNameDoesNotFound(organismDto, I18nReferentialDto.PROPERTY_LABEL5); + assertPropertyNameDoesNotFound(organismDto, I18nReferentialDto.PROPERTY_LABEL6); + assertPropertyNameDoesNotFound(organismDto, I18nReferentialDto.PROPERTY_LABEL7); + assertPropertyNameDoesNotFound(organismDto, I18nReferentialDto.PROPERTY_LABEL8); + + } + + protected void assertPropertyNameDoesNotFound(ReferentialLabelDto dto, String propertyName) { + + try { + dto.getLabelPropertyValue(propertyName); + Assert.fail(); + } catch (ReferentielLabelValueNotFoundException e) { + Assert.assertTrue(true); + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

16/50: on desactive pour le moment le module rest)
by codelutin.com scm 20 Aug '15

20 Aug '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit fe6cdca8f7d7b60c23345c4a518705e88f8b7421 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 11:07:32 2015 +0200 on desactive pour le moment le module rest) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f055b2b..4d18ca8 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ <module>observe-business</module> <module>observe-validation</module> <module>observe-services-topia</module> - <module>observe-services-rest</module> +  <module>observe-swing</module> </modules> <!--scm> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0