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

[Git][ultreiaio/ird-observe][develop-9] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-8.1' with...
by Tony CHEMIT (＠tchemit) 06 Jul '21

06 Jul '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 129b1071 by Tony Chemit at 2021-07-06T14:46:03+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-8.1' with non-snapshot versions[skip ci] - - - - - 74ba4baa by Tony Chemit at 2021-07-06T15:16:23+02:00 [jgitflow-maven-plugin]merging 'release/9.0.0-RC-8.1' into 'master-9' - - - - - 54155f64 by Tony Chemit at 2021-07-06T15:16:29+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - a80625f6 by Tony Chemit at 2021-07-06T15:16:30+02:00 [jgitflow-maven-plugin]merging 'master-9' into 'develop-9' - - - - - 3284d269 by Tony Chemit at 2021-07-06T15:16:31+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/37fcd9c6fdb13b9344dc4dde… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/37fcd9c6fdb13b9344dc4dde… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] [jgitflow-maven-plugin]updating poms for 9.0.0-RC-9.1-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 06 Jul '21

06 Jul '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 37fcd9c6 by Tony Chemit at 2021-07-06T14:44:48+02:00 [jgitflow-maven-plugin]updating poms for 9.0.0-RC-9.1-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/api/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/i18n/pom.xml - client/pom.xml - client/runner/pom.xml - models/definition/pom.xml - models/dto/java/pom.xml - models/dto/pom.xml - models/navigation/descriptor/pom.xml - models/navigation/id/pom.xml - models/navigation/pom.xml - models/navigation/tree/pom.xml - models/persistence/avdth/pom.xml - models/persistence/java/pom.xml - models/persistence/migration/pom.xml - models/persistence/pom.xml - models/persistence/test-api/pom.xml - models/persistence/test-impl/pom.xml - models/pom.xml - observe/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/37fcd9c6fdb13b9344dc4dde0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/37fcd9c6fdb13b9344dc4dde0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.0.0-RC-8.1
by Tony CHEMIT (＠tchemit) 06 Jul '21

06 Jul '21

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

1 0

[Git][ultreiaio/ird-observe][develop-9] add deploy profile at release time
by Tony CHEMIT (＠tchemit) 06 Jul '21

06 Jul '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 66cafa04 by Tony Chemit at 2021-07-06T14:44:13+02:00 add deploy profile at release time - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -519,7 +519,7 @@ <goal>release-finish</goal> </goals> <configuration> - <arguments>-DperformRelease -Drun-tck -Ddeploy</arguments> + <arguments>-DperformRelease -Pdeploy</arguments> </configuration> </execution> </executions> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/66cafa04cc357f90f3529b98c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/66cafa04cc357f90f3529b98c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 10 commits: fix type in template
by Tony CHEMIT (＠tchemit) 06 Jul '21

06 Jul '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 70c4364f by Tony Chemit at 2021-07-06T08:01:14+02:00 fix type in template - - - - - c0455a75 by Tony Chemit at 2021-07-06T10:23:01+02:00 Changement de la notation pointée vers une notation souligné bas pour les noms de filtre - Closes ultreiaio/ird-observe#1946 - - - - - c094d019 by Tony Chemit at 2021-07-06T10:23:01+02:00 move to version RC-8.1 - - - - - dabbb937 by Tony Chemit at 2021-07-06T14:42:05+02:00 update pom - - - - - a199207b by Tony Chemit at 2021-07-06T14:42:05+02:00 Improve where to push releases - - - - - bc379179 by Tony Chemit at 2021-07-06T14:42:05+02:00 Les erreurs lors de l'extraction et import AVDTH sont silencieuses - Closes #1948 - - - - - 74425321 by Tony Chemit at 2021-07-06T14:42:05+02:00 Améliorer l'opération d'export de données (la partie calcul de référentiels manquants) - See #1949 - - - - - 9053bcce by Tony Chemit at 2021-07-06T14:42:05+02:00 Certaines méthodes de services doivent être passée en POST - Closes #1950 - - - - - 11166046 by Tony Chemit at 2021-07-06T14:42:05+02:00 Améliorer l'opération d'export de données (la partie calcul de référentiels manquants) - See #1949 - - - - - 1313abf1 by Tony Chemit at 2021-07-06T14:42:46+02:00 Amélioration onglet sauvegarde (Actions longues) - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/save/SaveLocalModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/save/SaveLocalUI.jcss - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/save/SaveLocalUIHandler.java - client/datasource/api/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/i18n/templates/StorageUIModel_es_ES.ftl - client/datasource/editor/api/src/main/i18n/templates/StorageUIModel_fr_FR.ftl - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/Extract.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/Import.java - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/i18n/pom.xml - client/pom.xml - client/runner/pom.xml - models/definition/pom.xml - models/dto/java/pom.xml - models/dto/pom.xml - models/navigation/descriptor/pom.xml - models/navigation/id/pom.xml - models/navigation/pom.xml - models/navigation/tree/pom.xml - models/persistence/avdth/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/87c047a185351b21a6171eff… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/87c047a185351b21a6171eff… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] Marées non trouvées lors de l'import AVDTH - Closes #1945
by Tony CHEMIT (＠tchemit) 06 Jul '21

