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

15/50: Premiers tests pour ReferentialServiceTopia
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 8683d266283c84244fde46a57b5693f6f2cd7534 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 10:57:13 2015 +0200 Premiers tests pour ReferentialServiceTopia --- observe-services-topia/pom.xml | 7 ++ .../services/ObserveServiceFactoryTopia.java | 3 +- .../services/service/ReferentialServiceTopia.java | 132 +++++++++++++++------ .../service/ApplicationContextResource.java | 75 ++++++++++++ .../services/service/DataSourceResource.java | 126 ++++++++++++++++++++ .../service/ReferentialServiceTopiaTest.java | 47 +++++++- 6 files changed, 347 insertions(+), 43 deletions(-) diff --git a/observe-services-topia/pom.xml b/observe-services-topia/pom.xml index 67df2d2..cdab983 100644 --- a/observe-services-topia/pom.xml +++ b/observe-services-topia/pom.xml @@ -39,6 +39,13 @@ <version>${project.version}</version> </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-business</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + </dependency> +  diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java index b3aad6f..eedb4e4 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceFactoryTopia.java @@ -83,8 +83,7 @@ public class ObserveServiceFactoryTopia extends ObserveServiceFactorySupport { Object result; - if (serviceContext.getDataSource() == null /* FIXME Supprimer ce test dès qu'on aura une ds dans le context */ - || methodNamesToByPass.contains(method.getName()) + if (methodNamesToByPass.contains(method.getName()) || method.isAnnotationPresent(NoDataAccess.class)) { result = invokeMethod(method, args); 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 4916b1c..4214bf6 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 @@ -2,6 +2,7 @@ package fr.ird.observe.services.service; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import fr.ird.observe.ObserveDAOHelper; import fr.ird.observe.entities.referentiel.Country; import fr.ird.observe.entities.referentiel.FpaZone; import fr.ird.observe.entities.referentiel.Gear; @@ -76,7 +77,10 @@ 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.ReferentialLabelDto; +import fr.ird.observe.services.dto.referential.ReferentialLabelDtos; import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; +import fr.ird.observe.services.dto.referential.ReferentialLabelSetDtos; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesGroupDto; @@ -125,9 +129,14 @@ 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.nuiton.topia.TopiaContext; +import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.List; import java.util.Map; import java.util.Set; @@ -139,40 +148,41 @@ import java.util.Set; public class ReferentialServiceTopia extends ObserveServiceTopia implements ReferentialService { protected static final ImmutableMap<Class<?>, Class<?>> entityToModelTypeCache = new ImmutableMap.Builder<Class<?>, Class<?>>() - .put(VesselSizeCategory.class, VesselSizeCategoryDto.class) + .put(Country.class, CountryDto.class) - .put(Harbour.class, HarbourDto.class) - .put(VesselType.class, VesselTypeDto.class) - .put(Vessel.class, VesselDto.class) - .put(SpeciesGroup.class, SpeciesGroupDto.class) - .put(Species.class, SpeciesDto.class) - .put(Sex.class, SexDto.class) .put(FpaZone.class, FpaZoneDto.class) - .put(SpeciesList.class, SpeciesListDto.class) - .put(Person.class, PersonDto.class) + .put(GearCaracteristic.class, GearCaracteristicDto.class) + .put(GearCaracteristicType.class, GearCaracteristicTypeDto.class) + .put(Gear.class, GearDto.class) + .put(Harbour.class, HarbourDto.class) + .put(LengthWeightParameter.class, LengthWeightParameterDto.class) .put(Ocean.class, OceanDto.class) .put(Organism.class, OrganismDto.class) - .put(LengthWeightParameter.class, LengthWeightParameterDto.class) + .put(Person.class, PersonDto.class) .put(Program.class, ProgramDto.class) - .put(GearCaracteristicType.class, GearCaracteristicTypeDto.class) - .put(GearCaracteristic.class, GearCaracteristicDto.class) - .put(Gear.class, GearDto.class) + .put(Sex.class, SexDto.class) + .put(Species.class, SpeciesDto.class) + .put(SpeciesGroup.class, SpeciesGroupDto.class) + .put(SpeciesList.class, SpeciesListDto.class) + .put(Vessel.class, VesselDto.class) + .put(VesselSizeCategory.class, VesselSizeCategoryDto.class) + .put(VesselType.class, VesselTypeDto.class) - .put(VesselActivitySeine.class, VesselActivitySeineDto.class) - .put(SurroundingActivity.class, SurroundingActivityDto.class) - .put(ReasonForNullSet.class, ReasonForNullSetDto.class) - .put(ReasonForNoFishing.class, ReasonForNoFishingDto.class) - .put(SpeciesFate.class, SpeciesFateDto.class) - .put(ObjectFate.class, ObjectFateDto.class) - .put(WeightCategory.class, WeightCategoryDto.class) .put(DetectionMode.class, DetectionModeDto.class) - .put(TransmittingBuoyOperation.class, TransmittingBuoyOperationDto.class) + .put(ObjectFate.class, ObjectFateDto.class) .put(ObjectOperation.class, ObjectOperationDto.class) + .put(ObjectType.class, ObjectTypeDto.class) + .put(ObservedSystem.class, ObservedSystemDto.class) .put(ReasonForDiscard.class, ReasonForDiscardDto.class) + .put(ReasonForNoFishing.class, ReasonForNoFishingDto.class) + .put(ReasonForNullSet.class, ReasonForNullSetDto.class) + .put(SpeciesFate.class, SpeciesFateDto.class) .put(SpeciesStatus.class, SpeciesStatusDto.class) - .put(ObservedSystem.class, ObservedSystemDto.class) + .put(SurroundingActivity.class, SurroundingActivityDto.class) + .put(TransmittingBuoyOperation.class, TransmittingBuoyOperationDto.class) .put(TransmittingBuoyType.class, TransmittingBuoyTypeDto.class) - .put(ObjectType.class, ObjectTypeDto.class) + .put(VesselActivitySeine.class, VesselActivitySeineDto.class) + .put(WeightCategory.class, WeightCategoryDto.class) .put(Wind.class, WindDto.class) .put(BaitHaulingStatus.class, BaitHaulingStatusDto.class) @@ -184,8 +194,8 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe .put(HookPosition.class, HookPositionDto.class) .put(HookSize.class, HookSizeDto.class) .put(HookType.class, HookTypeDto.class) - .put(ItemVerticalPosition.class, ItemVerticalPositionDto.class) .put(ItemHorizontalPosition.class, ItemHorizontalPositionDto.class) + .put(ItemVerticalPosition.class, ItemVerticalPositionDto.class) .put(LightsticksColor.class, LightsticksColorDto.class) .put(LightsticksType.class, LightsticksTypeDto.class) .put(LineType.class, LineTypeDto.class) @@ -218,14 +228,21 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe @Override public <D extends ReferentialDto> ReferentialLabelSetDto getReferentialLabelSet(Class<D> dtoType) { - Class<? extends TopiaEntity> entityType = getEntityType(dtoType); - return new ReferentialLabelSetDto(); + Class<TopiaEntity> entityType = getEntityType(dtoType); + List<TopiaEntity> entities = loadEntities(entityType); + LinkedHashSet<ReferentialLabelDto<D>> labels = new LinkedHashSet<>(); + for (TopiaEntity entity : entities) { + ReferentialLabelDto<D> dto = ReferentialLabelDtos.newReferentialLabelDto(dtoType, 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 = null; + TopiaEntity entity = loadEntity(entityType, id); FormDto<D> form = entityToReferentialFormDto(dtoType, entity); return form; } @@ -233,7 +250,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 = null; + TopiaEntity entity = loadEntity(entityType, id); FormDto<D> form = entityToReferentialFormDto(dtoType, entity); return form; } @@ -241,16 +258,18 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe @Override public <D extends ReferentialDto> FormDto<D> preCreate(Class<D> dtoType) { Class<? extends TopiaEntity> entityType = getEntityType(dtoType); - TopiaEntity entity = null; + 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); return form; } public <D extends ReferentialDto> String save(FormDto<D> form) { - Class<D> dtoType= form.getType(); + Class<D> dtoType = form.getType(); TopiaEntity entity = referentialDtoToEntity(form.getForm()); - // TODO Save + Class<TopiaEntity> entityType = getEntityType(dtoType); + entity = saveEntity(entityType, entity); FormDto<D> model = entityToReferentialFormDto(dtoType, entity); return model.getForm().getId(); } @@ -258,30 +277,69 @@ 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)); } @Override public <D extends ReferentialDto> void delete(Class<D> dtoType, Collection<String> ids) { Class<? extends TopiaEntity> entityType = getEntityType(dtoType); + deleteEntity(entityType, ids); + } + + protected <E extends TopiaEntity> List<E> loadEntities(Class<E> entityType) { + TopiaContext transaction = serviceContext.getTransaction(); + TopiaDAO<E> dao = ObserveDAOHelper.getDAO(transaction, entityType); + List<E> entities = dao.findAll(); + return entities; + } + + protected <E extends TopiaEntity> E loadEntity(Class<E> entityType, String id) { + TopiaContext transaction = serviceContext.getTransaction(); + TopiaDAO<E> dao = ObserveDAOHelper.getDAO(transaction, entityType); + E entity = dao.findByTopiaId(id); + return entity; + } + + protected <E extends TopiaEntity> E newEntity(Class<E> entityType) { + TopiaContext transaction = serviceContext.getTransaction(); + TopiaDAO<E> dao = ObserveDAOHelper.getDAO(transaction, entityType); + E entity = dao.newInstance(); + return entity; + } + protected <E extends TopiaEntity> E saveEntity(Class<E> entityType, E entity) { + TopiaContext transaction = serviceContext.getTransaction(); + TopiaDAO<E> dao = ObserveDAOHelper.getDAO(transaction, entityType); + entity = dao.update(entity); + return entity; + } + + protected <E extends TopiaEntity> void deleteEntity(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); + dao.delete(entity); + } } protected <D extends ReferentialDto> FormDto<D> entityToReferentialFormDto(Class<D> dtoType, TopiaEntity entity) { try (ReferentialDtoBuilder<D> dtoBuilder = ReferentialDtoBuilder.create(dtoType)) { + + // copy entity dtoBuilder.copyEntity(entity); D dto = dtoBuilder.build(); - Set<Class<? extends ReferentialDto>> referentialDtoTypes = dtoBuilder.getReferentialDtoTypes(); + // build label sets detected while copy + Set<Class<? extends ReferentialDto>> referentialDtoTypes = dtoBuilder.getReferentialDtoTypes(); ImmutableSet.Builder<ReferentialLabelSetDto> labels = new ImmutableSet.Builder<>(); for (Class<? extends ReferentialDto> referentialDtoType : referentialDtoTypes) { ReferentialLabelSetDto referentialLabelSet = getReferentialLabelSet(referentialDtoType); labels.add(referentialLabelSet); } FormDto<D> form = FormDtos.newFormDto(dtoType, dto, labels.build()); - form.setForm(dto); - return form; + } } @@ -293,12 +351,12 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe } protected <D extends ReferentialDto, E extends TopiaEntity> Class<E> getEntityType(Class<D> dtoType) { - Class<?> entityType = entityToModelTypeCache.get(dtoType); + Class<?> entityType = modelToEntityTypeCache.get(dtoType); return (Class<E>) entityType; } protected <E extends TopiaEntity, M extends ReferentialDto> Class<M> getDtoType(Class<E> entityType) { - Class<?> modelType = modelToEntityTypeCache.get(entityType); + Class<?> modelType = entityToModelTypeCache.get(entityType); return (Class<M>) modelType; } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/ApplicationContextResource.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ApplicationContextResource.java new file mode 100644 index 0000000..8b4cbcb --- /dev/null +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/ApplicationContextResource.java @@ -0,0 +1,75 @@ +package fr.ird.observe.services.service; + +import fr.ird.observe.IObserveConfig; +import fr.ird.observe.ObserveApplicationContext; +import fr.ird.observe.ObserveServiceHelper; +import fr.ird.observe.test.TestHelper; +import fr.ird.observe.util.Scripts; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.rules.TestRule; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; +import org.nuiton.util.version.Version; + +/** + * Created on 18/08/15. + * + * @author Tony Chemit - chemit(a)codelutin.com + */ +public class ApplicationContextResource implements TestRule { + + /** Logger. */ + private static final Log log = LogFactory.getLog(ApplicationContextResource.class); + + protected final Version databaseVersion; + + public ApplicationContextResource(Version databaseVersion) { + this.databaseVersion = databaseVersion; + } + + public String getScriptPath(String classifier) { + return Scripts.getBackupScript(databaseVersion, classifier); + } + + public ObserveApplicationContext getApplicationContext() { + return ObserveServiceHelper.get(); + } + + @Override + public Statement apply(final Statement base, final Description description) { + return new Statement() { + + @Override + public void evaluate() throws Throwable { + before(description); + try { + base.evaluate(); + } finally { + after(description); + } + } + }; + } + + protected void before(Description description) { + + Class<?> testClass = description.getTestClass(); + if (log.isDebugEnabled()) { + log.debug("Starts " + testClass.getName()); + } + TestHelper.initTest(testClass); + TestHelper.createApplicationContext(); + TestHelper.setConfig(IObserveConfig.DB_VERSION, databaseVersion.toString()); + + } + + protected void after(Description description) { + + Class<?> testClass = description.getTestClass(); + if (log.isDebugEnabled()) { + log.debug("Ends " + testClass.getName()); + } + + } +} diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceResource.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceResource.java new file mode 100644 index 0000000..e699a79 --- /dev/null +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceResource.java @@ -0,0 +1,126 @@ +package fr.ird.observe.services.service; + +import fr.ird.observe.ObserveTechnicalException; +import fr.ird.observe.db.DBTestHelper; +import fr.ird.observe.db.DataSource; +import fr.ird.observe.db.DataSourceException; +import fr.ird.observe.test.TestHelper; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.rules.TestRule; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; +import org.nuiton.topia.TopiaContext; + +import java.io.File; +import java.net.URL; +import java.util.LinkedHashMap; +import java.util.Map; + +/** + * Created on 18/08/15. + * + * @author Tony Chemit - chemit(a)codelutin.com + */ +public class DataSourceResource implements TestRule { + + /** Logger. */ + private static final Log log = LogFactory.getLog(DataSourceResource.class); + + protected final String dbPath; + + protected DataSource dataSource; + + protected Map<String, TopiaContext> transactions = new LinkedHashMap<>(); + + public DataSourceResource(String dbPath) { + this.dbPath = dbPath; + } + + public DataSource getDataSource() { + return dataSource; + } + + public TopiaContext newTransaction(String name) throws DataSourceException { + TopiaContext topiaContext = dataSource.beginTransaction(name); + transactions.put(name, topiaContext); + return topiaContext; + } + + public Statement apply(final Statement base, final Description description) { + return new Statement() { + + @Override + public void evaluate() throws Throwable { + before(description); + try { + base.evaluate(); + } finally { + after(description); + } + } + }; + } + + protected void before(Description description) throws Throwable { + + Class<?> testClass = description.getTestClass(); + String methodName = description.getMethodName(); + if (log.isDebugEnabled()) { + log.debug("Starts " + testClass.getName() + "::" + methodName); + } + + + URL dbUrl = getClass().getResource(dbPath); + + Assert.assertNotNull("could not find resource : " + dbPath, dbUrl); + + File localDbFile = TestHelper.newLocalDB(methodName); + + dataSource = DBTestHelper.createAndOpenFromDump( + localDbFile, + dbUrl, + false, + false, + true, + true, + true); + + + } + + protected void after(Description description) { + + Class<?> testClass = description.getTestClass(); + String methodName = description.getMethodName(); + if (log.isDebugEnabled()) { + log.debug("Ends " + testClass.getName() + "::" + methodName); + } + + if (dataSource != null && dataSource.isOpen()) { + + for (Map.Entry<String, TopiaContext> entry : transactions.entrySet()) { + TopiaContext topiaContext = entry.getValue(); + if (!topiaContext.isClosed()) { + String transactionKey = entry.getKey(); + try { + dataSource.closeTransaction(topiaContext, transactionKey); + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Could not close transaction: " + transactionKey, e); + } + } + } + } + + try { + dataSource.doClose(false); + } catch (DataSourceException e) { + throw new ObserveTechnicalException("Could not close datasource: " + dataSource, e); + } + } + + } + +} 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 b702093..4353ea7 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 @@ -1,12 +1,21 @@ package fr.ird.observe.services.service; +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.referential.ReferentialLabelSetDto; -import fr.ird.observe.services.dto.referential.SexDto; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Rule; import org.junit.Test; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.persistence.TopiaDAO; + +import java.util.Map; /** * Created on 16/08/15. @@ -15,21 +24,51 @@ import org.junit.Test; */ public class ReferentialServiceTopiaTest { + /** Logger. */ + private static final Log log = LogFactory.getLog(ReferentialServiceTopiaTest.class); + + @ClassRule + public static final ApplicationContextResource applicationContextResource = new ApplicationContextResource(H2DataSourceMigration.V_4_0); + + @Rule + public final DataSourceResource dataSourceResource = new DataSourceResource(applicationContextResource.getScriptPath("referentiel")); + protected ReferentialService service; @Before public void setUp() throws Exception { + DataSource localDataSource = dataSourceResource.getDataSource(); + ObserveServiceContextTopia context = new ObserveServiceContextTopia(); - service = ObserveServiceMainFactory.get().newService(context, ReferentialService.class); + context.setDataSource(localDataSource); + + ObserveServiceMainFactory serviceFactory = ObserveServiceMainFactory.get(); + service = serviceFactory.newService(context, ReferentialService.class); } @Test public void testGetReferentialLabelSet() throws Exception { - ReferentialLabelSetDto referentialLabelSet = service.getReferentialLabelSet(SexDto.class); - Assert.assertNotNull(referentialLabelSet); + TopiaContext tx = dataSourceResource.newTransaction("testGetReferentialLabelSet"); + + for (Map.Entry<Class<?>, Class<?>> entry : ReferentialServiceTopia.modelToEntityTypeCache.entrySet()) { + Class dtoType = entry.getKey(); + Class entityType = entry.getValue(); + + 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); + } + + ReferentialLabelSetDto referentialLabelSet = service.getReferentialLabelSet(dtoType); + Assert.assertNotNull(referentialLabelSet); + Assert.assertEquals(expectedCount, referentialLabelSet.sizeReferentialLabel()); + + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

14/50: Ajout dun premier binding pour les RTP
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 ad485d156bb9d1342776560332a118203a667593 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 10:56:36 2015 +0200 Ajout dun premier binding pour les RTP --- .../fr/ird/observe/services/dto/referential/ReferentialLabelDtos.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 176d9c0..b914192 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 @@ -67,7 +67,8 @@ public class ReferentialLabelDtos extends AbstractReferentialLabelDtos { .put(GearCaracteristicTypeDto.class, DEFAULT_PROPERTY_NAMES) .put(GearDto.class, DEFAULT_PROPERTY_NAMES) .put(HarbourDto.class, new String[]{ReferentialDto.PROPERTY_CODE, HarbourDto.PROPERTY_NAME, HarbourDto.PROPERTY_LOCODE}) - .put(LengthWeightParameterDto.class, new String[]{}) + // FIXME A revoir car on veut en fait ocean/libelle et species/scientificLabel + .put(LengthWeightParameterDto.class, new String[]{LengthWeightParameterDto.PROPERTY_SEX, LengthWeightParameterDto.PROPERTY_OCEAN, LengthWeightParameterDto.PROPERTY_SPECIES, LengthWeightParameterDto.PROPERTY_LENGTH_WEIGHT_FORMULA, LengthWeightParameterDto.PROPERTY_WEIGHT_LENGTH_FORMULA}) .put(OceanDto.class, DEFAULT_PROPERTY_NAMES) .put(OrganismDto.class, DEFAULT_PROPERTY_NAMES) .put(PersonDto.class, new String[]{PersonDto.PROPERTY_FIRST_NAME, PersonDto.PROPERTY_LAST_NAME}) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

13/50: typage du labelset
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 a7d0bd51fbe8e816aa62025cf3687fc2ba774b29 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 09:59:18 2015 +0200 typage du labelset --- .../dto/referential/ReferentialLabelSetDto.java | 17 +++++++++++++++++ .../dto/referential/ReferentialLabelSetDtos.java | 14 ++++++++++++++ .../services/service/ReferentialServiceRest.java | 2 +- 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelSetDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelSetDto.java new file mode 100644 index 0000000..2b8a45d --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelSetDto.java @@ -0,0 +1,17 @@ +package fr.ird.observe.services.dto.referential; + +public class ReferentialLabelSetDto<R extends ReferentialDto> extends AbstractReferentialLabelSetDto { + + private static final long serialVersionUID = 1L; + + protected final Class<R> type; + + public ReferentialLabelSetDto(Class<R> type) { + this.type = type; + } + + public Class<R> getType() { + return type; + } + +} 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 new file mode 100644 index 0000000..0baa167 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelSetDtos.java @@ -0,0 +1,14 @@ +package fr.ird.observe.services.dto.referential; + +import java.util.LinkedHashSet; + +public class ReferentialLabelSetDtos extends AbstractReferentialLabelSetDtos { + + public static <R extends ReferentialDto> ReferentialLabelSetDto<R> newReferentialLabelSetDto(Class<R> type, + LinkedHashSet<ReferentialLabelDto<R>> labels) { + ReferentialLabelSetDto<R> dto = new ReferentialLabelSetDto<>(type); + dto.setReferentialLabel((LinkedHashSet)labels); + return dto; + } + +} 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 d3d88e6..fe60d68 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 @@ -18,7 +18,7 @@ public class ReferentialServiceRest extends ObserveServiceRest implements Refere @Override public <R extends ReferentialDto> ReferentialLabelSetDto getReferentialLabelSet(Class<R> type) { - return new ReferentialLabelSetDto(); + return new ReferentialLabelSetDto(type); } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

12/50: add activitySeine Services (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 4086edc66eba55e764634f449f607d6830fc6388 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Aug 18 10:48:55 2015 +0200 add activitySeine Services (refs #7458). --- .../seine/ActivitySeineObservedSystemService.java | 19 ++++++++ .../service/seine/ActivitySeineService.java | 32 ++++++++++++++ .../src/main/xmi/observe-services-dto-seine.zargo | Bin 53974 -> 54561 bytes .../ActivitySeineObservedSystemServiceTopia.java | 29 ++++++++++++ .../service/seine/ActivitySeineServiceTopia.java | 49 +++++++++++++++++++++ 5 files changed, 129 insertions(+) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java new file mode 100644 index 0000000..c9ee23e --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java @@ -0,0 +1,19 @@ +package fr.ird.observe.services.service.seine; + +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; +import fr.ird.observe.services.spi.Write; + +/** + * @author Sylvain Bavencoff - bavencoff(a)codelutin.com + */ +public interface ActivitySeineObservedSystemService { + + FormDto<ActivitySeineObservedSystemDto> loadToRead(String activitySeineId); + + FormDto<ActivitySeineObservedSystemDto> loadToEdit(String activitySeineId); + + @Write + String save(FormDto<ActivitySeineObservedSystemDto> form); + +} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java new file mode 100644 index 0000000..9c46a5e --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java @@ -0,0 +1,32 @@ +package fr.ird.observe.services.service.seine; + +import fr.ird.observe.services.ObserveService; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.spi.Write; + +import java.util.Collection; +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff(a)codelutin.com + */ +public interface ActivitySeineService extends ObserveService { + + FormDto<ActivitySeineDto> loadToRead(String activitySeineId); + + List<ActivitySeineDto> getActivitySeineStubByRoute(String routeId); + + FormDto<ActivitySeineDto> loadToEdit(String activitySeineId); + + FormDto<ActivitySeineDto> preCreate(String routeId); + + @Write + String save(FormDto<ActivitySeineDto> form); + + @Write + void delete(String routeId, String activitySeineId); + + @Write + void delete(String routeId, Collection<String> activitySeineIds); +} 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 ed7a97a..2745504 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/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java new file mode 100644 index 0000000..153c06a --- /dev/null +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java @@ -0,0 +1,29 @@ +package fr.ird.observe.services.service.seine; + +import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; + +/** + * @author Sylvain Bavencoff - bavencoff(a)codelutin.com + */ +public class ActivitySeineObservedSystemServiceTopia extends ObserveServiceTopia implements ActivitySeineObservedSystemService { + + @Override + public FormDto<ActivitySeineObservedSystemDto> loadToRead(String activitySeineId) { + + + + return null; + } + + @Override + public FormDto<ActivitySeineObservedSystemDto> loadToEdit(String activitySeineId) { + return null; + } + + @Override + public String save(FormDto<ActivitySeineObservedSystemDto> form) { + return null; + } +} diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java new file mode 100644 index 0000000..0e8bbab --- /dev/null +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java @@ -0,0 +1,49 @@ +package fr.ird.observe.services.service.seine; + +import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.seine.ActivitySeineDto; + +import java.util.Collection; +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff(a)codelutin.com + */ +public class ActivitySeineServiceTopia extends ObserveServiceTopia implements ActivitySeineService { + + @Override + public FormDto<ActivitySeineDto> loadToRead(String activitySeineId) { + return null; + } + + @Override + public List<ActivitySeineDto> getActivitySeineStubByRoute(String routeId) { + return null; + } + + @Override + public FormDto<ActivitySeineDto> loadToEdit(String activitySeineId) { + return null; + } + + @Override + public FormDto<ActivitySeineDto> preCreate(String routeId) { + return null; + } + + @Override + public String save(FormDto<ActivitySeineDto> form) { + return null; + } + + @Override + public void delete(String routeId, String activitySeineId) { + + } + + @Override + public void delete(String routeId, Collection<String> activitySeineIds) { + + } +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

11/50: Suppression des traductions sur les constantes + prise en compte dans le builder de Dto
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 ffa3d7213f8d389129bdce70cb5cc29d40abd4ef Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 09:16:35 2015 +0200 Suppression des traductions sur les constantes + prise en compte dans le builder de Dto --- observe-services-model/pom.xml | 12 ------ .../seine/NonTargetCatchComputedValueSource.java | 23 ++--------- .../services/dto/constants/seine/Ownership.java | 24 ++--------- .../services/dto/constants/seine/SchoolType.java | 24 ++--------- .../seine/TypeTransmittingBuoyOperation.java | 28 +++---------- .../services/service/ReferentialDtoBuilder.java | 47 ++++++++++++++++++---- .../services/service/ReferentialServiceTopia.java | 35 ++++++++-------- 7 files changed, 73 insertions(+), 120 deletions(-) diff --git a/observe-services-model/pom.xml b/observe-services-model/pom.xml index 71ecda3..a35de0f 100644 --- a/observe-services-model/pom.xml +++ b/observe-services-model/pom.xml @@ -59,18 +59,6 @@  <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-collections4</artifactId> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/NonTargetCatchComputedValueSource.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/NonTargetCatchComputedValueSource.java index 762049e..40469be 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/NonTargetCatchComputedValueSource.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/NonTargetCatchComputedValueSource.java @@ -22,9 +22,6 @@ package fr.ird.observe.services.dto.constants.seine; * #L% */ -import static org.nuiton.i18n.I18n.n; -import static org.nuiton.i18n.I18n.t; - /** * Pour définir comment a été calculé une donnée d'une discarded faune. * @@ -38,32 +35,18 @@ public enum NonTargetCatchComputedValueSource { * * @since 3.0 */ - FROM_DATA(n("observe.common.computedValueSource.fromData")), + FROM_DATA, /** * Donnée calculée à partir de l'échantillon pour la même espèce et la même calée. * * @since 3.0 */ - FROM_SAMPLE(n("observe.common.computedValueSource.fromSample")), + FROM_SAMPLE, /** * Donnée calculée à partir du référentiel. * * @since 3.0 */ - FROM_REFERENTIEL(n("observe.common.computedValueSource.fromReferentiel")); - - private final String i18nKey; - - private NonTargetCatchComputedValueSource(String i18nKey) { - this.i18nKey = i18nKey; - } - - public String getI18nKey() { - return i18nKey; - } + FROM_REFERENTIEL; - @Override - public String toString() { - return t(i18nKey); - } } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/Ownership.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/Ownership.java index fd5ec49..ec9e47b 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/Ownership.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/Ownership.java @@ -21,9 +21,6 @@ */ package fr.ird.observe.services.dto.constants.seine; -import static org.nuiton.i18n.I18n.n; -import static org.nuiton.i18n.I18n.t; - /** * An enum to define the ownership of a DCP. * @@ -32,28 +29,13 @@ import static org.nuiton.i18n.I18n.t; public enum Ownership implements Comparable<Ownership> { /** inconnue */ - unknown(n("observe.common.ownership.unknown")), + unknown, /** appartient a ce vessel */ - ceVessel(n("observe.common.ownership.ceVessel")), + ceVessel, /** appartien a un autre vessel */ - autreVessel(n("observe.common.ownership.autreVessel")); - - private String i18nKey; - - Ownership(String i18nKey) { - this.i18nKey = i18nKey; - } - - public String getI18nKey() { - return i18nKey; - } - - @Override - public String toString() { - return t(i18nKey); - } + autreVessel; public static Ownership valueOf(int ordinal) throws IllegalArgumentException { diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/SchoolType.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/SchoolType.java index c047dc7..ab341df 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/SchoolType.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/SchoolType.java @@ -21,9 +21,6 @@ */ package fr.ird.observe.services.dto.constants.seine; -import static org.nuiton.i18n.I18n.n; -import static org.nuiton.i18n.I18n.t; - /** * Une énumération pour caractériser les valeurs d'un type de banc d'une calée. * @@ -33,27 +30,12 @@ import static org.nuiton.i18n.I18n.t; public enum SchoolType { /** banc indéterminé (valeur par défaut) // was 3 before version 4.0 */ - undefined(n("observe.common.schoolType.undefined")), + undefined, /** banc objet // was 1 before version 4.0 */ - objet(n("observe.common.schoolType.objet")), + objet, /** banc libre // was 2 before version 4.0 */ - libre(n("observe.common.schoolType.libre")); - - private String i18nKey; - - SchoolType(String i18nKey) { - this.i18nKey = i18nKey; - } - - public String getI18nKey() { - return i18nKey; - } - - @Override - public String toString() { - return t(i18nKey); - } + libre; } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/TypeTransmittingBuoyOperation.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/TypeTransmittingBuoyOperation.java index 81bac85..ef57b3c 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/TypeTransmittingBuoyOperation.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/constants/seine/TypeTransmittingBuoyOperation.java @@ -21,24 +21,18 @@ */ package fr.ird.observe.services.dto.constants.seine; -import static org.nuiton.i18n.I18n.n; -import static org.nuiton.i18n.I18n.t; - /** @author Tony Chemit - chemit(a)codelutin.com */ public enum TypeTransmittingBuoyOperation { // pas de balise lue - pasDeBalise(n("observe.common.balise.objectOperation.no.balise")), + pasDeBalise, // une balise lue - visite(n("observe.common.balise.objectOperation.visite"), "1"), - recuperation(n("observe.common.balise.objectOperation.recupere"), "2"), - pose(n("observe.common.balise.objectOperation.pose"), "3"), + visite("1"), + recuperation("2"), + pose("3"), // deux balises lues - recuperationEtRemplacement(n("observe.common.balise.objectOperation.recupere.et.change"), "2", "3"); - - /** clef i18n du type d'opération sur balise */ - private String i18nKey; + recuperationEtRemplacement("2", "3"); /** les codes des opérations sur balise */ private String[] codeOperation; @@ -46,16 +40,11 @@ public enum TypeTransmittingBuoyOperation { /** le count de balises lues */ private int nbBalises; - TypeTransmittingBuoyOperation(String i18nKey, String... codeOperation) { - this.i18nKey = i18nKey; + TypeTransmittingBuoyOperation(String... codeOperation) { this.codeOperation = codeOperation; nbBalises = codeOperation.length; } - public String getI18nKey() { - return i18nKey; - } - public int getNbBalises() { return nbBalises; } @@ -64,11 +53,6 @@ public enum TypeTransmittingBuoyOperation { return codeOperation; } - @Override - public String toString() { - return t(i18nKey); - } - public static TypeTransmittingBuoyOperation valueOf(int ordinal) throws IllegalArgumentException { for (TypeTransmittingBuoyOperation o : values()) { 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 3495485..bf9ccb0 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 @@ -2,9 +2,13 @@ package fr.ird.observe.services.service; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; +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.Program; +import fr.ird.observe.entities.constants.seine.NonTargetCatchComputedValueSource; +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; @@ -16,6 +20,7 @@ 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. @@ -32,6 +37,8 @@ public class ReferentialDtoBuilder<M extends ReferentialDto> implements Closeabl private final EntityVisitor visitor; + private ImmutableSet.Builder<Class<? extends ReferentialDto>> referentialDtoTypesBuilder; + public static <M extends ReferentialDto> ReferentialDtoBuilder<M> create(Class<M> modelType) { Preconditions.checkNotNull(modelType, "modelType can't be null."); @@ -58,36 +65,60 @@ public class ReferentialDtoBuilder<M extends ReferentialDto> implements Closeabl } + public Set<Class<? extends ReferentialDto>> getReferentialDtoTypes() { + return referentialDtoTypesBuilder.build(); + } + protected ReferentialDtoBuilder(M result) { this.result = result; this.binder = (Binder<M, M>) BinderFactory.newBinder(result.getClass()); this.valuesBuilder = new ImmutableMap.Builder<>(); this.visitor = new ToModelVisitor(); + this.referentialDtoTypesBuilder = new ImmutableSet.Builder<>(); } protected void putPropertyValue(String propertyName, Object propertyValue) { if (TopiaEntity.TOPIA_ID.equals(propertyName)) { propertyName = ReferentialDto.PROPERTY_ID; - } else if (Program.PROPERTY_GEAR_TYPE.equals(propertyName)) { + } else if (propertyValue instanceof GearType) { GearType entityGearType = (GearType) propertyValue; propertyValue = fr.ird.observe.services.dto.constants.GearType.valueOf(entityGearType.name()); - } else if (Program.PROPERTY_STATUS.equals(propertyName)) { + } else if (propertyValue instanceof ReferenceStatus) { + + ReferenceStatus referenceStatus = (ReferenceStatus) propertyValue; + propertyValue = fr.ird.observe.services.dto.constants.ReferenceStatus.valueOf(referenceStatus.name()); + + } else if (propertyValue instanceof Ownership) { + + Ownership ownership = (Ownership) propertyValue; + propertyValue = fr.ird.observe.services.dto.constants.seine.Ownership.valueOf(ownership.name()); - ReferenceStatus entityGearType = (ReferenceStatus) propertyValue; - propertyValue = fr.ird.observe.services.dto.constants.ReferenceStatus.valueOf(entityGearType.name()); + } else if (propertyValue instanceof SchoolType) { + + SchoolType schoolType = (SchoolType) propertyValue; + propertyValue = fr.ird.observe.services.dto.constants.seine.SchoolType.valueOf(schoolType.name()); + + } else if (propertyValue instanceof TypeTransmittingBuoyOperation) { + + TypeTransmittingBuoyOperation typeTransmittingBuoyOperation = (TypeTransmittingBuoyOperation) propertyValue; + propertyValue = fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.valueOf(typeTransmittingBuoyOperation.name()); + + } else if (propertyValue instanceof NonTargetCatchComputedValueSource) { + + NonTargetCatchComputedValueSource nonTargetCatchComputedValueSource = (NonTargetCatchComputedValueSource) propertyValue; + propertyValue = fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource.valueOf(nonTargetCatchComputedValueSource.name()); } - //TODO Ajouter les autres exceptions de transformations valuesBuilder.put(propertyName, propertyValue); } protected <R extends ReferentialDto> ReferentialLabelDto<R> entityToRef(Class<R> dtoType, TopiaEntity entityValue) { - + referentialDtoTypesBuilder.add(dtoType); ReferentialLabelDto<R> label = ReferentialLabelDtos.newReferentialLabelDto(dtoType, entityValue); label.setId(entityValue.getTopiaId()); return label; @@ -102,7 +133,7 @@ public class ReferentialDtoBuilder<M extends ReferentialDto> implements Closeabl visitor.clear(); } - class ToModelVisitor implements EntityVisitor { + protected class ToModelVisitor implements EntityVisitor { @Override public void start(TopiaEntity entity) { 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 9fe646c..4916b1c 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 @@ -1,6 +1,7 @@ package fr.ird.observe.services.service; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import fr.ird.observe.entities.referentiel.Country; import fr.ird.observe.entities.referentiel.FpaZone; import fr.ird.observe.entities.referentiel.Gear; @@ -61,6 +62,8 @@ import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; import fr.ird.observe.entities.referentiel.seine.WeightCategory; import fr.ird.observe.entities.referentiel.seine.Wind; import fr.ird.observe.services.ObserveServiceTopia; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.FormDtos; import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.FpaZoneDto; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; @@ -73,8 +76,6 @@ 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.FormDto; -import fr.ird.observe.services.dto.FormDtos; import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SpeciesDto; @@ -128,6 +129,7 @@ import org.nuiton.topia.persistence.TopiaEntity; import java.util.Collection; import java.util.Map; +import java.util.Set; /** * Created on 16/08/15. @@ -266,10 +268,21 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe } protected <D extends ReferentialDto> FormDto<D> entityToReferentialFormDto(Class<D> dtoType, TopiaEntity entity) { - D dto = toDto(dtoType, entity); - FormDto<D> form = FormDtos.newFormDto(dtoType); - form.setForm(dto); - return form; + try (ReferentialDtoBuilder<D> dtoBuilder = ReferentialDtoBuilder.create(dtoType)) { + dtoBuilder.copyEntity(entity); + D dto = dtoBuilder.build(); + Set<Class<? extends ReferentialDto>> referentialDtoTypes = dtoBuilder.getReferentialDtoTypes(); + + ImmutableSet.Builder<ReferentialLabelSetDto> labels = new ImmutableSet.Builder<>(); + for (Class<? extends ReferentialDto> referentialDtoType : referentialDtoTypes) { + ReferentialLabelSetDto referentialLabelSet = getReferentialLabelSet(referentialDtoType); + labels.add(referentialLabelSet); + } + FormDto<D> form = FormDtos.newFormDto(dtoType, dto, labels.build()); + form.setForm(dto); + + return form; + } } protected <D extends ReferentialDto, E extends TopiaEntity> E referentialDtoToEntity(D dto) { @@ -289,14 +302,4 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe return (Class<M>) modelType; } - protected <D extends ReferentialDto> D toDto(Class<D> dtoType, TopiaEntity entity) { - - try (ReferentialDtoBuilder<D> dtoBuilder = ReferentialDtoBuilder.create(dtoType)) { - dtoBuilder.copyEntity(entity); - D model = dtoBuilder.build(); - return model; - } - - } - } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

10/50: Ajout d'un builder de ReferentialDto à partir d'une entité
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 bf2a9f7af94bd58e294ba09f101c9927ac22cf5b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 08:39:23 2015 +0200 Ajout d'un builder de ReferentialDto à partir d'une entité --- .../services/service/ReferentialDtoBuilder.java | 13 +- .../services/service/ReferentialServiceTopia.java | 172 +++++++++++++++------ .../service/ReferentialDtoBuilderTest.java | 13 ++ 3 files changed, 148 insertions(+), 50 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 af01306..3495485 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 @@ -65,7 +65,6 @@ public class ReferentialDtoBuilder<M extends ReferentialDto> implements Closeabl this.visitor = new ToModelVisitor(); } - protected void putPropertyValue(String propertyName, Object propertyValue) { if (TopiaEntity.TOPIA_ID.equals(propertyName)) { @@ -87,9 +86,9 @@ public class ReferentialDtoBuilder<M extends ReferentialDto> implements Closeabl } - protected ReferentialLabelDto entityToRef(TopiaEntity entityValue) { + protected <R extends ReferentialDto> ReferentialLabelDto<R> entityToRef(Class<R> dtoType, TopiaEntity entityValue) { - ReferentialLabelDto label = ReferentialLabelDtos.newReferentialLabelDto(); + ReferentialLabelDto<R> label = ReferentialLabelDtos.newReferentialLabelDto(dtoType, entityValue); label.setId(entityValue.getTopiaId()); return label; @@ -125,7 +124,9 @@ public class ReferentialDtoBuilder<M extends ReferentialDto> implements Closeabl if (value instanceof TopiaEntity) { TopiaEntity entityValue = (TopiaEntity) value; - valueToAdd = entityToRef(entityValue); + + Class dtoType = ReferentialServiceTopia.entityToModelTypeCache.get(type); + valueToAdd = entityToRef(dtoType, entityValue); } @@ -143,11 +144,13 @@ public class ReferentialDtoBuilder<M extends ReferentialDto> implements Closeabl Object valueToAdd = value; if (TopiaEntity.class.isAssignableFrom(type)) { + Class dtoType = ReferentialServiceTopia.entityToModelTypeCache.get(type); + Collection<? extends TopiaEntity> topiaEntities = (Collection<? extends TopiaEntity>) value; LinkedHashSet<ReferentialLabelDto> models = new LinkedHashSet<>(topiaEntities.size()); for (TopiaEntity entityValue : topiaEntities) { - models.add(entityToRef(entityValue)); + models.add(entityToRef(dtoType, entityValue)); } valueToAdd = models; 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 6213c7a..9fe646c 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 @@ -19,6 +19,47 @@ import fr.ird.observe.entities.referentiel.SpeciesList; 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.entities.referentiel.longline.BaitHaulingStatus; +import fr.ird.observe.entities.referentiel.longline.BaitSettingStatus; +import fr.ird.observe.entities.referentiel.longline.BaitType; +import fr.ird.observe.entities.referentiel.longline.CatchFateLongline; +import fr.ird.observe.entities.referentiel.longline.EncounterType; +import fr.ird.observe.entities.referentiel.longline.Healthness; +import fr.ird.observe.entities.referentiel.longline.HookPosition; +import fr.ird.observe.entities.referentiel.longline.HookSize; +import fr.ird.observe.entities.referentiel.longline.HookType; +import fr.ird.observe.entities.referentiel.longline.ItemHorizontalPosition; +import fr.ird.observe.entities.referentiel.longline.ItemVerticalPosition; +import fr.ird.observe.entities.referentiel.longline.LightsticksColor; +import fr.ird.observe.entities.referentiel.longline.LightsticksType; +import fr.ird.observe.entities.referentiel.longline.LineType; +import fr.ird.observe.entities.referentiel.longline.MaturityStatus; +import fr.ird.observe.entities.referentiel.longline.MitigationType; +import fr.ird.observe.entities.referentiel.longline.SensorBrand; +import fr.ird.observe.entities.referentiel.longline.SensorDataFormat; +import fr.ird.observe.entities.referentiel.longline.SensorType; +import fr.ird.observe.entities.referentiel.longline.SettingShape; +import fr.ird.observe.entities.referentiel.longline.SizeMeasureType; +import fr.ird.observe.entities.referentiel.longline.StomacFullness; +import fr.ird.observe.entities.referentiel.longline.TripType; +import fr.ird.observe.entities.referentiel.longline.VesselActivityLongline; +import fr.ird.observe.entities.referentiel.longline.WeightMeasureType; +import fr.ird.observe.entities.referentiel.seine.DetectionMode; +import fr.ird.observe.entities.referentiel.seine.ObjectFate; +import fr.ird.observe.entities.referentiel.seine.ObjectOperation; +import fr.ird.observe.entities.referentiel.seine.ObjectType; +import fr.ird.observe.entities.referentiel.seine.ObservedSystem; +import fr.ird.observe.entities.referentiel.seine.ReasonForDiscard; +import fr.ird.observe.entities.referentiel.seine.ReasonForNoFishing; +import fr.ird.observe.entities.referentiel.seine.ReasonForNullSet; +import fr.ird.observe.entities.referentiel.seine.SpeciesFate; +import fr.ird.observe.entities.referentiel.seine.SpeciesStatus; +import fr.ird.observe.entities.referentiel.seine.SurroundingActivity; +import fr.ird.observe.entities.referentiel.seine.TransmittingBuoyOperation; +import fr.ird.observe.entities.referentiel.seine.TransmittingBuoyType; +import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; +import fr.ird.observe.entities.referentiel.seine.WeightCategory; +import fr.ird.observe.entities.referentiel.seine.Wind; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.FpaZoneDto; @@ -42,6 +83,47 @@ 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 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; +import fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto; +import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto; +import fr.ird.observe.services.dto.referential.longline.HealthnessDto; +import fr.ird.observe.services.dto.referential.longline.HookPositionDto; +import fr.ird.observe.services.dto.referential.longline.HookSizeDto; +import fr.ird.observe.services.dto.referential.longline.HookTypeDto; +import fr.ird.observe.services.dto.referential.longline.ItemHorizontalPositionDto; +import fr.ird.observe.services.dto.referential.longline.ItemVerticalPositionDto; +import fr.ird.observe.services.dto.referential.longline.LightsticksColorDto; +import fr.ird.observe.services.dto.referential.longline.LightsticksTypeDto; +import fr.ird.observe.services.dto.referential.longline.LineTypeDto; +import fr.ird.observe.services.dto.referential.longline.MaturityStatusDto; +import fr.ird.observe.services.dto.referential.longline.MitigationTypeDto; +import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; +import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; +import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; +import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; +import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; +import fr.ird.observe.services.dto.referential.longline.TripTypeDto; +import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; +import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; +import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; +import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; +import fr.ird.observe.services.dto.referential.seine.ObjectTypeDto; +import fr.ird.observe.services.dto.referential.seine.ObservedSystemDto; +import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; +import fr.ird.observe.services.dto.referential.seine.ReasonForNoFishingDto; +import fr.ird.observe.services.dto.referential.seine.ReasonForNullSetDto; +import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; +import fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto; +import fr.ird.observe.services.dto.referential.seine.SurroundingActivityDto; +import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto; +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.nuiton.topia.persistence.TopiaEntity; import java.util.Collection; @@ -74,52 +156,52 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe .put(GearCaracteristic.class, GearCaracteristicDto.class) .put(Gear.class, GearDto.class) - // .put(VesselActivitySeine.class, VesselActivitySeineModel.class) -// .put(SurroundingActivity.class, SurroundingActivityModel.class) -// .put(ReasonForNullSet.class, ReasonForNullSetModel.class) -// .put(ReasonForNoFishing.class, ReasonForNoFishingModel.class) -// .put(SpeciesFate.class, SpeciesFateModel.class) -// .put(ObjectFate.class, ObjectFateModel.class) -// .put(WeightCategory.class, WeightCategoryModel.class) -// .put(DetectionMode.class, DetectionModeModel.class) -// .put(TransmittingBuoyOperation.class, TransmittingBuoyOperationModel.class) -// .put(ObjectOperation.class, ObjectOperationModel.class) -// .put(ReasonForDiscard.class, ReasonForDiscardModel.class) -// .put(SpeciesStatus.class, SpeciesStatusModel.class) -// .put(ObservedSystem.class, ObservedSystemModel.class) -// .put(TransmittingBuoyType.class, TransmittingBuoyTypeModel.class) -// .put(ObjectType.class, ObjectTypeModel.class) -// .put(Wind.class, WindModel.class) - -// .put(BaitHaulingStatus.class, BaitHaulingStatusModel.class) -// .put(BaitSettingStatus.class, BaitSettingStatusModel.class) -// .put(BaitType.class, BaitTypeModel.class) -// .put(CatchFateLongline.class, CatchFateLonglineModel.class) -// .put(EncounterType.class, EncounterTypeModel.class) -// .put(Healthness.class, HealthnessModel.class) -// .put(HookPosition.class, HookPositionModel.class) -// .put(HookSize.class, HookSizeModel.class) -// .put(HookType.class, HookTypeModel.class) -// .put(ItemVerticalPosition.class, ItemVerticalPositionModel.class) -// .put(ItemHorizontalPosition.class, ItemHorizontalPositionModel.class) -// .put(LightsticksColor.class, LightsticksColorModel.class) -// .put(LightsticksType.class, LightsticksTypeModel.class) -// .put(LineType.class, LineTypeModel.class) -// .put(MaturityStatus.class, MaturityStatusModel.class) -// .put(MitigationType.class, MitigationTypeModel.class) -// .put(SensorBrand.class, SensorBrandModel.class) -// .put(SensorDataFormat.class, SensorDataFormatModel.class) -// .put(SensorType.class, SensorTypeModel.class) -// .put(SettingShape.class, SettingShapeModel.class) -// .put(SizeMeasureType.class, SizeMeasureTypeModel.class) -// .put(StomacFullness.class, StomacFullnessModel.class) -// .put(TripType.class, TripTypeModel.class) -// .put(VesselActivityLongline.class, VesselActivityLonglineModel.class) -// .put(WeightMeasureType.classWeightMeasureTypeModel.class) + .put(VesselActivitySeine.class, VesselActivitySeineDto.class) + .put(SurroundingActivity.class, SurroundingActivityDto.class) + .put(ReasonForNullSet.class, ReasonForNullSetDto.class) + .put(ReasonForNoFishing.class, ReasonForNoFishingDto.class) + .put(SpeciesFate.class, SpeciesFateDto.class) + .put(ObjectFate.class, ObjectFateDto.class) + .put(WeightCategory.class, WeightCategoryDto.class) + .put(DetectionMode.class, DetectionModeDto.class) + .put(TransmittingBuoyOperation.class, TransmittingBuoyOperationDto.class) + .put(ObjectOperation.class, ObjectOperationDto.class) + .put(ReasonForDiscard.class, ReasonForDiscardDto.class) + .put(SpeciesStatus.class, SpeciesStatusDto.class) + .put(ObservedSystem.class, ObservedSystemDto.class) + .put(TransmittingBuoyType.class, TransmittingBuoyTypeDto.class) + .put(ObjectType.class, ObjectTypeDto.class) + .put(Wind.class, WindDto.class) + + .put(BaitHaulingStatus.class, BaitHaulingStatusDto.class) + .put(BaitSettingStatus.class, BaitSettingStatusDto.class) + .put(BaitType.class, BaitTypeDto.class) + .put(CatchFateLongline.class, CatchFateLonglineDto.class) + .put(EncounterType.class, EncounterTypeDto.class) + .put(Healthness.class, HealthnessDto.class) + .put(HookPosition.class, HookPositionDto.class) + .put(HookSize.class, HookSizeDto.class) + .put(HookType.class, HookTypeDto.class) + .put(ItemVerticalPosition.class, ItemVerticalPositionDto.class) + .put(ItemHorizontalPosition.class, ItemHorizontalPositionDto.class) + .put(LightsticksColor.class, LightsticksColorDto.class) + .put(LightsticksType.class, LightsticksTypeDto.class) + .put(LineType.class, LineTypeDto.class) + .put(MaturityStatus.class, MaturityStatusDto.class) + .put(MitigationType.class, MitigationTypeDto.class) + .put(SensorBrand.class, SensorBrandDto.class) + .put(SensorDataFormat.class, SensorDataFormatDto.class) + .put(SensorType.class, SensorTypeDto.class) + .put(SettingShape.class, SettingShapeDto.class) + .put(SizeMeasureType.class, SizeMeasureTypeDto.class) + .put(StomacFullness.class, StomacFullnessDto.class) + .put(TripType.class, TripTypeDto.class) + .put(VesselActivityLongline.class, VesselActivityLonglineDto.class) + .put(WeightMeasureType.class, WeightMeasureTypeDto.class) .build(); - protected static final ImmutableMap<Class<?>, Class<?>> modelToEntityTypeCache ; + protected static final ImmutableMap<Class<?>, Class<?>> modelToEntityTypeCache; static { @@ -162,7 +244,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe return form; } - @Override + public <D extends ReferentialDto> String save(FormDto<D> form) { Class<D> dtoType= form.getType(); TopiaEntity entity = referentialDtoToEntity(form.getForm()); @@ -185,7 +267,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe protected <D extends ReferentialDto> FormDto<D> entityToReferentialFormDto(Class<D> dtoType, TopiaEntity entity) { D dto = toDto(dtoType, entity); - FormDto<D> form = FormDtos.newReferentialFormDto(dtoType); + FormDto<D> form = FormDtos.newFormDto(dtoType); form.setForm(dto); return form; } 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 fd708fa..a0fb4e6 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 @@ -40,6 +40,15 @@ public class ReferentialDtoBuilderTest { program.setTargetDiscardsObservation(1); Organism organism = new OrganismImpl(); organism.setTopiaId("Oraganism1"); + organism.setLabel1("organism1"); + organism.setLabel2("organism2"); + organism.setLabel3("organism3"); + organism.setLabel4("organism4"); + organism.setLabel5("organism5"); + organism.setLabel6("organism6"); + organism.setLabel7("organism7"); + organism.setLabel8("organism8"); + organism.setCode("organismCode"); program.setOrganism(organism); ReferentialDtoBuilder<ProgramDto> builder = ReferentialDtoBuilder.create(ProgramDto.class); @@ -65,6 +74,10 @@ public class ReferentialDtoBuilderTest { 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")); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

09/50: Deplacement d'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 01bfc953183ea34ca1dafcc7dc08c5d89fbf7633 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 08:38:12 2015 +0200 Deplacement d'un test --- .../service/{referential => }/ReferentialServiceTopiaTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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/ReferentialServiceTopiaTest.java similarity index 89% rename from observe-services-topia/src/test/java/fr/ird/observe/services/service/referential/ReferentialServiceTopiaTest.java rename to observe-services-topia/src/test/java/fr/ird/observe/services/service/ReferentialServiceTopiaTest.java index 4ed8565..b702093 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/ReferentialServiceTopiaTest.java @@ -1,10 +1,9 @@ -package fr.ird.observe.services.service.referential; +package fr.ird.observe.services.service; import fr.ird.observe.services.ObserveServiceContextTopia; import fr.ird.observe.services.ObserveServiceMainFactory; 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; import org.junit.Test; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

08/50: Ajout d'un constructeur de ReferentielLabelDto mais ausii pour les FormDto
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 682773800442901e3c98af3b2c6084aa2e9c9960 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 08:37:19 2015 +0200 Ajout d'un constructeur de ReferentielLabelDto mais ausii pour les FormDto --- .../java/fr/ird/observe/services/dto/FormDto.java | 4 - .../java/fr/ird/observe/services/dto/FormDtos.java | 13 +- .../dto/referential/ReferentialLabelDto.java | 47 +++++++ .../dto/referential/ReferentialLabelDtos.java | 149 +++++++++++++++++++++ 4 files changed, 208 insertions(+), 5 deletions(-) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java index da5202d..93be919 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java @@ -12,10 +12,6 @@ public class FormDto<R extends IdDto> extends AbstractFormDto { this.type = type; } - public FormDto() { - this(null); - } - @Override public void setForm(IdDto form) { Preconditions.checkArgument(form.getClass().isAssignableFrom(type), "Bad form type, should be " + type.getName()); diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDtos.java index 7606dc8..530e2df 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDtos.java @@ -1,5 +1,9 @@ package fr.ird.observe.services.dto; +import fr.ird.observe.services.dto.referential.ReferentialLabelSetDto; + +import java.util.Collection; + /** * Created on 17/08/15. * @@ -7,8 +11,15 @@ package fr.ird.observe.services.dto; */ public class FormDtos extends AbstractFormDtos { - public static <BeanType extends FormDto, R extends IdDto> BeanType newReferentialFormDto(Class<R> source) { + public static <BeanType extends FormDto, R extends IdDto> BeanType newFormDto(Class<R> source) { + BeanType result = (BeanType) new FormDto<>(source); + return result; + } + + public static <BeanType extends FormDto, R extends IdDto> BeanType newFormDto(Class<R> source, R form, Collection<ReferentialLabelSetDto> labels) { BeanType result = (BeanType) new FormDto<>(source); + result.setForm(form); + result.setLabels(labels); return result; } 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 new file mode 100644 index 0000000..ac89343 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelDto.java @@ -0,0 +1,47 @@ +package fr.ird.observe.services.dto.referential; + +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; + +import java.io.Serializable; + +public class ReferentialLabelDto<R extends ReferentialDto> extends AbstractReferentialLabelDto { + + private static final long serialVersionUID = 1L; + + protected final Class<R> type; + + protected final ImmutableList<String> labelPropertyNames; + + protected final Serializable[] labelPropertyValues; + + public ReferentialLabelDto(Class<R> type, String... labelPropertyNames) { + this.type = type; + this.labelPropertyNames = ImmutableList.copyOf(labelPropertyNames); + this.labelPropertyValues = new Serializable[labelPropertyNames.length]; + } + + public Class<R> getType() { + return type; + } + + public Serializable getLabelPropertyValue(String propertyName) { + int propertyIndex = getPropertyIndex(propertyName); + return labelPropertyValues[propertyIndex]; + } + + public ImmutableList<String> getLabelPropertyNames() { + return labelPropertyNames; + } + + public void setLabelPropertyValue(String propertyName, Serializable propertyValue) { + 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); + 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 new file mode 100644 index 0000000..176d9c0 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelDtos.java @@ -0,0 +1,149 @@ +package fr.ird.observe.services.dto.referential; + +import com.google.common.collect.ImmutableMap; +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; +import fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto; +import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto; +import fr.ird.observe.services.dto.referential.longline.HealthnessDto; +import fr.ird.observe.services.dto.referential.longline.HookPositionDto; +import fr.ird.observe.services.dto.referential.longline.HookSizeDto; +import fr.ird.observe.services.dto.referential.longline.HookTypeDto; +import fr.ird.observe.services.dto.referential.longline.ItemHorizontalPositionDto; +import fr.ird.observe.services.dto.referential.longline.ItemVerticalPositionDto; +import fr.ird.observe.services.dto.referential.longline.LightsticksColorDto; +import fr.ird.observe.services.dto.referential.longline.LightsticksTypeDto; +import fr.ird.observe.services.dto.referential.longline.LineTypeDto; +import fr.ird.observe.services.dto.referential.longline.MaturityStatusDto; +import fr.ird.observe.services.dto.referential.longline.MitigationTypeDto; +import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; +import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; +import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; +import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; +import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; +import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; +import fr.ird.observe.services.dto.referential.longline.TripTypeDto; +import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; +import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; +import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; +import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; +import fr.ird.observe.services.dto.referential.seine.ObjectTypeDto; +import fr.ird.observe.services.dto.referential.seine.ObservedSystemDto; +import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; +import fr.ird.observe.services.dto.referential.seine.ReasonForNoFishingDto; +import fr.ird.observe.services.dto.referential.seine.ReasonForNullSetDto; +import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; +import fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto; +import fr.ird.observe.services.dto.referential.seine.SurroundingActivityDto; +import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto; +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.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderFactory; + +import java.io.Serializable; +import java.util.Map; + +public class ReferentialLabelDtos extends AbstractReferentialLabelDtos { + + /** + * Les noms des propriétés à utiliser dans le label par type de référentiel. + */ + protected static final ImmutableMap<Class<?>, String[]> LABEL_PROPERTY_NAMES_MAPPING; + + static { + + String[] DEFAULT_PROPERTY_NAMES = {ReferentialDto.PROPERTY_CODE, I18nReferentialDto.PROPERTY_LABEL1, I18nReferentialDto.PROPERTY_LABEL2, I18nReferentialDto.PROPERTY_LABEL3}; + + LABEL_PROPERTY_NAMES_MAPPING = ImmutableMap.<Class<?>, String[]>builder() + + .put(CountryDto.class, DEFAULT_PROPERTY_NAMES) + .put(FpaZoneDto.class, DEFAULT_PROPERTY_NAMES) + .put(GearCaracteristicDto.class, DEFAULT_PROPERTY_NAMES) + .put(GearCaracteristicTypeDto.class, DEFAULT_PROPERTY_NAMES) + .put(GearDto.class, DEFAULT_PROPERTY_NAMES) + .put(HarbourDto.class, new String[]{ReferentialDto.PROPERTY_CODE, HarbourDto.PROPERTY_NAME, HarbourDto.PROPERTY_LOCODE}) + .put(LengthWeightParameterDto.class, new String[]{}) + .put(OceanDto.class, DEFAULT_PROPERTY_NAMES) + .put(OrganismDto.class, DEFAULT_PROPERTY_NAMES) + .put(PersonDto.class, new String[]{PersonDto.PROPERTY_FIRST_NAME, PersonDto.PROPERTY_LAST_NAME}) + .put(ProgramDto.class, new String[]{I18nReferentialDto.PROPERTY_LABEL1, I18nReferentialDto.PROPERTY_LABEL2, I18nReferentialDto.PROPERTY_LABEL3}) + .put(SexDto.class, DEFAULT_PROPERTY_NAMES) + .put(SpeciesDto.class, new String[]{SpeciesDto.PROPERTY_FAO_CODE, SpeciesDto.PROPERTY_SCIENTIFIC_LABEL, SpeciesDto.PROPERTY_HOME_ID}) + .put(SpeciesGroupDto.class, DEFAULT_PROPERTY_NAMES) + .put(SpeciesListDto.class, DEFAULT_PROPERTY_NAMES) + .put(VesselDto.class, DEFAULT_PROPERTY_NAMES) + .put(VesselSizeCategoryDto.class, new String[]{ReferentialDto.PROPERTY_CODE, VesselSizeCategoryDto.PROPERTY_GAUGE_LABEL, VesselSizeCategoryDto.PROPERTY_CAPACITY_LABEL}) + .put(VesselTypeDto.class, DEFAULT_PROPERTY_NAMES) + + .put(DetectionModeDto.class, DEFAULT_PROPERTY_NAMES) + .put(ObjectFateDto.class, DEFAULT_PROPERTY_NAMES) + .put(ObjectOperationDto.class, DEFAULT_PROPERTY_NAMES) + .put(ObjectTypeDto.class, DEFAULT_PROPERTY_NAMES) + .put(ObservedSystemDto.class, DEFAULT_PROPERTY_NAMES) + .put(ReasonForDiscardDto.class, DEFAULT_PROPERTY_NAMES) + .put(ReasonForNoFishingDto.class, DEFAULT_PROPERTY_NAMES) + .put(ReasonForNullSetDto.class, DEFAULT_PROPERTY_NAMES) + .put(SpeciesFateDto.class, DEFAULT_PROPERTY_NAMES) + .put(SpeciesStatusDto.class, DEFAULT_PROPERTY_NAMES) + .put(SurroundingActivityDto.class, DEFAULT_PROPERTY_NAMES) + .put(TransmittingBuoyOperationDto.class, DEFAULT_PROPERTY_NAMES) + .put(TransmittingBuoyTypeDto.class, DEFAULT_PROPERTY_NAMES) + .put(VesselActivitySeineDto.class, DEFAULT_PROPERTY_NAMES) + .put(WeightCategoryDto.class, DEFAULT_PROPERTY_NAMES) + .put(WindDto.class, new String[]{ReferentialDto.PROPERTY_CODE, I18nReferentialDto.PROPERTY_LABEL1, I18nReferentialDto.PROPERTY_LABEL2, I18nReferentialDto.PROPERTY_LABEL3, WindDto.PROPERTY_SPEED_RANGE}) + + .put(BaitHaulingStatusDto.class, DEFAULT_PROPERTY_NAMES) + .put(BaitSettingStatusDto.class, DEFAULT_PROPERTY_NAMES) + .put(BaitTypeDto.class, DEFAULT_PROPERTY_NAMES) + .put(CatchFateLonglineDto.class, DEFAULT_PROPERTY_NAMES) + .put(EncounterTypeDto.class, DEFAULT_PROPERTY_NAMES) + .put(HealthnessDto.class, DEFAULT_PROPERTY_NAMES) + .put(HookPositionDto.class, DEFAULT_PROPERTY_NAMES) + .put(HookSizeDto.class, DEFAULT_PROPERTY_NAMES) + .put(HookTypeDto.class, DEFAULT_PROPERTY_NAMES) + .put(ItemHorizontalPositionDto.class, DEFAULT_PROPERTY_NAMES) + .put(ItemVerticalPositionDto.class, DEFAULT_PROPERTY_NAMES) + .put(LightsticksColorDto.class, DEFAULT_PROPERTY_NAMES) + .put(LightsticksTypeDto.class, DEFAULT_PROPERTY_NAMES) + .put(LineTypeDto.class, DEFAULT_PROPERTY_NAMES) + .put(MaturityStatusDto.class, DEFAULT_PROPERTY_NAMES) + .put(MitigationTypeDto.class, DEFAULT_PROPERTY_NAMES) + .put(SensorBrandDto.class, new String[]{ReferentialDto.PROPERTY_CODE, SensorBrandDto.PROPERTY_BRAND_NAME}) + .put(SensorDataFormatDto.class, DEFAULT_PROPERTY_NAMES) + .put(SensorTypeDto.class, DEFAULT_PROPERTY_NAMES) + .put(SettingShapeDto.class, DEFAULT_PROPERTY_NAMES) + .put(SizeMeasureTypeDto.class, DEFAULT_PROPERTY_NAMES) + .put(StomacFullnessDto.class, DEFAULT_PROPERTY_NAMES) + .put(TripTypeDto.class, DEFAULT_PROPERTY_NAMES) + .put(VesselActivityLonglineDto.class, DEFAULT_PROPERTY_NAMES) + .put(WeightMeasureTypeDto.class, DEFAULT_PROPERTY_NAMES) + + .build(); + + } + + public static <R extends ReferentialDto> ReferentialLabelDto<R> newReferentialLabelDto(Class<R> type) { + String[] propertyNames = LABEL_PROPERTY_NAMES_MAPPING.get(type); + return new ReferentialLabelDto<>(type, propertyNames); + } + + public static <R extends ReferentialDto> ReferentialLabelDto<R> newReferentialLabelDto(Class<R> type, Object source) { + String[] propertyNames = LABEL_PROPERTY_NAMES_MAPPING.get(type); + ReferentialLabelDto<R> dto = new ReferentialLabelDto<>(type, 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); + } + return dto; + } + +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

07/50: Simplification des configurations de modele + correction de certains noms de dtos
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 80044c4cfe3b4bacf378d0c77caaf12ca0f3377a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Aug 18 08:33:47 2015 +0200 Simplification des configurations de modele + correction de certains noms de dtos --- .../src/main/xmi/observe-services-dto-common.zargo | Bin 33096 -> 32889 bytes .../xmi/observe-services-dto-longline.properties | 3 +-- .../main/xmi/observe-services-dto-longline.zargo | Bin 75970 -> 75755 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 55402 -> 53974 bytes 4 files changed, 1 insertion(+), 2 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 5a51577..6ca3d46 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.properties b/observe-services-model/src/main/xmi/observe-services-dto-longline.properties index d65fee3..6c81de4 100644 --- a/observe-services-model/src/main/xmi/observe-services-dto-longline.properties +++ b/observe-services-model/src/main/xmi/observe-services-dto-longline.properties @@ -4,5 +4,4 @@ model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.dto.A 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 +package.fr.ird.observe.services.dto.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 index db15039..6ed2246 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 fb04fe5..ed7a97a 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

06/50: fix properties (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 c432553eec78ca869fa2662834e7dd5fa659c36d Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Aug 17 18:26:21 2015 +0200 fix properties (refs #7458). --- .../src/main/xmi/observe-services-dto-longline.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 2e4bffc..d65fee3 100644 --- a/observe-services-model/src/main/xmi/observe-services-dto-longline.properties +++ b/observe-services-model/src/main/xmi/observe-services-dto-longline.properties @@ -1,6 +1,6 @@ model.tagvalue.version=7.0 -model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.dto.IdDto +model.tagvalue.simpleBeanWithNoInterfaceSuperClass=fr.ird.observe.services.dto.AbstractObserveDto model.tagvalue.simpleBeanWithNoInterfaceDefaultsClassNameSuffix=Dtos model.tagvalue.simpleBeanWithNoInterfaceClassNameSuffix=Dto -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0