July 2017 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 7.0-RC-3-SNAPSHOT development[skip ci]
by Tony CHEMIT 25 Jul '17

25 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e6a04612 by 166231 at 2017-07-25T09:35:31+00:00 [jgitflow-maven-plugin]updating poms for 7.0-RC-3-SNAPSHOT development[skip ci] - - - - - 20 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> @@ -183,10 +183,10 @@ <target> <copy failonerror="true" overwrite="true" filtering="true" todir="${project.build.directory}/models"> <filterset> - <filter value="${observe.model.version}" token="observe.model.version"/> + <filter value="${observe.model.version}" token="observe.model.version" /> </filterset> <fileset dir="${basedir}/src/main/models"> - <include name="*.model"/> + <include name="*.model" /> </fileset> </copy> </target> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -20,8 +20,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -32,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services</artifactId> @@ -140,10 +140,10 @@ <target> <copy failonerror="true" overwrite="true" filtering="true" todir="${project.build.directory}/models"> <filterset> - <filter value="${observe.model.version}" token="observe.model.version"/> + <filter value="${observe.model.version}" token="observe.model.version" /> </filterset> <fileset dir="${basedir}/src/main/models"> - <include name="*.model"/> + <include name="*.model" /> </fileset> </copy> </target> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-2-SNAPSHOT</version> + <version>7.0-RC-3-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e6a0461201ac179c3d8e1c8e00d… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e6a0461201ac179c3d8e1c8e00d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.0-RC-2
by Tony CHEMIT 25 Jul '17

25 Jul '17