06 Jul '21

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 87c047a1 by Tony Chemit at 2021-07-06T07:46:13+02:00 Marées non trouvées lors de l'import AVDTH - Closes #1945 - - - - - 3 changed files: - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportEngine.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/AvdthReferentialImportContext.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/OceanInterceptor.java Changes: ===================================== models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportEngine.java ===================================== @@ -206,8 +206,8 @@ public class ImportEngine implements Closeable { long time0 = TimeLog.getTime(); try (DataTables tables = new DataTables(getConn())) { - int tripCount = tables.tripTableReader.tableReadCount(); - getConfiguration().incrementsProgression(String.format("Détection de %d marée(s).", tripCount)); + @SuppressWarnings("SpellCheckingInspection") int tripCount = tablesReadCount.get("MAREE"); + getConfiguration().incrementsProgression(String.format("%d detected trip(s).", tripCount)); getConfiguration().getProgressionModel().setValue(0); getConfiguration().getProgressionModel().setMaximum(tripCount); read(tables); ===================================== models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/AvdthReferentialImportContext.java ===================================== @@ -29,6 +29,7 @@ import fr.ird.observe.entities.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.referential.ReferentialEntity; import fr.ird.observe.entities.referential.common.DataQuality; import fr.ird.observe.entities.referential.common.LengthMeasureMethod; +import fr.ird.observe.entities.referential.common.Ocean; import fr.ird.observe.entities.referential.common.Program; import fr.ird.observe.entities.referential.common.SizeMeasureType; import fr.ird.observe.entities.referential.common.WeightMeasureMethod; @@ -142,6 +143,7 @@ public class AvdthReferentialImportContext implements Closeable { result.setSpecies(new LinkedList<>()); result.setHarbour(new LinkedList<>()); try (ObserveTopiaPersistenceContext persistenceContext = getPersistenceApplicationContext().newPersistenceContext()) { + prepare(Ocean.SPI, persistenceContext, result::setOcean); prepare(WellContentStatus.SPI, persistenceContext, result::setWellContentStatus); prepare(Program.SPI, persistenceContext, result::setProgram); prepare(DataQuality.SPI, persistenceContext, result::setDataQuality); ===================================== models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/OceanInterceptor.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.persistence.avdth.referential.interceptors; */ import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; import fr.ird.observe.dto.referential.ReferenceStatus; import fr.ird.observe.entities.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.referential.common.Ocean; @@ -143,6 +144,8 @@ public class OceanInterceptor extends ReferentialInterceptor<Ocean, OceanSpi> { @Override public void consume(AvdthReferentialImportResult result, List<Ocean> newList) { - result.setOcean(newList); + List<Ocean> existing = result.getOcean(); + Map<String, Ocean> byCode = new TreeMap<>(Maps.uniqueIndex(existing, Ocean::getCode)); + newList.stream().filter(entity -> !byCode.containsKey(entity.getCode())).forEach(existing::add); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/87c047a185351b21a6171eff1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/87c047a185351b21a6171eff1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/9.0.0-RC-8
by Tony CHEMIT (＠tchemit) 05 Jul '21

05 Jul '21

Tony CHEMIT deleted branch release/9.0.0-RC-8 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v9.0.0-RC-8
by Tony CHEMIT (＠tchemit) 05 Jul '21

05 Jul '21

