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 6f6346e068dca2ad0040e7d392b475dd26b1c13f Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 17 16:12:45 2015 +0200 Renommage en dto + génération du modèle Longline --- .../services/service/ReferentialService.java | 6 +-- observe-services-model/pom.xml | 12 +++--- .../{model => dto}/AbstractObserveDto.java | 2 +- .../{model => dto}/constants/GearType.java | 2 +- .../{model => dto}/constants/ReferenceStatus.java | 2 +- .../referential/ReferentialFormDto.java | 2 +- .../referential/ReferentialFormDtos.java | 2 +- .../xmi/observe-services-dto-common.properties | 13 ++++++ ...mon.zargo => observe-services-dto-common.zargo} | Bin 32880 -> 32764 bytes .../xmi/observe-services-dto-longline.properties | 11 ++++++ .../main/xmi/observe-services-dto-longline.zargo | Bin 0 -> 69590 bytes .../main/xmi/observe-services-dto-seine.properties | 5 ++- .../xmi/observe-services-model-common.properties | 13 ------ .../xmi/observe-services-model-longline.properties | 7 ---- .../main/xmi/observe-services-model-longline.zargo | Bin 96124 -> 0 bytes .../services/service/ReferentialServiceRest.java | 6 +-- .../referential/ReferentialServiceRestTest.java | 4 +- .../services/service/ReferentialDtoBuilder.java | 10 ++--- .../services/service/ReferentialServiceTopia.java | 44 ++++++++++----------- .../service/ReferentialDtoBuilderTest.java | 2 +- .../referential/ReferentialServiceTopiaTest.java | 4 +- 21 files changed, 76 insertions(+), 71 deletions(-) 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 5225689..adf5ea2 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 @@ -1,9 +1,9 @@ package fr.ird.observe.services.service; import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.model.referential.ReferentialDto; -import fr.ird.observe.services.model.referential.ReferentialFormDto; -import fr.ird.observe.services.model.referential.ReferentialLabelSetDto; +import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.ReferentialFormDto; +import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; import fr.ird.observe.services.spi.Write; import java.util.Collection; diff --git a/observe-services-model/pom.xml b/observe-services-model/pom.xml index d4960b7..7d73d8d 100644 --- a/observe-services-model/pom.xml +++ b/observe-services-model/pom.xml @@ -98,18 +98,18 @@ <groupId>org.nuiton.eugene</groupId> <artifactId>eugene-maven-plugin</artifactId> <configuration> - <defaultPackage>fr.ird.observe.services.model</defaultPackage> - <fullPackagePath>fr.ird.observe.services.model</fullPackagePath> + <defaultPackage>fr.ird.observe.services.dto</defaultPackage> + <fullPackagePath>fr.ird.observe.services.dto</fullPackagePath> </configuration> <executions> <execution> <phase>generate-sources</phase> - <id>generate-services-model</id> + <id>generate-services-dto</id> <configuration> <inputs> - <input>zargo:src/main/xmi:observe-services-model-common.zargo</input> - <!--<input>zargo:src/main/xmi:observe-services-dto-seine.zargo</input>--> - <!--<input>zargo:src/main/xmi:observe-services-model-longline.zargo</input>--> + <input>zargo:src/main/xmi:observe-services-dto-common.zargo</input> + <!--<input>zargo:src/main/xmi:observe-services-model-seine.zargo</input>--> + <input>zargo:src/main/xmi:observe-services-dto-longline.zargo</input> </inputs> <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> <templates>org.nuiton.eugene.java.SimpleJavaBeanWithNoInterfaceTransformer</templates> diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/model/AbstractObserveDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/AbstractObserveDto.java similarity index 95% rename from observe-services-model/src/main/java/fr/ird/observe/services/model/AbstractObserveDto.java rename to observe-services-model/src/main/java/fr/ird/observe/services/dto/AbstractObserveDto.java index 5046273..8b1159f 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/model/AbstractObserveDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/AbstractObserveDto.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.model; +package fr.ird.observe.services.dto; import org.jdesktop.beans.AbstractSerializableBean; import org.nuiton.jaxx.application.bean.JavaBeanObject; diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/model/constants/GearType.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/GearType.java similarity index 96% rename from observe-services-model/src/main/java/fr/ird/observe/services/model/constants/GearType.java rename to observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/GearType.java index d0521ed..f32ddd8 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/model/constants/GearType.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/GearType.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.model.constants; +package fr.ird.observe.services.dto.constants; /* * #%L diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/model/constants/ReferenceStatus.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferenceStatus.java similarity index 85% rename from observe-services-model/src/main/java/fr/ird/observe/services/model/constants/ReferenceStatus.java rename to observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferenceStatus.java index e64610d..a9d1396 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/model/constants/ReferenceStatus.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/ReferenceStatus.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.model.constants; +package fr.ird.observe.services.dto.constants; /** * Une énumération pour caractériser les valeurs des status d'une entité du diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialFormDto.java similarity index 93% rename from observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormDto.java rename to observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialFormDto.java index d9155fb..41f4c78 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialFormDto.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.model.referential; +package fr.ird.observe.services.dto.referential; import com.google.common.base.Preconditions; diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialFormDtos.java similarity index 88% rename from observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormDtos.java rename to observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialFormDtos.java index 015d758..edfa012 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/model/referential/ReferentialFormDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialFormDtos.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.model.referential; +package fr.ird.observe.services.dto.referential; /** * Created on 17/08/15. diff --git a/observe-services-model/src/main/xmi/observe-services-dto-common.properties b/observe-services-model/src/main/xmi/observe-services-dto-common.properties new file mode 100644 index 0000000..e52b903 --- /dev/null +++ b/observe-services-model/src/main/xmi/observe-services-dto-common.properties @@ -0,0 +1,13 @@ +model.tagvalue.version=7.0 + +model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.dto.AbstractObserveDto +model.tagvalue.simpleBeanWithNoInterfaceDefaultsClassNameSuffix=Dtos +model.tagvalue.simpleBeanWithNoInterfaceClassNameSuffix=Dto + +package.fr.ird.observe.services.dto.stereotype=bean + +fr.ird.observe.services.dto.referential.Gear.attribute.gearCaracteristic.stereotype=unique,ordered +fr.ird.observe.services.dto.referential.GearCaracteristic.attribute.gearCaracteristicType.stereotype=unique,ordered +fr.ird.observe.services.dto.referential.Species.attribute.ocean.stereotype=unique,ordered +fr.ird.observe.services.dto.referential.SpeciesList.attribute.species.stereotype=unique,ordered +fr.ird.observe.services.dto.referential.ReferentialLabelSet.attribute.referentialLabel.stereotype=unique,ordered diff --git a/observe-services-model/src/main/xmi/observe-services-model-common.zargo b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo similarity index 53% rename from observe-services-model/src/main/xmi/observe-services-model-common.zargo rename to observe-services-model/src/main/xmi/observe-services-dto-common.zargo index 1059307..6f3d041 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-model-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.properties b/observe-services-model/src/main/xmi/observe-services-dto-longline.properties new file mode 100644 index 0000000..956d883 --- /dev/null +++ b/observe-services-model/src/main/xmi/observe-services-dto-longline.properties @@ -0,0 +1,11 @@ +model.tagvalue.version=7.0 + +#TODO A supprimer quand on aura finaliser le modèle +#model.stereotype=acceptBeanWithMethods + +model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.dto.AbstractObserveDto +model.tagvalue.simpleBeanWithNoInterfaceDefaultsClassNameSuffix=Dtos +model.tagvalue.simpleBeanWithNoInterfaceClassNameSuffix=Dto + +package.fr.ird.observe.services.dto.longline.stereotype=bean +package.fr.ird.observe.services.dto.referential.longline.stereotype=bean 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 new file mode 100644 index 0000000..29c7608 Binary files /dev/null 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.properties b/observe-services-model/src/main/xmi/observe-services-dto-seine.properties index 3736c79..91a8475 100644 --- a/observe-services-model/src/main/xmi/observe-services-dto-seine.properties +++ b/observe-services-model/src/main/xmi/observe-services-dto-seine.properties @@ -1,7 +1,8 @@ model.tagvalue.version=7.0 -model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.model.AbstractObserveDto +model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.dto.AbstractObserveDto model.tagvalue.simpleBeanWithNoInterfaceDefaultsClassNameSuffix=Dtos model.tagvalue.simpleBeanWithNoInterfaceClassNameSuffix=Dto -package.fr.ird.observe.services.model.stereotype=bean +package.fr.ird.observe.services.dto.referential.seine.stereotype=bean +package.fr.ird.observe.services.dto.seine.stereotype=bean diff --git a/observe-services-model/src/main/xmi/observe-services-model-common.properties b/observe-services-model/src/main/xmi/observe-services-model-common.properties deleted file mode 100644 index cbb0b5c..0000000 --- a/observe-services-model/src/main/xmi/observe-services-model-common.properties +++ /dev/null @@ -1,13 +0,0 @@ -model.tagvalue.version=7.0 - -model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.model.AbstractObserveDto -model.tagvalue.simpleBeanWithNoInterfaceDefaultsClassNameSuffix=Dtos -model.tagvalue.simpleBeanWithNoInterfaceClassNameSuffix=Dto - -package.fr.ird.observe.services.model.stereotype=bean - -fr.ird.observe.services.model.referential.Gear.attribute.gearCaracteristic.stereotype=unique,ordered -fr.ird.observe.services.model.referential.GearCaracteristic.attribute.gearCaracteristicType.stereotype=unique,ordered -fr.ird.observe.services.model.referential.Species.attribute.ocean.stereotype=unique,ordered -fr.ird.observe.services.model.referential.SpeciesList.attribute.species.stereotype=unique,ordered -fr.ird.observe.services.model.referential.ReferentialLabelSet.attribute.referentialLabel.stereotype=unique,ordered diff --git a/observe-services-model/src/main/xmi/observe-services-model-longline.properties b/observe-services-model/src/main/xmi/observe-services-model-longline.properties deleted file mode 100644 index 3736c79..0000000 --- a/observe-services-model/src/main/xmi/observe-services-model-longline.properties +++ /dev/null @@ -1,7 +0,0 @@ -model.tagvalue.version=7.0 - -model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.model.AbstractObserveDto -model.tagvalue.simpleBeanWithNoInterfaceDefaultsClassNameSuffix=Dtos -model.tagvalue.simpleBeanWithNoInterfaceClassNameSuffix=Dto - -package.fr.ird.observe.services.model.stereotype=bean diff --git a/observe-services-model/src/main/xmi/observe-services-model-longline.zargo b/observe-services-model/src/main/xmi/observe-services-model-longline.zargo deleted file mode 100644 index 8e1e2ab..0000000 Binary files a/observe-services-model/src/main/xmi/observe-services-model-longline.zargo and /dev/null differ diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/service/ReferentialServiceRest.java b/observe-services-rest/src/main/java/fr/ird/observe/services/service/ReferentialServiceRest.java index e00ae53..1cee057 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/service/ReferentialServiceRest.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/service/ReferentialServiceRest.java @@ -2,9 +2,9 @@ package fr.ird.observe.services.service; import fr.ird.observe.services.ObserveServiceContext; import fr.ird.observe.services.ObserveServiceRest; -import fr.ird.observe.services.model.referential.ReferentialDto; -import fr.ird.observe.services.model.referential.ReferentialFormDto; -import fr.ird.observe.services.model.referential.ReferentialLabelSetDto; +import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.ReferentialFormDto; +import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; import java.util.Collection; diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/referential/ReferentialServiceRestTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/referential/ReferentialServiceRestTest.java index f870be7..9aa09e7 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/service/referential/ReferentialServiceRestTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/referential/ReferentialServiceRestTest.java @@ -2,8 +2,8 @@ package fr.ird.observe.services.service.referential; import fr.ird.observe.services.ObserveServiceContextRest; import fr.ird.observe.services.ObserveServiceMainFactory; -import fr.ird.observe.services.model.referential.ReferentialLabelSetDto; -import fr.ird.observe.services.model.referential.SexDto; +import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; +import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.service.ReferentialService; import org.junit.Assert; import org.junit.Before; 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 c95b04d..af01306 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 @@ -5,9 +5,9 @@ import com.google.common.collect.ImmutableMap; import fr.ird.observe.entities.constants.GearType; import fr.ird.observe.entities.constants.ReferenceStatus; import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.services.model.referential.ReferentialDto; -import fr.ird.observe.services.model.referential.ReferentialLabelDto; -import fr.ird.observe.services.model.referential.ReferentialLabelDtos; +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.nuiton.topia.persistence.EntityVisitor; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.beans.Binder; @@ -73,12 +73,12 @@ public class ReferentialDtoBuilder<M extends ReferentialDto> implements Closeabl } else if (Program.PROPERTY_GEAR_TYPE.equals(propertyName)) { GearType entityGearType = (GearType) propertyValue; - propertyValue = fr.ird.observe.services.model.constants.GearType.valueOf(entityGearType.name()); + propertyValue = fr.ird.observe.services.dto.constants.GearType.valueOf(entityGearType.name()); } else if (Program.PROPERTY_STATUS.equals(propertyName)) { ReferenceStatus entityGearType = (ReferenceStatus) propertyValue; - propertyValue = fr.ird.observe.services.model.constants.ReferenceStatus.valueOf(entityGearType.name()); + propertyValue = fr.ird.observe.services.dto.constants.ReferenceStatus.valueOf(entityGearType.name()); } 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 fd3a7f1..2be2542 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 @@ -20,28 +20,28 @@ import fr.ird.observe.entities.referentiel.Vessel; import fr.ird.observe.entities.referentiel.VesselSizeCategory; import fr.ird.observe.entities.referentiel.VesselType; import fr.ird.observe.services.ObserveServiceTopia; -import fr.ird.observe.services.model.referential.CountryDto; -import fr.ird.observe.services.model.referential.FpaZoneDto; -import fr.ird.observe.services.model.referential.GearCaracteristicDto; -import fr.ird.observe.services.model.referential.GearCaracteristicTypeDto; -import fr.ird.observe.services.model.referential.GearDto; -import fr.ird.observe.services.model.referential.HarbourDto; -import fr.ird.observe.services.model.referential.LengthWeightParameterDto; -import fr.ird.observe.services.model.referential.OceanDto; -import fr.ird.observe.services.model.referential.OrganismDto; -import fr.ird.observe.services.model.referential.PersonDto; -import fr.ird.observe.services.model.referential.ProgramDto; -import fr.ird.observe.services.model.referential.ReferentialDto; -import fr.ird.observe.services.model.referential.ReferentialFormDto; -import fr.ird.observe.services.model.referential.ReferentialFormDtos; -import fr.ird.observe.services.model.referential.ReferentialLabelSetDto; -import fr.ird.observe.services.model.referential.SexDto; -import fr.ird.observe.services.model.referential.SpeciesDto; -import fr.ird.observe.services.model.referential.SpeciesGroupDto; -import fr.ird.observe.services.model.referential.SpeciesListDto; -import fr.ird.observe.services.model.referential.VesselDto; -import fr.ird.observe.services.model.referential.VesselSizeCategoryDto; -import fr.ird.observe.services.model.referential.VesselTypeDto; +import fr.ird.observe.services.dto.referential.CountryDto; +import fr.ird.observe.services.dto.referential.FpaZoneDto; +import fr.ird.observe.services.dto.referential.GearCaracteristicDto; +import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDto; +import fr.ird.observe.services.dto.referential.GearDto; +import fr.ird.observe.services.dto.referential.HarbourDto; +import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; +import fr.ird.observe.services.dto.referential.OceanDto; +import fr.ird.observe.services.dto.referential.OrganismDto; +import fr.ird.observe.services.dto.referential.PersonDto; +import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.ReferentialFormDto; +import fr.ird.observe.services.dto.referential.ReferentialFormDtos; +import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; +import fr.ird.observe.services.dto.referential.SexDto; +import fr.ird.observe.services.dto.referential.SpeciesDto; +import fr.ird.observe.services.dto.referential.SpeciesGroupDto; +import fr.ird.observe.services.dto.referential.SpeciesListDto; +import fr.ird.observe.services.dto.referential.VesselDto; +import fr.ird.observe.services.dto.referential.VesselSizeCategoryDto; +import fr.ird.observe.services.dto.referential.VesselTypeDto; import org.nuiton.topia.persistence.TopiaEntity; import java.util.Collection; 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 9a4d45b..fd708fa 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,7 @@ 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.model.referential.ProgramDto; +import fr.ird.observe.services.dto.referential.ProgramDto; import org.junit.Assert; import org.junit.Test; import org.nuiton.util.DateUtil; diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/referential/ReferentialServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/referential/ReferentialServiceTopiaTest.java index 3ae5f96..4ed8565 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/referential/ReferentialServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/referential/ReferentialServiceTopiaTest.java @@ -2,8 +2,8 @@ package fr.ird.observe.services.service.referential; import fr.ird.observe.services.ObserveServiceContextTopia; import fr.ird.observe.services.ObserveServiceMainFactory; -import fr.ird.observe.services.model.referential.ReferentialLabelSetDto; -import fr.ird.observe.services.model.referential.SexDto; +import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; +import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.service.ReferentialService; import org.junit.Assert; import org.junit.Before; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.