Tony CHEMIT pushed new branch release/7.0-RC-2 at ultreiaio / ird-observe --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/release/7.0-RC-2 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Mieux filtrer les espèces sensibles (See #794)
by Tony CHEMIT 25 Jul '17

25 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2a50ac8c by Tony CHEMIT at 2017-07-25T11:11:10+02:00 Mieux filtrer les espèces sensibles (See #794) - - - - - 6 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java - application-web/src/main/filtered-resources/mapping - services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetCatchReleaseServiceTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java - services/src/main/java/fr/ird/observe/services/service/data/seine/NonTargetCatchReleaseService.java - services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchReleaseUIHandler.java @@ -45,11 +45,9 @@ import fr.ird.observe.services.dto.seine.NonTargetCatchReleaseStatusDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchReleaseDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchReleaseHelper; import fr.ird.observe.services.service.data.seine.NonTargetCatchReleaseService; -import fr.ird.observe.services.service.data.seine.NonTargetSampleService; import fr.ird.observe.services.service.referential.ReferentialService; import java.beans.PropertyChangeListener; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Date; @@ -59,7 +57,6 @@ import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.TreeMap; -import java.util.stream.Collectors; import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.JPopupMenu; @@ -111,7 +108,6 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei private void updateSpecies(ReferentialReference<SpeciesDto> species, List<NonTargetCatchReleaseStatusDto> states) { - ReferentialReference<SpeciesDto> oldSpecies = getTableEditBean().getSpecies(); JPanel statesContent = getUi().getStatesContent(); statesContent.removeAll(); @@ -205,24 +201,17 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei bean.removePropertyChangeListener(NonTargetCatchReleaseDto.PROPERTY_SPECIES, speciesChanged); bean.addPropertyChangeListener(NonTargetCatchReleaseDto.PROPERTY_SPECIES, speciesChanged); - log.info("Focus to "+requestFocus.getName()); + log.info("Focus to " + requestFocus.getName()); UIHelper.askFocus(requestFocus); } - private static final List<String> SPECIES_GROUP_IDS = Arrays.asList( - "fr.ird.observe.entities.referentiel.SpeciesGroup#1445863056144#0.9820877553253712", - "fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461", - "fr.ird.observe.entities.referentiel.SpeciesGroup#1446014286433#0.6480183366605247", - "fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683689#0.7120116158620075" - ); - @Override public void afterInit(NonTargetCatchReleaseUI ui) { super.afterInit(ui); speciesGroupDtoMap = new TreeMap<>(); - SPECIES_GROUP_IDS.forEach(id -> speciesGroupDtoMap.put(id, getReferentialService().loadSpeciesGroup(id))); + getReferentialService().loadSensibleSpeciesGroup().forEach(id -> speciesGroupDtoMap.put(id.getId(), id)); ui.getDetectionTime().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); ui.getReleaseTime().getSliderHidor().addPropertyChangeListener(HidorButton.PROPERTY_TARGET_VISIBLE, onToogleTimeEditorSliderChangedListener); @@ -303,9 +292,9 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei case NonTargetCatchReleaseDto.PROPERTY_SPECIES: { - Collection<ReferentialReference<SpeciesDto>> sampleSpecies = getNonTargetSampleService().getSampleSpecies(getSelectedParentId()); + Collection<ReferentialReference<SpeciesDto>> sampleSpecies = getNonTargetCatchReleaseService().getSampleSpecies(getSelectedParentId()); - result = (Collection) sampleSpecies.stream().filter(s -> SPECIES_GROUP_IDS.contains(s.getPropertyValue(SpeciesDto.PROPERTY_SPECIES_GROUP + "Id"))).collect(Collectors.toList()); + result = new LinkedList(sampleSpecies); if (log.isDebugEnabled()) { log.debug(String.format("Filter referential references (type %s - property %s), final size: %d", dtoType.getSimpleName(), propertyName, incomingReferences.size())); @@ -329,10 +318,6 @@ public class NonTargetCatchReleaseUIHandler extends ContentTableUIHandler<SetSei return ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newReferentialService(); } - private NonTargetSampleService getNonTargetSampleService() { - return ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newNonTargetSampleService(); - } - public void moveCatchLonglineUp() { int selectedRow = getUi().getTable().getSelectedRow(); getTableModel().moveUp(selectedRow); ===================================== application-web/src/main/filtered-resources/mapping ===================================== --- a/application-web/src/main/filtered-resources/mapping +++ b/application-web/src/main/filtered-resources/mapping @@ -163,6 +163,7 @@ GET /api/v1/data/seine/FloatingObjectService/loadReferenceToRead GET /api/v1/data/seine/FloatingObjectService/preCreate v1.data.seine.FloatingObjectServiceRestApi.preCreate POST /api/v1/data/seine/FloatingObjectService/save v1.data.seine.FloatingObjectServiceRestApi.save POST /api/v1/data/seine/FloatingObjectService/save v1.data.seine.FloatingObjectServiceRestApi.save +GET /api/v1/data/seine/NonTargetCatchReleaseService/getSampleSpecies v1.data.seine.NonTargetCatchReleaseServiceRestApi.getSampleSpecies GET /api/v1/data/seine/NonTargetCatchReleaseService/loadForm v1.data.seine.NonTargetCatchReleaseServiceRestApi.loadForm POST /api/v1/data/seine/NonTargetCatchReleaseService/save v1.data.seine.NonTargetCatchReleaseServiceRestApi.save GET /api/v1/data/seine/NonTargetCatchService/loadForm v1.data.seine.NonTargetCatchServiceRestApi.loadForm @@ -229,6 +230,7 @@ GET /api/v1/referential/ReferentialService/getReferentialReferenceSets POST /api/v1/referential/ReferentialService/insertMissingReferentials v1.referential.ReferentialServiceRestApi.insertMissingReferentials GET /api/v1/referential/ReferentialService/loadForm v1.referential.ReferentialServiceRestApi.loadForm GET /api/v1/referential/ReferentialService/loadReference v1.referential.ReferentialServiceRestApi.loadReference +GET /api/v1/referential/ReferentialService/loadSensibleSpeciesGroup v1.referential.ReferentialServiceRestApi.loadSensibleSpeciesGroup GET /api/v1/referential/ReferentialService/loadSpecies v1.referential.ReferentialServiceRestApi.loadSpecies GET /api/v1/referential/ReferentialService/loadSpeciesGroup v1.referential.ReferentialServiceRestApi.loadSpeciesGroup GET /api/v1/referential/ReferentialService/preCreate v1.referential.ReferentialServiceRestApi.preCreate ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetCatchReleaseServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetCatchReleaseServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetCatchReleaseServiceTopia.java @@ -22,12 +22,22 @@ package fr.ird.observe.services.topia.service.data.seine; * #L% */ +import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; +import fr.ird.observe.entities.seine.NonTargetCatch; import fr.ird.observe.entities.seine.SetSeine; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.form.Form; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchReleaseDto; import fr.ird.observe.services.service.data.seine.NonTargetCatchReleaseService; import fr.ird.observe.services.topia.ObserveServiceTopia; +import fr.ird.observe.services.topia.service.referential.ReferentialServiceTopia; +import java.util.Collection; +import java.util.stream.Collectors; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -39,6 +49,26 @@ public class NonTargetCatchReleaseServiceTopia extends ObserveServiceTopia imple private static final Log log = LogFactory.getLog(NonTargetCatchReleaseServiceTopia.class); @Override + public Collection<ReferentialReference<SpeciesDto>> getSampleSpecies(String setSeineId) { + if (log.isTraceEnabled()) { + log.trace("getSampleSpecies(" + setSeineId + ")"); + } + + SetSeine setSeine = loadEntity(SetSeineDto.class, setSeineId); + + ReferentialBinderSupport<ObserveReferentialEntity, SpeciesDto> speciesBinder = getReferentialBinder(SpeciesDto.class); + + ReferentialLocale referentialLocale = getReferentialLocale(); + + return setSeine.getNonTargetCatch().stream() + .map(NonTargetCatch::getSpecies) + .distinct() + .filter(s-> ReferentialServiceTopia.SPECIES_GROUP_IDS.contains(s.getSpeciesGroup().getTopiaId())) + .map(s -> speciesBinder.toReferentialReference(referentialLocale, s)) + .collect(Collectors.toList()); + } + + @Override public Form<SetSeineNonTargetCatchReleaseDto> loadForm(String setSeineId) { if (log.isTraceEnabled()) { log.trace("loadForm(" + setSeineId + ")"); ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java @@ -61,6 +61,7 @@ import fr.ird.observe.services.service.sql.AddSqlScriptProducerResult; import fr.ird.observe.services.service.sql.SqlScriptProducerService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.topia.service.actions.synchro.referential.sql.ReplaceSqlStatementGenerator; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Date; @@ -82,6 +83,12 @@ import org.nuiton.topia.persistence.metadata.TopiaMetadataModel; public class ReferentialServiceTopia extends ObserveServiceTopia implements ReferentialService { private static final Log log = LogFactory.getLog(ReferentialServiceTopia.class); + public static final List<String> SPECIES_GROUP_IDS = Arrays.asList( + "fr.ird.observe.entities.referentiel.SpeciesGroup#1445863056144#0.9820877553253712", + "fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461", + "fr.ird.observe.entities.referentiel.SpeciesGroup#1446014286433#0.6480183366605247", + "fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683689#0.7120116158620075" + ); @Override public <D extends ReferentialDto> ReferentialReferenceSet<D> getReferenceSet(Class<D> type, Date lastUpdateDate) { @@ -161,6 +168,20 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe } @Override + public ImmutableSet<SpeciesGroupDto> loadSensibleSpeciesGroup() { + if (log.isTraceEnabled()) { + log.trace("loadSensibleSpeciesGroup()"); + } + + ImmutableSet.Builder<SpeciesGroupDto> result = ImmutableSet.builder(); + + for (String speciesGroupId : SPECIES_GROUP_IDS) { + result.add(loadSpeciesGroup(speciesGroupId)); + } + return result.build(); + } + + @Override public <D extends ReferentialDto> Form<D> loadForm(Class<D> type, String id) { if (log.isTraceEnabled()) { log.trace("loadForm(" + type.getName() + ", " + id + ")"); ===================================== services/src/main/java/fr/ird/observe/services/service/data/seine/NonTargetCatchReleaseService.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/data/seine/NonTargetCatchReleaseService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/NonTargetCatchReleaseService.java @@ -22,6 +22,8 @@ package fr.ird.observe.services.service.data.seine; * #L% */ +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.service.ObserveService; import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.SaveResultDto; @@ -31,6 +33,7 @@ import io.ultreia.java4all.http.spi.Post; import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; import fr.ird.observe.services.spi.WriteDataPermission; +import java.util.Collection; /** * @author Sylvain Bavencoff - bavencoff(a)codelutin.com @@ -39,6 +42,10 @@ public interface NonTargetCatchReleaseService extends ObserveService { @Get @ReadDataPermission + Collection<ReferentialReference<SpeciesDto>> getSampleSpecies(String setSeineId); + + @Get + @ReadDataPermission Form<SetSeineNonTargetCatchReleaseDto> loadForm(String setSeineId); @Write ===================================== services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java +++ b/services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java @@ -72,6 +72,10 @@ public interface ReferentialService extends ObserveService { @ReadReferentialPermission @Get + ImmutableSet<SpeciesGroupDto> loadSensibleSpeciesGroup(); + + @ReadReferentialPermission + @Get <R extends ReferentialDto> Form<R> loadForm(Class<R> type, String id) throws DataNotFoundException; @Get View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2a50ac8c34d6330e1ac011a272e… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2a50ac8c34d6330e1ac011a272e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update library flexmark version
by Tony CHEMIT 25 Jul '17

25 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7db715e9 by Tony CHEMIT at 2017-07-25T11:12:55+02:00 update library flexmark version - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -184,7 +184,7 @@ <nuitonVersionVersion>1.0-rc-2</nuitonVersionVersion> <httpVersion>1.0.1</httpVersion> <xworkVersion>2.3.33</xworkVersion> - <flexmarkVersion>0.22.8</flexmarkVersion> + <flexmarkVersion>0.22.14</flexmarkVersion> <hibernateVersion>5.1.8.Final</hibernateVersion> <sl4jVersion>1.7.25</sl4jVersion> <swingXVersion>1.6.5-1</swingXVersion> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7db715e98330c7641ab4888518d… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7db715e98330c7641ab4888518d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ready to next release
by Tony CHEMIT 19 Jul '17

19 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cdbcf0be by Tony CHEMIT at 2017-07-19T13:52:19+02:00 Ready to next release - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>15</version> + <version>16</version> </parent> <groupId>fr.ird.observe</groupId> @@ -174,8 +174,8 @@ <eugenePluginVersion>3.0-alpha-11</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <jaxxVersion>3.0-alpha-8-SNAPSHOT</jaxxVersion> - <nuitonI18nVersion>4.0-alpha-3-SNAPSHOT</nuitonI18nVersion> + <jaxxVersion>3.0-alpha-8</jaxxVersion> + <nuitonI18nVersion>4.0-alpha-3</nuitonI18nVersion> <nuitonConfigVersion>3.2</nuitonConfigVersion> <topiaVersion>3.2.1</topiaVersion> <nuitonValidatorVersion>3.1</nuitonValidatorVersion> @@ -393,16 +393,6 @@ <artifactId>i18n-editor</artifactId> <version>${nuitonI18nVersion}</version> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime</artifactId> - </exclusion> - <exclusion> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-widgets-file</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> @@ -417,12 +407,6 @@ <artifactId>jaxx-runtime</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/cdbcf0bebd131dcba72c9cf9cfa… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/cdbcf0bebd131dcba72c9cf9cfa… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Use http 1.0.1
by Tony CHEMIT 19 Jul '17

19 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 010f9e17 by Tony Chemit at 2017-07-19T02:12:24+02:00 Use http 1.0.1 - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -182,7 +182,7 @@ <nuitonUtilsVersion>3.0-rc-18</nuitonUtilsVersion> <nuitonConverterVersion>1.0</nuitonConverterVersion> <nuitonVersionVersion>1.0-rc-2</nuitonVersionVersion> - <httpVersion>1.0.1-SNAPSHOT</httpVersion> + <httpVersion>1.0.1</httpVersion> <xworkVersion>2.3.33</xworkVersion> <flexmarkVersion>0.22.8</flexmarkVersion> <hibernateVersion>5.1.8.Final</hibernateVersion> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/010f9e171904cdd2a72d80f3123… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/010f9e171904cdd2a72d80f3123… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe :: Pom
by Tony CHEMIT 19 Jul '17

19 Jul '17

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: fc518fa3 by 166231 at 2017-07-19T00:09:15+00:00 Site checkin for project ObServe :: Pom - - - - - 10 changed files: - administration-web.html - + aggregate-third-party-report.html - architecture-logicielle.html - changelog.html - changes-report.html - config-report.html - dependency-convergence.html - dependency-info.html - dependency-management.html - dependency-updates-report.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/fc518fa3acd8ffd2443d26b8ede… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/fc518fa3acd8ffd2443d26b8ede… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] improve site build [skip ci]
by Tony CHEMIT 19 Jul '17

19 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5d88185a by Tony Chemit at 2017-07-19T02:00:24+02:00 improve site build [skip ci] - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,7 +45,7 @@ stages: .deploy_site: &deploy_site script: - - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/clean install/' | bash + - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/clean install -DskipTests/' | bash - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/site -DperformRelease scm-publish:publish-scm/' | bash .deploy_demo_latest: &deploy_demo_latest View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5d88185a18baece5f79fd8874ec… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/5d88185a18baece5f79fd8874ec… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: optimize dependencies
by Tony CHEMIT 18 Jul '17

18 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 34740916 by Tony Chemit at 2017-07-19T01:40:13+02:00 optimize dependencies - - - - - 9ec91009 by Tony Chemit at 2017-07-19T01:41:56+02:00 Optimize license headers - - - - - 16 changed files: - application-web/pom.xml - application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java - application-web/src/main/java/fr/ird/observe/application/web/controller/ObserveWebMotionController.java - application-web/src/test/resources/log4j.properties - services-rest/pom.xml - services-runner/pom.xml - services-runner/src/main/resources/validators.xml - services-topia/pom.xml - services/src/main/java/fr/ird/observe/services/FormRequestDefinitionProvider.java - services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java - services/src/main/java/fr/ird/observe/services/ReferenceSetDefinitionProvider.java - services/src/main/java/fr/ird/observe/services/gson/ObserveDataSourceConfigurationAdapter.java - services/src/main/java/fr/ird/observe/services/gson/ObserveDataSourceConnectionAdapter.java - services/src/test/java/fr/ird/observe/services/FormRequestDefinitionProviderTest.java - services/src/test/java/fr/ird/observe/services/ObserveDtoInitializerTest.java - services/src/test/java/fr/ird/observe/services/ReferenceSetDefinitionProviderTest.java Changes: ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -103,6 +103,11 @@ <artifactId>nuiton-converter</artifactId> </dependency> + <dependency> + <groupId>io.ultreia.java4all.http</groupId> + <artifactId>http-api</artifactId> + </dependency> +  <dependency> <groupId>org.debux.webmotion</groupId> ===================================== application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java ===================================== --- a/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java @@ -43,7 +43,7 @@ import org.debux.webmotion.server.call.ServerContext; import org.debux.webmotion.server.mapping.Mapping; /** - * @author Tony Chemit - tchemit(a)codelutin.com + * @author Tony Chemit - dev(a)tchemit.fr */ public class ObserveWebApplicationListener implements WebMotionServerListener { ===================================== application-web/src/main/java/fr/ird/observe/application/web/controller/ObserveWebMotionController.java ===================================== --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/ObserveWebMotionController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/ObserveWebMotionController.java @@ -29,7 +29,7 @@ import fr.ird.observe.application.web.security.ObserveWebSecurityApplicationCont import org.debux.webmotion.server.WebMotionController; /** - * @author Tony Chemit - tchemit(a)codelutin.com + * @author Tony Chemit - dev(a)tchemit.fr */ public abstract class ObserveWebMotionController extends WebMotionController { ===================================== application-web/src/test/resources/log4j.properties ===================================== --- a/application-web/src/test/resources/log4j.properties +++ b/application-web/src/test/resources/log4j.properties @@ -1,6 +1,6 @@ ### # #%L -# ObServe :: Services REST Implementation +# ObServe :: Application Web # %% # Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io # %% ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -62,10 +62,6 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> @@ -74,6 +70,11 @@ <artifactId>gson</artifactId> </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </dependency> +  <dependency> <groupId>org.nuiton</groupId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -81,6 +81,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> <dependency> <groupId>org.reflections</groupId> ===================================== services-runner/src/main/resources/validators.xml ===================================== --- a/services-runner/src/main/resources/validators.xml +++ b/services-runner/src/main/resources/validators.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>  + </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>topia-extension</artifactId> ===================================== services/src/main/java/fr/ird/observe/services/FormRequestDefinitionProvider.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/FormRequestDefinitionProvider.java +++ b/services/src/main/java/fr/ird/observe/services/FormRequestDefinitionProvider.java @@ -1,5 +1,27 @@ package fr.ird.observe.services; +/*- + * #%L + * ObServe :: Services + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.ImmutableMap; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.form.FormRequestDefinition; ===================================== services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java +++ b/services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java @@ -1,5 +1,27 @@ package fr.ird.observe.services; +/*- + * #%L + * ObServe :: Services + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import fr.ird.observe.common.constants.GearType; ===================================== services/src/main/java/fr/ird/observe/services/ReferenceSetDefinitionProvider.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/ReferenceSetDefinitionProvider.java +++ b/services/src/main/java/fr/ird/observe/services/ReferenceSetDefinitionProvider.java @@ -1,5 +1,27 @@ package fr.ird.observe.services; +/*- + * #%L + * ObServe :: Services + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.ImmutableMap; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; ===================================== services/src/main/java/fr/ird/observe/services/gson/ObserveDataSourceConfigurationAdapter.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/gson/ObserveDataSourceConfigurationAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/ObserveDataSourceConfigurationAdapter.java @@ -2,7 +2,7 @@ package fr.ird.observe.services.gson; /* * #%L - * ObServe :: Services REST Implementation + * ObServe :: Services * %% * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io * %% ===================================== services/src/main/java/fr/ird/observe/services/gson/ObserveDataSourceConnectionAdapter.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/gson/ObserveDataSourceConnectionAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/ObserveDataSourceConnectionAdapter.java @@ -2,7 +2,7 @@ package fr.ird.observe.services.gson; /* * #%L - * ObServe :: Services REST Implementation + * ObServe :: Services * %% * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io * %% ===================================== services/src/test/java/fr/ird/observe/services/FormRequestDefinitionProviderTest.java ===================================== --- a/services/src/test/java/fr/ird/observe/services/FormRequestDefinitionProviderTest.java +++ b/services/src/test/java/fr/ird/observe/services/FormRequestDefinitionProviderTest.java @@ -1,5 +1,27 @@ package fr.ird.observe.services; +/*- + * #%L + * ObServe :: Services + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import org.junit.Assert; @@ -31,4 +53,4 @@ public class FormRequestDefinitionProviderTest { } -} \ No newline at end of file +} ===================================== services/src/test/java/fr/ird/observe/services/ObserveDtoInitializerTest.java ===================================== --- a/services/src/test/java/fr/ird/observe/services/ObserveDtoInitializerTest.java +++ b/services/src/test/java/fr/ird/observe/services/ObserveDtoInitializerTest.java @@ -1,5 +1,27 @@ package fr.ird.observe.services; +/*- + * #%L + * ObServe :: Services + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.services.dto.referential.ReferentialHelper; import org.junit.Assert; import org.junit.Test; @@ -20,4 +42,4 @@ public class ObserveDtoInitializerTest { public void testReferentialTypes() { Assert.assertEquals(ReferentialHelper.REFERENCE_DTOS.size(), ObserveDtoInitializer.INSTANCE.getReferentialTypes().size()); } -} \ No newline at end of file +} ===================================== services/src/test/java/fr/ird/observe/services/ReferenceSetDefinitionProviderTest.java ===================================== --- a/services/src/test/java/fr/ird/observe/services/ReferenceSetDefinitionProviderTest.java +++ b/services/src/test/java/fr/ird/observe/services/ReferenceSetDefinitionProviderTest.java @@ -1,5 +1,27 @@ package fr.ird.observe.services; +/*- + * #%L + * ObServe :: Services + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import org.junit.Assert; @@ -40,4 +62,4 @@ public class ReferenceSetDefinitionProviderTest { } -} \ No newline at end of file +} View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/69b0281e783f4784df49d922c3… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/69b0281e783f4784df49d922c3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Review design of ReferenceSetDefinition and FormRequestDefinition (adapt for ui) (Closes #793)
by Tony CHEMIT 18 Jul '17

18 Jul '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 69b0281e by Tony Chemit at 2017-07-19T01:32:03+02:00 Review design of ReferenceSetDefinition and FormRequestDefinition (adapt for ui) (Closes #793) - - - - - 8 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java - services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java - services/src/test/java/fr/ird/observe/services/FormRequestDefinitionProviderTest.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/RunObserve.java @@ -21,14 +21,10 @@ */ package fr.ird.observe.application.swing; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import java.util.Arrays; import java.util.Date; - - -import static org.nuiton.i18n.I18n.n; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * Pour lancer le client swing {@code ObServe} en mode administrateur. @@ -57,10 +53,4 @@ public class RunObserve extends ObserveRunner { new RunObserve(args).launch(); } - static { - //TODO Apply this modification in jaxx project - n("jaxx.common.latitude"); - } - - } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java @@ -445,7 +445,7 @@ public class ContentUIInitializer<E extends IdDto, UI extends ContentUI<E, UI>> log.debug("init list for " + beanList.getBeanType()); Class dtoClass = getDtoClass(beanList); - + beanList.setBeanType(dtoClass); if (ReferentialDto.class.isAssignableFrom(dtoClass)) { prepareReferentialFilterableDoubleList(dtoClass, beanList); } else { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java @@ -317,9 +317,9 @@ public abstract class ContentUIModel<E extends IdDto> extends AbstractSerializab } private <R extends ReferentialDto> ReferentialReferenceSet<R> getReferentialReferenceSet(String propertyName) { - ImmutableMap<String, ReferentialReferenceSet<?>> referenceSet = this.referentialReferenceSetsByPropertyName; + ReferentialReferenceSet<?> referenceSet = this.referentialReferenceSetsByPropertyName.get(propertyName); Objects.requireNonNull(referenceSet, "Could not find referantialRefenceSet named " + propertyName); - return (ReferentialReferenceSet<R>) referenceSet.get(propertyName); + return (ReferentialReferenceSet<R>) referenceSet; } public <R extends DataDto> DataReferenceSet<R> getDataReferenceSet(String propertyName) { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx @@ -182,7 +182,7 @@ <JLabel id='currentDirectionLabel'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <NumberEditor id='currentDirection' constructorParams='this' styleClass="float3"/> + <NumberEditor id='currentDirection' constructorParams='this' styleClass="int6"/> </cell> </row> <row> ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx @@ -161,7 +161,7 @@ <JLabel id='meanLengthLabel'/> </cell> <cell weightx='1'> - <NumberEditor id='meanLength' constructorParams='this' styleClass="int6"/> + <NumberEditor id='meanLength' constructorParams='this' styleClass="float2"/> </cell> <cell anchor='east'> <JToolBar id='meanLengthComputedAction'> ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java @@ -28,14 +28,17 @@ import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIModel; import fr.ird.observe.application.swing.ui.content.table.ObserveContentTableUI; import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; +import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.seine.NonTargetLengthDto; import fr.ird.observe.services.dto.seine.NonTargetLengthHelper; import fr.ird.observe.services.dto.seine.NonTargetSampleDto; - import java.util.Arrays; import java.util.Collection; import java.util.List; +import java.util.Optional; +import java.util.Set; /** * Created on 9/26/14. @@ -121,4 +124,14 @@ public class NonTargetSampleUIModel extends ContentTableUIModel<NonTargetSampleD this.defaultSizeMeasureType = defaultSizeMeasureType; firePropertyChange(PROPERTY_DEFAULT_SIZE_MEASURE_TYPE, oldValue, defaultSizeMeasureType); } + + @Override + public <R extends ReferentialDto> Optional<Set<ReferentialReference<R>>> tryToGetReferentialReferenceSet(String propertyName) { + ReferentialReferenceSet<R> referenceSet = (ReferentialReferenceSet) this.referentialReferenceSetsByPropertyName.get(propertyName); + Set<ReferentialReference<R>> references = null; + if (referenceSet != null) { + references = referenceSet.getReferences(); + } + return Optional.ofNullable(references); + } } ===================================== services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java +++ b/services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java @@ -1584,19 +1584,19 @@ class ObserveDtoInitializer { @Override public void initActivityLonglineEncounterDto() { - FormRequestDefinition<EncounterDto> definition = flushData(formBuilder(EncounterDto.class) - .addKey(EncounterDto.PROPERTY_ENCOUNTER_TYPE, referenceSetDefinition(EncounterTypeDto.class)) - .addKey(EncounterDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class))); - formDefinitionBuilder.put(ActivityLonglineEncounterDto.class.getName(), definition); + flushData(formBuilder(EncounterDto.class) + .addKey(EncounterDto.PROPERTY_ENCOUNTER_TYPE, referenceSetDefinition(EncounterTypeDto.class)) + .addKey(EncounterDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)), + ActivityLonglineEncounterDto.class); } @Override public void initActivityLonglineSensorUsedDto() { - FormRequestDefinition<SensorUsedDto> definition = flushData(formBuilder(SensorUsedDto.class) - .addKey(SensorUsedDto.PROPERTY_SENSOR_TYPE, referenceSetDefinition(SensorTypeDto.class)) - .addKey(SensorUsedDto.PROPERTY_SENSOR_BRAND, referenceSetDefinition(SensorBrandDto.class)) - .addKey(SensorUsedDto.PROPERTY_SENSOR_DATA_FORMAT, referenceSetDefinition(SensorDataFormatDto.class))); - formDefinitionBuilder.put(ActivityLonglineSensorUsedDto.class.getName(), definition); + flushData(formBuilder(SensorUsedDto.class) + .addKey(SensorUsedDto.PROPERTY_SENSOR_TYPE, referenceSetDefinition(SensorTypeDto.class)) + .addKey(SensorUsedDto.PROPERTY_SENSOR_BRAND, referenceSetDefinition(SensorBrandDto.class)) + .addKey(SensorUsedDto.PROPERTY_SENSOR_DATA_FORMAT, referenceSetDefinition(SensorDataFormatDto.class)), + ActivityLonglineSensorUsedDto.class); } @Override @@ -1642,7 +1642,8 @@ class ObserveDtoInitializer { .addKey(CatchLonglineDto.PROPERTY_MATURITY_STATUS, referenceSetDefinition(MaturityStatusDto.class)) .addKey(SizeMeasureDto.PROPERTY_SIZE_MEASURE_TYPE, referenceSetDefinition(SizeMeasureTypeDto.class)) .addKey(WeightMeasureDto.PROPERTY_WEIGHT_MEASURE_TYPE, referenceSetDefinition(WeightMeasureTypeDto.class)) - .addKey(BranchlineDto.PROPERTY_BAIT_HAULING_STATUS, referenceSetDefinition(BaitHaulingStatusDto.class))); + .addKey(BranchlineDto.PROPERTY_BAIT_HAULING_STATUS, referenceSetDefinition(BaitHaulingStatusDto.class)), + SetLonglineCatchDto.class); } @Override @@ -1657,7 +1658,8 @@ class ObserveDtoInitializer { public void initGearUseFeaturesLonglineDto() { flushData(formBuilder(GearUseFeaturesLonglineDto.class) .addKey(GearUseFeaturesLonglineDto.PROPERTY_GEAR, referenceSetDefinition(GearDto.class)) - .addKey(GearUseFeaturesMeasurementLonglineDto.PROPERTY_GEAR_CARACTERISTIC, referenceSetDefinition(GearCaracteristicDto.class))); + .addKey(GearUseFeaturesMeasurementLonglineDto.PROPERTY_GEAR_CARACTERISTIC, referenceSetDefinition(GearCaracteristicDto.class)), + TripLonglineGearUseDto.class); } @Override @@ -1732,7 +1734,8 @@ class ObserveDtoInitializer { .addKey(TdrDto.PROPERTY_SENSOR_BRAND, referenceSetDefinition(SensorBrandDto.class)) .addKey(TdrDto.PROPERTY_ITEM_HORIZONTAL_POSITION, referenceSetDefinition(ItemHorizontalPositionDto.class)) .addKey(TdrDto.PROPERTY_ITEM_VERTICAL_POSITION, referenceSetDefinition(ItemVerticalPositionDto.class)) - .addKey(TdrDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class))); + .addKey(TdrDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)), + SetLonglineTdrDto.class); } @Override @@ -1827,7 +1830,8 @@ class ObserveDtoInitializer { public void initGearUseFeaturesSeineDto() { flushData(formBuilder(GearUseFeaturesSeineDto.class) .addKey(GearUseFeaturesSeineDto.PROPERTY_GEAR, referenceSetDefinition(GearDto.class)) - .addKey(GearUseFeaturesMeasurementSeineDto.PROPERTY_GEAR_CARACTERISTIC, referenceSetDefinition(GearCaracteristicDto.class))); + .addKey(GearUseFeaturesMeasurementSeineDto.PROPERTY_GEAR_CARACTERISTIC, referenceSetDefinition(GearCaracteristicDto.class)), + TripSeineGearUseDto.class); } @Override @@ -1835,7 +1839,8 @@ class ObserveDtoInitializer { flushData(formBuilder(NonTargetCatchDto.class) .addKey(NonTargetCatchDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)) .addKey(NonTargetCatchDto.PROPERTY_SPECIES_FATE, referenceSetDefinition(SpeciesFateDto.class)) - .addKey(NonTargetCatchDto.PROPERTY_REASON_FOR_DISCARD, referenceSetDefinition(ReasonForDiscardDto.class))); + .addKey(NonTargetCatchDto.PROPERTY_REASON_FOR_DISCARD, referenceSetDefinition(ReasonForDiscardDto.class)), + SetSeineNonTargetCatchDto.class); } @Override @@ -1843,7 +1848,8 @@ class ObserveDtoInitializer { flushData(formBuilder(NonTargetCatchReleaseDto.class) .addKey(NonTargetCatchReleaseDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)) .addKey(NonTargetCatchReleaseDto.PROPERTY_SEX, referenceSetDefinition(SexDto.class)) - .addKey(NonTargetCatchReleaseDto.PROPERTY_SPECIES_GROUP_RELEASE_MODE, referenceSetDefinition(SpeciesGroupReleaseModeDto.class))); + .addKey(NonTargetCatchReleaseDto.PROPERTY_SPECIES_GROUP_RELEASE_MODE, referenceSetDefinition(SpeciesGroupReleaseModeDto.class)), + SetSeineNonTargetCatchReleaseDto.class); } @Override @@ -1856,7 +1862,8 @@ class ObserveDtoInitializer { .addKey(NonTargetLengthDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)) .addKey(NonTargetLengthDto.PROPERTY_SPECIES_FATE, referenceSetDefinition(SpeciesFateDto.class)) .addKey(NonTargetLengthDto.PROPERTY_SEX, referenceSetDefinition(SexDto.class)) - .addKey(TargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE, referenceSetDefinition(SizeMeasureTypeDto.class))); + .addKey(TargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE, referenceSetDefinition(SizeMeasureTypeDto.class)), + NonTargetSampleDto.class); } @Override @@ -1867,13 +1874,15 @@ class ObserveDtoInitializer { public void initObjectObservedSpeciesDto() { flushData(formBuilder(ObjectObservedSpeciesDto.class) .addKey(ObjectObservedSpeciesDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)) - .addKey(ObjectObservedSpeciesDto.PROPERTY_SPECIES_STATUS, referenceSetDefinition(SpeciesStatusDto.class))); + .addKey(ObjectObservedSpeciesDto.PROPERTY_SPECIES_STATUS, referenceSetDefinition(SpeciesStatusDto.class)), + FloatingObjectObservedSpeciesDto.class); } @Override public void initObjectSchoolEstimateDto() { flushData(formBuilder(ObjectSchoolEstimateDto.class) - .addKey(ObjectObservedSpeciesDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class))); + .addKey(ObjectObservedSpeciesDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)), + FloatingObjectSchoolEstimateDto.class); } @Override @@ -1887,7 +1896,8 @@ class ObserveDtoInitializer { @Override public void initSchoolEstimateDto() { flushData(formBuilder(SchoolEstimateDto.class) - .addKey(SchoolEstimateDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class))); + .addKey(SchoolEstimateDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)), + SetSeineSchoolEstimateDto.class); } @Override @@ -1917,7 +1927,8 @@ class ObserveDtoInitializer { flushData(formBuilder(TargetCatchDto.class) .addKey(TargetCatchDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)) .addKey(TargetCatchDto.PROPERTY_REASON_FOR_DISCARD, referenceSetDefinition(ReasonForDiscardDto.class)) - .addKey(TargetCatchDto.PROPERTY_WEIGHT_CATEGORY, referenceSetDefinition(WeightCategoryDto.class))); + .addKey(TargetCatchDto.PROPERTY_WEIGHT_CATEGORY, referenceSetDefinition(WeightCategoryDto.class)), + SetSeineTargetCatchDto.class); } @Override @@ -1925,7 +1936,8 @@ class ObserveDtoInitializer { flushData(formBuilder(TargetLengthDto.class) .addKey(TargetLengthDto.PROPERTY_SPECIES, referenceSetDefinition(SpeciesDto.class)) .addKey(TargetLengthDto.PROPERTY_SEX, referenceSetDefinition(SexDto.class)) - .addKey(TargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE, referenceSetDefinition(SizeMeasureTypeDto.class))); + .addKey(TargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE, referenceSetDefinition(SizeMeasureTypeDto.class)), + TargetSampleDto.class); } @Override @@ -1938,7 +1950,8 @@ class ObserveDtoInitializer { flushData(formBuilder(TransmittingBuoyDto.class) .addKey(TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OPERATION, referenceSetDefinition(TransmittingBuoyOperationDto.class)) .addKey(TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_TYPE, referenceSetDefinition(TransmittingBuoyTypeDto.class)) - .addKey(TransmittingBuoyDto.PROPERTY_COUNTRY, referenceSetDefinition(CountryDto.class))); + .addKey(TransmittingBuoyDto.PROPERTY_COUNTRY, referenceSetDefinition(CountryDto.class)), + FloatingObjectTransmittingBuoyDto.class); } @Override @@ -1977,10 +1990,12 @@ class ObserveDtoInitializer { } - private <D extends DataDto> FormRequestDefinition<D> flushData(FormRequestDefinition.Builder<D> form) { + private <D extends DataDto> void flushData(FormRequestDefinition.Builder<D> form, Class<?>... extraMapping) { FormRequestDefinition<D> build = form.build(); formDefinitionBuilder.put(build.getType().getName(), build); - return build; + for (Class<?> aClass : extraMapping) { + formDefinitionBuilder.put(aClass.getName(), build); + } } private <D extends ReferentialDto> void flushReferential(FormRequestDefinition.Builder<D> form) { ===================================== services/src/test/java/fr/ird/observe/services/FormRequestDefinitionProviderTest.java ===================================== --- a/services/src/test/java/fr/ird/observe/services/FormRequestDefinitionProviderTest.java +++ b/services/src/test/java/fr/ird/observe/services/FormRequestDefinitionProviderTest.java @@ -22,7 +22,7 @@ public class FormRequestDefinitionProviderTest { provider.getDefinition(referentialType.getName()); } - Assert.assertEquals(92, provider.keys().size()); + Assert.assertEquals(105, provider.keys().size()); for (String referentialType : provider.keys()) { provider.getDefinition(referentialType); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/69b0281e783f4784df49d922c30… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/69b0281e783f4784df49d922c30… You're receiving this email because of your account on gitlab.com.

1 0