Tony CHEMIT pushed new tag v9.0.0-RC-8 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/v9.0.0-RC-8 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/9.0.0-RC-8] [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-8' with...
by Tony CHEMIT (＠tchemit) 05 Jul '21

05 Jul '21

Tony CHEMIT pushed to branch release/9.0.0-RC-8 at ultreiaio / ird-observe Commits: 496c2b1b by Tony Chemit at 2021-07-05T18:41:55+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-8' with non-snapshot versions[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/api/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/i18n/pom.xml - client/pom.xml - client/runner/pom.xml - models/definition/pom.xml - models/dto/java/pom.xml - models/dto/pom.xml - models/navigation/descriptor/pom.xml - models/navigation/id/pom.xml - models/navigation/pom.xml - models/navigation/tree/pom.xml - models/persistence/avdth/pom.xml - models/persistence/java/pom.xml - models/persistence/migration/pom.xml - models/persistence/pom.xml - models/persistence/test-api/pom.xml - models/persistence/test-impl/pom.xml - models/pom.xml - observe/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/496c2b1b906ee5275661514ea… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/496c2b1b906ee5275661514ea… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master-9] 21 commits: [jgitflow-maven-plugin]updating poms for 9.0.0-RC-8-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 05 Jul '21

05 Jul '21

Tony CHEMIT pushed to branch master-9 at ultreiaio / ird-observe Commits: f6ea135c by Tony Chemit at 2021-07-01T17:18:35+02:00 [jgitflow-maven-plugin]updating poms for 9.0.0-RC-8-SNAPSHOT development[skip ci] - - - - - 1cfdba93 by Tony Chemit at 2021-07-01T17:47:07+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - a4a7ab27 by Tony Chemit at 2021-07-01T17:47:08+02:00 [jgitflow-maven-plugin]merging 'master-9' into 'develop-9' - - - - - a061a944 by Tony Chemit at 2021-07-01T17:47:09+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 1efa77d2 by Tony Chemit at 2021-07-02T17:27:57+02:00 Ajout de nouveaux services pour récupérer l'ensemble du référentiel - Closes #1937 - - - - - 997d9a83 by Tony Chemit at 2021-07-02T17:27:57+02:00 Ultimate bug sur un GET - Closes #1936 - - - - - d3c4b776 by Tony Chemit at 2021-07-02T17:42:30+02:00 update pom and toolkit - - - - - 742fc034 by Tony Chemit at 2021-07-04T07:22:22+02:00 Comment configurer le type d'accès d'un compte utilisateur ? - Closes #1941 - - - - - b2a9ab74 by Tony Chemit at 2021-07-04T12:54:47+02:00 Captures logbook avec espèce de type Appât - See #1883 - - - - - 83430141 by Tony Chemit at 2021-07-05T15:01:23+02:00 Improve EntityTransformer (do not generate toDto and fromDto method inside entity) - See ultreiaio/ird-observe-toolkit#82 Mises aux points sur le nouveau système de saisie de données - Closes #1942 - - - - - 782c71ac by Tony Chemit at 2021-07-05T15:01:23+02:00 Correction taille des icones sur le site. - - - - - d0f35e63 by Tony Chemit at 2021-07-05T15:01:23+02:00 update maven version - - - - - 30683819 by Tony Chemit at 2021-07-05T15:01:23+02:00 Info type de validation sur service Information - Closes #1943 - - - - - bd879098 by Tony Chemit at 2021-07-05T16:28:58+02:00 Exemples d'URL sur services (et erreurs) - See ultreiaio/ird-observe#1944 - - - - - bbb75650 by Tony Chemit at 2021-07-05T16:30:07+02:00 update pom - - - - - 1d032111 by Tony Chemit at 2021-07-05T18:18:19+02:00 minor bug on survey save - - - - - e3da4b07 by Tony Chemit at 2021-07-05T18:18:39+02:00 minor bug on ps logbook activity ui - - - - - d2e55b17 by Tony Chemit at 2021-07-05T18:35:06+02:00 minor bug on ps localmarket sample well validation - - - - - e2c9e860 by Tony Chemit at 2021-07-05T18:35:19+02:00 add fixme on some decorator - - - - - 496c2b1b by Tony Chemit at 2021-07-05T18:41:55+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-8' with non-snapshot versions[skip ci] - - - - - 733764eb by Tony Chemit at 2021-07-05T19:04:56+02:00 [jgitflow-maven-plugin]merging 'release/9.0.0-RC-8' into 'master-9' - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/api/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUI.jcss - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUI.jcss - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/i18n/pom.xml - client/i18n/src/main/i18n/translations/observe_en_GB.properties - client/i18n/src/main/i18n/translations/observe_es_ES.properties - client/i18n/src/main/i18n/translations/observe_fr_FR.properties - client/pom.xml - client/runner/pom.xml - models/definition/pom.xml - models/definition/src/main/models/Observe/persistence/attribute/hibernateAttributeType.java.util.Date.properties - models/dto/java/pom.xml - models/dto/java/src/main/java/fr/ird/observe/dto/data/ps/localmarket/SampleDto.java - models/dto/java/src/main/java/fr/ird/observe/dto/decoration/init/DataPsLocalmarketModelDecoratorInitializer.java - models/dto/pom.xml - models/navigation/descriptor/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a4659271df0ad19dbab97798… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a4659271df0ad19dbab97798… You're receiving this email because of your account on gitlab.com.

1 0