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

[Git][ultreiaio/ird-observe][develop-7.x] [jgitflow-maven-plugin]updating poms for 7.6.15-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 29 Jul '22

29 Jul '22

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 03bf0649 by Tony Chemit at 2022-07-29T15:18:23+02:00 [jgitflow-maven-plugin]updating poms for 7.6.15-SNAPSHOT development[skip ci] - - - - - 22 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - common-dto/pom.xml - common-persistence/pom.xml - common-service/pom.xml - common-validation/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - templates/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.14-SNAPSHOT</version> + <version>7.6.15-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.14-SNAPSHOT</version> + <version>7.6.15-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.14-SNAPSHOT</version> + <version>7.6.15-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== common-dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.14-SNAPSHOT</version> + <version>7.6.15-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-persistence/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.14-SNAPSHOT</version> + <version>7.6.15-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-service/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.14-SNAPSHOT</version> + <version>7.6.15-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-validation/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.14-SNAPSHOT</version> + <version>7.6.15-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.14-SNAPSHOT</version> + <version>7.6.15-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.14-SNAPSHOT</version> + <version>7.6.15-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.14-SNAPSHOT</version> + <version>7.6.15-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.14-SNAPSHOT</version> + <version>7.6.15-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -29,7 +29,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.14-SNAPSHOT</version> + <version>7.6.15-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.14-SNAPSHOT</version> + <version>7.6.15-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> @@ -118,7 +118,7 @@ <dependency> <groupId>fr.ird.observe</groupId> <artifactId>services</artifactId> - <version>7.6.14-SNAPSHOT</version> + <version>7.6.15-SNAPSHOT</version> <scope>compile</scope> </dependency> ===================================== server-core/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.14-SNAPSHOT</version> + <version>7.6.15-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.14-SNAPSHOT</version> + <version>7.6.15-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.14-SNAPSHOT</version> + <version>7.6.15-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.14-SNAPSHOT</version> + <version>7.6.15-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.14-SNAPSHOT</version> + <version>7.6.15-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== templates/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.14-SNAPSHOT</version> + <version>7.6.15-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== test/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.14-SNAPSHOT</version> + <version>7.6.15-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.14-SNAPSHOT</version> + <version>7.6.15-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== validation/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.14-SNAPSHOT</version> + <version>7.6.15-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/03bf0649acd70a0b7b6426062… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/03bf0649acd70a0b7b6426062… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.6.14
by Tony CHEMIT (＠tchemit) 29 Jul '22

29 Jul '22

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

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Faux positifs détectés dans la synchronisation de référentiels sur les...
by Tony CHEMIT (＠tchemit) 29 Jul '22

29 Jul '22

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: f69f297f by Tony Chemit at 2022-07-29T14:50:11+02:00 Faux positifs détectés dans la synchronisation de référentiels sur les associations multiples - Closes #2424 - - - - - 1 changed file: - persistence/src/main/models/Observe.model Changes: ===================================== persistence/src/main/models/Observe.model ===================================== @@ -155,7 +155,7 @@ catchFateLongline {*:1} referentiel.longline.CatchFateLongline | dbName=catchFat discardHealthStatus {*:1} referentiel.longline.HealthStatus sizeMeasure + {*} longline.SizeMeasure | reverseDbName=catch orderBy=topiaCreateDate speciesCatch {*:1} referentiel.Species -predator {*:*} referentiel.Species | manyToManyTableName=catch_predator reverseDbName=catch +predator {*:*} referentiel.Species | manyToManyTableName=catch_predator reverseDbName=catch orderBy=faoCode section {*:0..1} longline.Section maturityStatus {*:0..1} referentiel.longline.MaturityStatus stomachFullness {*:0..1} referentiel.longline.StomachFullness @@ -252,7 +252,7 @@ catchLongline + {*} longline.CatchLongline | ordered reverseDbName=set lineType {*:0..1} referentiel.longline.LineType lightsticksType {*:0..1} referentiel.longline.LightsticksType lightsticksColor {*:0..1} referentiel.longline.LightsticksColor -mitigationType:set {*:*} referentiel.longline.MitigationType | manyToManyTableName=mitigationtype_set reverseDbName=set +mitigationType:set {*:*} referentiel.longline.MitigationType | manyToManyTableName=mitigationtype_set reverseDbName=set orderBy=code branchlinesComposition + {*} longline.BranchlinesComposition | reverseDbName=set orderBy=topiaCreateDate getSettingStartTime() Date getSettingStartDate() Date @@ -314,7 +314,7 @@ medianFishingDepth + {*:1} Float branchline {*:0..1} longline.Branchline tdrRecord + {*} longline.TdrRecord | orderBy=topiaCreateDate sensorBrand {*:0..1} referentiel.longline.SensorBrand -species {*:*} referentiel.Species +species {*:*} referentiel.Species | orderBy=faoCode section {*:0..1} longline.Section basket {*:0..1} longline.Basket itemHorizontalPosition {*:0..1} referentiel.longline.ItemHorizontalPosition @@ -497,12 +497,12 @@ maxWeight + {*:1} Float | sqlType=numeric sizeMeasureType {*:0..1} referentiel.SizeMeasureType referentiel.SpeciesGroup > referentiel.I18nReferentialEntity | entity -speciesGroupReleaseMode {*:*} referentiel.SpeciesGroupReleaseMode | unique lazy=false orderBy=code +speciesGroupReleaseMode {*:*} referentiel.SpeciesGroupReleaseMode | unique lazy=false orderBy=topiaId referentiel.SpeciesGroupReleaseMode > referentiel.I18nReferentialEntity | entity referentiel.SpeciesList > referentiel.I18nReferentialEntity | entity -species {*:+} referentiel.Species | lazy=false +species {*:+} referentiel.Species | lazy=false orderBy=faoCode referentiel.Vessel > referentiel.I18nReferentialEntity | entity vesselSizeCategory {*:1} referentiel.VesselSizeCategory | lazy=false @@ -655,7 +655,7 @@ wind {*:0..1} referentiel.seine.Wind detectionMode {*:0..1} referentiel.seine.DetectionMode reasonForNoFishing {*:0..1} referentiel.seine.ReasonForNoFishing floatingObject + {*} seine.FloatingObject | unique reverseDbName=activity -observedSystem {*:*} referentiel.seine.ObservedSystem | unique manyToManyTableName=activity_observedSystem reverseDbName=activity +observedSystem {*:*} referentiel.seine.ObservedSystem | unique manyToManyTableName=activity_observedSystem reverseDbName=activity orderBy=code setSeine + {0..1} seine.SetSeine | dbName=set currentFpaZone {*:0..1} referentiel.FpaZone previousFpaZone {*:0..1} referentiel.FpaZone View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f69f297f8e93648bc0f60bde0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f69f297f8e93648bc0f60bde0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: Erreur calcul des données sur V9 - See #2423 (can also happen en v7)^^
by Tony CHEMIT (＠tchemit) 29 Jul '22

29 Jul '22

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: ab4772ca by Tony Chemit at 2022-07-29T14:21:55+02:00 Erreur calcul des données sur V9 - See #2423 (can also happen en v7)^^ - - - - - 45f8d489 by Tony Chemit at 2022-07-29T14:25:59+02:00 Nommage des fichiers de log - Closes #2149 - - - - - 3 changed files: - server-configuration/src/main/java/fr/ird/observe/server/configuration/ServerConfig.java - services/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataService.java - services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeService.java Changes: ===================================== server-configuration/src/main/java/fr/ird/observe/server/configuration/ServerConfig.java ===================================== @@ -37,6 +37,7 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.Objects; /** * La configuration de l'application web. @@ -71,9 +72,7 @@ public class ServerConfig extends GeneratedServerConfig implements CleanTemporar public void init(String... args) { - if (log.isInfoEnabled()) { - log.info("Starts to init ObServe server configuration..."); - } + log.info("Starts to init ObServe server configuration..."); try { get().parse(args); @@ -86,9 +85,7 @@ public class ServerConfig extends GeneratedServerConfig implements CleanTemporar if (isDevMode() && !baseDirectory.exists()) { // on utilise un répertoire temporaire comme basedir - if (log.isInfoEnabled()) { - log.info("Using a dev mode configuration."); - } + log.info("Using a dev mode configuration."); try { // Toujours s'assurer que le répertoire temporarie du système existe Path tmpdir = Paths.get(System.getProperty("java.io.tmpdir")); @@ -100,9 +97,7 @@ public class ServerConfig extends GeneratedServerConfig implements CleanTemporar } catch (IOException e) { throw new ObserveWebApplicationConfigInitException("could not create temporary basedir", e); } - if (log.isInfoEnabled()) { - log.info("Dev mode detected, use temporary basedir: " + baseDirectory); - } + log.info("Dev mode detected, use temporary basedir: " + baseDirectory); setBaseDirectory(baseDirectory); } @@ -125,12 +120,10 @@ public class ServerConfig extends GeneratedServerConfig implements CleanTemporar File databasesConfigurationFile = getDatabasesConfigurationFile(); if (!databasesConfigurationFile.exists()) { - if (log.isInfoEnabled()) { - log.info("Generate default databases.yml"); - } + log.info("Generate default databases.yml"); try { - CharSource charSource = Resources.asCharSource(getClass().getResource("/defaultDatabases.yml"), StandardCharsets.UTF_8); + CharSource charSource = Resources.asCharSource(Objects.requireNonNull(getClass().getResource("/defaultDatabases.yml")), StandardCharsets.UTF_8); Files.write(databasesConfigurationFile.toPath(), charSource.readLines()); } catch (IOException e) { throw new ObserveWebApplicationConfigInitException("Impossible de créer un fichier de configuration des bases", e); @@ -140,11 +133,9 @@ public class ServerConfig extends GeneratedServerConfig implements CleanTemporar File usersConfigurationFile = getUsersConfigurationFile(); if (!usersConfigurationFile.exists()) { - if (log.isInfoEnabled()) { - log.info("Generate default users.yml"); - } + log.info("Generate default users.yml"); try { - CharSource charSource = Resources.asCharSource(getClass().getResource("/defaultUsers.yml"), StandardCharsets.UTF_8); + CharSource charSource = Resources.asCharSource(Objects.requireNonNull(getClass().getResource("/defaultUsers.yml")), StandardCharsets.UTF_8); Files.write(usersConfigurationFile.toPath(), charSource.readLines()); } catch (IOException e) { throw new ObserveWebApplicationConfigInitException("Impossible de créer un fichier de configuration des utilisateurs", e); @@ -163,7 +154,9 @@ public class ServerConfig extends GeneratedServerConfig implements CleanTemporar private void initLog() throws IOException { File logFile = getLog4jConfigurationFile(); - + // always delete log file to regenerate it + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2149 + Files.deleteIfExists(logFile.toPath()); log.info("Chargement du fichier de log : " + logFile); ObserveUtil.loadLogConfiguration(getClass().getResource("/observeweb-log4j2.xml"), logFile.toPath(), this); ===================================== services/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataService.java ===================================== @@ -50,13 +50,13 @@ public interface ConsolidateDataService extends ObserveService { * Consolidate trip data using given {@code request} and produce a result. * * - * @param simplifiedObjectTypeSpecializedRules + * @param simplifiedObjectTypeSpecializedRules rules to apply * @param request la demande de consolidation * @return le résultat de la consolidation de données pour chaque marée qui a été modifée. */ @ReadDataPermission @WriteDataPermission - @Post + @Post(timeOut = 30) @Write ConsolidateTripSeineDataResult consolidateTripSeine(SimplifiedObjectTypeSpecializedRules simplifiedObjectTypeSpecializedRules, ConsolidateTripSeineDataRequest request); @@ -65,7 +65,7 @@ public interface ConsolidateDataService extends ObserveService { * modifiées. * * - * @param simplifiedObjectTypeSpecializedRules + * @param simplifiedObjectTypeSpecializedRules rules to apply * @param request request * @return {@code null} if no modification done, or {@code result} of operation. */ ===================================== services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeService.java ===================================== @@ -35,7 +35,7 @@ import io.ultreia.java4all.http.spi.Post; public interface ReferentialSynchronizeService extends ObserveService { // Note : sur cette méthode aucun droit métier à poser, les actions sont légitimes - @Post + @Post(timeOut = 10) ReferentialSynchronizeSqlListRequest produceSqlListRequest(ReferentialSynchronizeRequest request); // Note : sur cette méthode aucun droit métier à poser, les actions sont légitimes View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7b2ec932076171d53fe64e85… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7b2ec932076171d53fe64e85… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Erreur dans l'identification des bases de droite et gauche dans la synchro avancée - Closes #2392
by Tony CHEMIT (＠tchemit) 29 Jul '22

29 Jul '22

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 7b2ec932 by Tony Chemit at 2022-07-29T14:13:03+02:00 Erreur dans l'identification des bases de droite et gauche dans la synchro avancée - Closes #2392 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/node/ReferentialPropertyUpdatedNode.java - services/src/main/java/fr/ird/observe/services/service/referential/differential/DifferentialModel.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/node/ReferentialPropertyUpdatedNode.java ===================================== @@ -44,8 +44,8 @@ public class ReferentialPropertyUpdatedNode extends SynchroNodeSupport { this.propertyName = property.getPropertyName(); this.property = property; - String leftValue = left ? property.getOldValueLabel(decoratorService) : property.getNewValueLabel(decoratorService); - String rightValue = left ? property.getNewValueLabel(decoratorService) : property.getOldValueLabel(decoratorService); + String leftValue = left ? property.getNewValueLabel(decoratorService) : property.getOldValueLabel(decoratorService); + String rightValue = left ? property.getOldValueLabel(decoratorService) : property.getNewValueLabel(decoratorService); this.label = property.getPropertyNameLabel(dtoType, decoratorService); this.modificationLabel = String.format("<i>( %s )</i>", t("observe.actions.synchro.referential.property.modified", leftValue, rightValue)); // by default all properties are selected ===================================== services/src/main/java/fr/ird/observe/services/service/referential/differential/DifferentialModel.java ===================================== @@ -216,17 +216,17 @@ public class DifferentialModel { return this; } - protected <D extends ReferentialDto> void addToLeft(DifferentialType stateType, D leftDto, D rightDto, ImmutableSet<String> modifiedProperties) { - add0(true, stateType, leftDto, rightDto, leftSideBuilder, modifiedProperties); + protected <D extends ReferentialDto> void addToLeft(DifferentialType stateType, D thisSideDto, D otherSideDto, ImmutableSet<String> modifiedProperties) { + add0(logPrefix(true), stateType, thisSideDto, otherSideDto, leftSideBuilder, modifiedProperties); } - protected <D extends ReferentialDto> void addToRight(DifferentialType stateType, D leftDto, D rightDto, ImmutableSet<String> modifiedProperties) { - add0(false, stateType, leftDto, rightDto, rightSideBuilder, modifiedProperties); + protected <D extends ReferentialDto> void addToRight(DifferentialType stateType, D thisSideDto, D otherSideDto, ImmutableSet<String> modifiedProperties) { + add0(logPrefix(false), stateType, thisSideDto, otherSideDto, rightSideBuilder, modifiedProperties); } - protected <D extends ReferentialDto> void add0(boolean left, DifferentialType stateType, D leftDto, D rightDto, List<Differential> builder, ImmutableSet<String> modifiedProperties) { - Differential state = new Differential(stateType, leftDto, rightDto, modifiedProperties); - log.info(String.format("%s → %s - add %s", leftDto.getClass().getName(), logPrefix(left), state)); + protected <D extends ReferentialDto> void add0(String logPrefix, DifferentialType stateType, D thisSideDto, D otherSideDto, List<Differential> builder, ImmutableSet<String> modifiedProperties) { + Differential state = new Differential(stateType, thisSideDto, otherSideDto, modifiedProperties); + log.info(String.format("%s → %s - add %s", thisSideDto.getClass().getName(), logPrefix, state)); builder.add(state); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7b2ec932076171d53fe64e852… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7b2ec932076171d53fe64e852… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Moteur de scripting non trouvé en ouvrant ObServe 7.6.13 avec Java 17 - Closes #2413
by Tony CHEMIT (＠tchemit) 29 Jul '22

29 Jul '22

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 071ef71a by Tony Chemit at 2022-07-29T13:27:40+02:00 Moteur de scripting non trouvé en ouvrant ObServe 7.6.13 avec Java 17 - Closes #2413 - - - - - 8 changed files: - client-core/src/main/java/fr/ird/observe/client/ObserveRunner.java - common-dto/pom.xml - common-dto/src/main/java/fr/ird/observe/dto/ObserveUtil.java - common-dto/src/main/java/fr/ird/observe/dto/referential/FormulaHelper.java - common-dto/src/test/java/fr/ird/observe/dto/ScriptTest.java - dto/src/main/java/fr/ird/observe/dto/referential/seine/ObjectMaterialDto.java - pom.xml - services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ObserveRunner.java ===================================== @@ -48,7 +48,6 @@ import org.nuiton.jaxx.runtime.swing.application.ApplicationRunner; import org.nuiton.util.StringUtil; import javax.script.ScriptEngine; -import javax.script.ScriptEngineManager; import javax.script.ScriptException; import javax.swing.UIManager; import java.io.File; @@ -88,7 +87,9 @@ public abstract class ObserveRunner extends ApplicationRunner { java.util.logging.LogManager.getLogManager().getLogger("").setLevel(Level.SEVERE); } - /** Logger */ + /** + * Logger + */ private static Logger log = LogManager.getLogger(ObserveRunner.class); private static ObserveResourceManager resourceManager; @@ -136,7 +137,7 @@ public abstract class ObserveRunner extends ApplicationRunner { .map(Path::toFile) .forEach(File::delete); } catch (IOException e) { - throw new IllegalStateException("Can't delete i18n directory: "+i18nDirectory, e); + throw new IllegalStateException("Can't delete i18n directory: " + i18nDirectory, e); } } @@ -147,8 +148,8 @@ public abstract class ObserveRunner extends ApplicationRunner { I18n.init(i18nInitializer, locale); - log.debug("i18n language : " + locale); - log.debug("i18n loading time : " + StringUtil.convertTime(t00, System.nanoTime())); + log.debug("i18n language : " + locale); + log.debug("i18n loading time : " + StringUtil.convertTime(t00, System.nanoTime())); } public abstract String getRunnerName(); @@ -559,9 +560,7 @@ public abstract class ObserveRunner extends ApplicationRunner { */ private void checkScriptEngineFound() { - ScriptEngineManager factory = new ScriptEngineManager(); - - ScriptEngine scriptEngine = factory.getEngineByExtension("js"); + ScriptEngine scriptEngine = ObserveUtil.getScriptEngine(); if (scriptEngine == null) { ===================================== common-dto/pom.xml ===================================== @@ -80,6 +80,11 @@ <groupId>com.google.auto.service</groupId> <artifactId>auto-service-annotations</artifactId> </dependency> + <dependency> + <groupId>org.mozilla</groupId> + <artifactId>rhino-engine</artifactId> + <scope>runtime</scope> + </dependency>  <dependency> ===================================== common-dto/src/main/java/fr/ird/observe/dto/ObserveUtil.java ===================================== @@ -25,6 +25,8 @@ package fr.ird.observe.dto; import io.ultreia.java4all.config.ApplicationConfig; import org.apache.logging.log4j.core.config.Configurator; +import javax.script.ScriptEngine; +import javax.script.ScriptEngineManager; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -54,6 +56,8 @@ import java.util.function.Supplier; */ public class ObserveUtil { + public static final String JS_ENGINE_NAME = "rhino"; + public static <C extends Class<?>> List<C> sortTypes(Collection<C> types, Function<Class, String> function, Locale locale) { List<C> list = new ArrayList<>(types); @@ -109,4 +113,10 @@ public class ObserveUtil { } } + + public static ScriptEngine getScriptEngine() { + ScriptEngineManager factory = new ScriptEngineManager(); + return factory.getEngineByName(JS_ENGINE_NAME); + } + } ===================================== common-dto/src/main/java/fr/ird/observe/dto/referential/FormulaHelper.java ===================================== @@ -22,19 +22,20 @@ package fr.ird.observe.dto.referential; * #L% */ -import java.util.Map; -import java.util.TreeMap; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import fr.ird.observe.dto.ObserveUtil; +import org.apache.commons.lang3.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.nuiton.util.NumberUtil; + import javax.script.Bindings; import javax.script.ScriptContext; import javax.script.ScriptEngine; -import javax.script.ScriptEngineManager; import javax.script.ScriptException; -import org.apache.commons.lang3.StringUtils; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; -import org.nuiton.util.NumberUtil; +import java.util.Map; +import java.util.TreeMap; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * Created on 05/11/16. @@ -44,15 +45,18 @@ import org.nuiton.util.NumberUtil; */ public class FormulaHelper { - /** Logger */ private static final Logger log = LogManager.getLogger(FormulaHelper.class); private static final Pattern COEFFICIENTS_PATTERN = Pattern.compile("(.+)=(.+)"); - /** variable weight à utiliser dans la relation taille */ + /** + * weight variable to use ina length relation. + */ public static final String VARIABLE_WEIGHT = "P"; - /** variable taille à utiliser dans la relation weight */ + /** + * length variable to use in a weight relation. + */ public static final String VARIABLE_LENGTH = "L"; private static final String VARIABLE_X = "x"; @@ -64,43 +68,34 @@ public class FormulaHelper { public static final String COEFFICIENT_B = "b"; - /** moteur d'évaluation d'expression */ private static ScriptEngine scriptEngine; - private static ScriptEngine getScriptEngine() { if (scriptEngine == null) { - ScriptEngineManager factory = new ScriptEngineManager(); - - scriptEngine = factory.getEngineByExtension("js"); + scriptEngine = ObserveUtil.getScriptEngine(); } return scriptEngine; } - public static Map<String, Double> getCoefficientValues(WithFormula parametrage) { + public static Map<String, Double> getCoefficientValues(WithFormula formula) { Map<String, Double> result = new TreeMap<>(); - String coefficients = parametrage.getCoefficients(); + String coefficients = formula.getCoefficients(); if (coefficients != null) { for (String coefficientDef : coefficients.split(":")) { Matcher matcher = COEFFICIENTS_PATTERN.matcher(coefficientDef.trim()); - if (log.isDebugEnabled()) { - log.debug("constant to test = " + coefficientDef); - } + log.debug("constant to test = " + coefficientDef); if (matcher.matches()) { - String key = matcher.group(1); String val = matcher.group(2); try { Double d = Double.valueOf(val); result.put(key, d); - if (log.isDebugEnabled()) { - log.debug("detects coefficient " + key + '=' + val); - } + log.debug("detects coefficient " + key + '=' + val); } catch (NumberFormatException e) { - // pas pu recupere le count... + // could not get count + log.warn("could not parse double " + val + " for coefficient " + key); if (log.isWarnEnabled()) { - log.warn("could not parse double " + val + " for coefficient " + key); } } } @@ -109,66 +104,51 @@ public class FormulaHelper { return result; } - public static boolean validateRelation(WithFormula parametrage, String relation, String variable) { - boolean result = false; + public static boolean validateRelation(WithFormula formula, String relation, String variable) { if (!StringUtils.isEmpty(relation)) { - - Map<String, Double> coeffs = parametrage.getCoefficientValues(); - + Map<String, Double> coefficientValues = formula.getCoefficientValues(); ScriptEngine engine = getScriptEngine(); Bindings bindings = engine.createBindings(); - addBindings(coeffs, bindings, variable, 1); - + addBindings(coefficientValues, bindings, variable, 1); try { engine.setBindings(bindings, ScriptContext.ENGINE_SCOPE); - Double o = (Double) engine.eval("parseFloat(" + relation + ")"); - if (log.isDebugEnabled()) { - log.debug("evaluation ok : " + relation + " (" + variable + "=1) = " + o); - } - result = true; + Number o = (Number) engine.eval("parseFloat(" + relation + ")"); + log.debug("evaluation ok : " + relation + " (" + variable + "=1) = " + o); + return true; } catch (Exception e) { - if (log.isDebugEnabled()) { - log.debug("evaluation ko : " + relation + ", reason : " + e.getMessage()); - } + log.debug("evaluation ko : " + relation + ", reason : " + e.getMessage()); } } - return result; + return false; } public static boolean validateObjectMaterialValidation(String relation, Object value) { boolean result = false; if (!StringUtils.isEmpty(relation)) { - ScriptEngine engine = getScriptEngine(); Bindings bindings = engine.createBindings(); bindings.put(FormulaHelper.VARIABLE_X, value); - try { engine.setBindings(bindings, ScriptContext.ENGINE_SCOPE); Boolean o = (Boolean) engine.eval(relation); - if (log.isDebugEnabled()) { - log.debug(String.format("evaluation ok : %s (%s=%s) = %s", relation, FormulaHelper.VARIABLE_X, value, o)); - } + log.debug(String.format("evaluation ok : %s (%s=%s) = %s", relation, FormulaHelper.VARIABLE_X, value, o)); result = o != null && o; } catch (Exception e) { - if (log.isDebugEnabled()) { - log.debug("evaluation ko : " + relation + ", reason : " + e.getMessage()); - } + log.debug("evaluation ko : " + relation + ", reason : " + e.getMessage()); } } return result; } - public static Float computeValue(WithFormula parametrage, String formula, String coefficientName, String variableName, float data) { + public static Float computeValue(WithFormula formula, String relation, String coefficientName, String variableName, float data) { if (coefficientName != null) { - Double b = parametrage.getCoefficientValue(coefficientName); + Double b = formula.getCoefficientValue(coefficientName); if (b == 0) { - - // ce cas limite ne permet pas de calculer la taille a partir du weight + // limit case, can't compute length from weight return null; } } - Float o = computeValue(parametrage, formula, variableName, data); + Float o = computeValue(formula, relation, variableName, data); if (o != null) { o = NumberUtil.roundOneDigit(o); @@ -176,35 +156,30 @@ public class FormulaHelper { return o; } - private static Float computeValue(WithFormula parametrage, String relation, String variable, float taille) { - Map<String, Double> coeffs = parametrage.getCoefficientValues(); + private static Float computeValue(WithFormula formula, String relation, String variable, float data) { + Map<String, Double> coefficientValues = formula.getCoefficientValues(); ScriptEngine engine = getScriptEngine(); Bindings bindings = engine.createBindings(); - addBindings(coeffs, bindings, variable, taille); - + addBindings(coefficientValues, bindings, variable, data); engine.setBindings(bindings, ScriptContext.ENGINE_SCOPE); - Double o = null; + Number result; try { - o = (Double) engine.eval("parseFloat(" + relation + ")"); + result = ((Number) engine.eval("parseFloat(" + relation + ")")); } catch (ScriptException e) { - if (log.isErrorEnabled()) { - log.error("Could not compute value from " + relation); - } + log.error("Could not compute value from " + relation); + result = null; } - return o == null ? null : o.floatValue(); + return result == null ? null : result.floatValue(); } - private static void addBindings(Map<String, Double> coeffs, Bindings bindings, String variable, float taille) { - for (Map.Entry<String, Double> entry : coeffs.entrySet()) { + private static void addBindings(Map<String, Double> coefficientValues, Bindings bindings, String variable, float data) { + for (Map.Entry<String, Double> entry : coefficientValues.entrySet()) { String key = entry.getKey(); Double value = entry.getValue(); bindings.put(key, value); - - if (log.isDebugEnabled()) { - log.debug("add constant " + key + '=' + value); - } + log.debug("add constant " + key + '=' + value); } - bindings.put(variable, taille); + bindings.put(variable, data); } ===================================== common-dto/src/test/java/fr/ird/observe/dto/ScriptTest.java ===================================== @@ -21,19 +21,20 @@ */ package fr.ird.observe.dto; -import java.util.List; -import javax.script.ScriptContext; -import javax.script.ScriptEngine; -import javax.script.ScriptEngineFactory; -import javax.script.ScriptEngineManager; -import javax.script.ScriptException; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.nuiton.util.StringUtil; +import javax.script.ScriptContext; +import javax.script.ScriptEngine; +import javax.script.ScriptEngineFactory; +import javax.script.ScriptEngineManager; +import javax.script.ScriptException; +import java.util.List; + /** * @author Tony Chemit - dev(a)tchemit.fr * @since 1.2 @@ -49,7 +50,7 @@ public class ScriptTest { final double x = 10f; - protected static final String EXPRESSION = "a*(x^b)"; + protected static final String EXPRESSION = "parseFloat(a*(Math.pow(x, b)))"; protected static final String EXPRESSION_RESULT = "[%1$-10s] '%2$s' nb eval %3$-5s in %4$-10s (~ %5$s)"; @@ -60,34 +61,32 @@ public class ScriptTest { factory = new ScriptEngineManager(); List<ScriptEngineFactory> scriptEngineFactoryList = factory.getEngineFactories(); for (ScriptEngineFactory factory : scriptEngineFactoryList) { - if (log.isInfoEnabled()) { - log.info("available factory [engine: " + - factory.getEngineName() + " v." + - factory.getEngineVersion() + "] [language: " + - factory.getLanguageName() + ", version:" + - factory.getLanguageVersion() + "], mime-types : " + - "?" + factory.getMimeTypes() + - "?" + factory.getExtensions()); - } + log.info("available factory [engine: " + + factory.getEngineName() + " v." + + factory.getEngineVersion() + "] [language: " + + factory.getLanguageName() + ", version:" + + factory.getLanguageVersion() + "], mime-types : " + + "?" + factory.getMimeTypes() + + "?" + factory.getExtensions()); } } @Test public void testScripts() throws Exception { - doEvaluate(EXPRESSION, 1); - doEvaluate(EXPRESSION, 10); - doEvaluate(EXPRESSION, 100); - doEvaluate(EXPRESSION, 1000); + doEvaluate(1); + doEvaluate(10); + doEvaluate(100); + doEvaluate(1000); - doEvaluate(EXPRESSION, 1000); - doEvaluate(EXPRESSION, 100); - doEvaluate(EXPRESSION, 10); - doEvaluate(EXPRESSION, 1); + doEvaluate(1000); + doEvaluate(100); + doEvaluate(10); + doEvaluate(1); } - protected void doEvaluate(String expression, int nb) throws ScriptException { - ScriptEngine engine = factory.getEngineByExtension("js"); + protected void doEvaluate(int nb) throws ScriptException { + ScriptEngine engine = ObserveUtil.getScriptEngine(); long t0 = System.nanoTime(); for (int i = 0; i < nb; i++) { @@ -96,13 +95,13 @@ public class ScriptTest { c.setAttribute("a", a, ScriptContext.GLOBAL_SCOPE); c.setAttribute("x", x, ScriptContext.GLOBAL_SCOPE); c.setAttribute("b", b, ScriptContext.GLOBAL_SCOPE); - Double o = (Double) engine.eval("parseFloat(a*x^b)"); + Double o = (Double) engine.eval(EXPRESSION); Assert.assertEquals(a * Math.pow(x, b), o, 5); } long t1 = System.nanoTime(); String result = String.format(EXPRESSION_RESULT, "js", - expression, + ScriptTest.EXPRESSION, nb, StringUtil.convertTime(t1 - t0), StringUtil.convertTime((t1 - t0) / nb)); ===================================== dto/src/main/java/fr/ird/observe/dto/referential/seine/ObjectMaterialDto.java ===================================== @@ -22,12 +22,12 @@ package fr.ird.observe.dto.referential.seine; * #L% */ -import org.apache.commons.lang3.StringUtils; +import fr.ird.observe.dto.ObserveUtil; +import org.apache.logging.log4j.util.Strings; import javax.script.Bindings; import javax.script.ScriptContext; import javax.script.ScriptEngine; -import javax.script.ScriptEngineManager; public class ObjectMaterialDto extends GeneratedObjectMaterialDto { @@ -57,7 +57,7 @@ public class ObjectMaterialDto extends GeneratedObjectMaterialDto { value = Boolean.TRUE; } else if (isInteger()) { value = 10; - }else if (isFloat()) { + } else if (isFloat()) { value = 10f; } boolean result = validateObjectMaterialValidation(validation, value); @@ -65,7 +65,7 @@ public class ObjectMaterialDto extends GeneratedObjectMaterialDto { } public boolean withValidation() { - return StringUtils.isNoneEmpty(validation); + return Strings.isNotEmpty(validation); } /** @@ -79,18 +79,15 @@ public class ObjectMaterialDto extends GeneratedObjectMaterialDto { /** moteur d'évaluation d'expression */ private static ScriptEngine scriptEngine; - private static ScriptEngine getScriptEngine() { if (scriptEngine == null) { - ScriptEngineManager factory = new ScriptEngineManager(); - - scriptEngine = factory.getEngineByExtension("js"); + scriptEngine = ObserveUtil.getScriptEngine(); } return scriptEngine; } public static boolean validateObjectMaterialValidation(String relation, Object value) { - if (!StringUtils.isEmpty(relation)) { + if (Strings.isNotEmpty(relation)) { ScriptEngine engine = getScriptEngine(); Bindings bindings = engine.createBindings(); @@ -98,7 +95,9 @@ public class ObjectMaterialDto extends GeneratedObjectMaterialDto { try { engine.setBindings(bindings, ScriptContext.ENGINE_SCOPE); - Boolean o = (Boolean) engine.eval(relation); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2413#note_1044640610 + String fixedRelation = relation.replaceAll("length\$\$", "length"); + Boolean o = (Boolean) engine.eval(fixedRelation); return true; } catch (Exception e) { return false; ===================================== pom.xml ===================================== @@ -174,6 +174,7 @@ <lib.version.hikariCP>4.0.3</lib.version.hikariCP>  <lib.version.bytebuddy>1.12.9</lib.version.bytebuddy> + <lib.version.rhino>1.7.14</lib.version.rhino> <lib.version.nuiton.topia>3.8.1</lib.version.nuiton.topia> <lib.version.nuiton.version>1.0</lib.version.nuiton.version> <lib.version.log4j2>2.17.2</lib.version.log4j2> @@ -290,7 +291,16 @@ <artifactId>jaxx-widgets-combobox</artifactId> <version>${lib.version.java4all.jaxx}</version> </dependency> - + <dependency> + <groupId>org.mozilla</groupId> + <artifactId>rhino</artifactId> + <version>${lib.version.rhino}</version> + </dependency> + <dependency> + <groupId>org.mozilla</groupId> + <artifactId>rhino-engine</artifactId> + <version>${lib.version.rhino}</version> + </dependency> <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java ===================================== @@ -144,13 +144,13 @@ public class ValidateServiceLocalTest extends ServiceLocalTestSupport { ValidationResult<ReferentialValidationRequest> result = service.validateReferential(request); Assert.assertNotNull(result); - ImmutableSet<Class> types = result.getTypes(); + @SuppressWarnings("rawtypes") ImmutableSet<Class> types = result.getTypes(); - for (Class type : types) { + for (Class<?> type : types) { ImmutableSet<ValidationResultDtoMessage> messages = result.getMessagesForType(type); System.out.println("assertValidateResult(result, " + type.getSimpleName() + ".class, " + messages.size() + ");"); } - // no data of LengthLegnthParameter + // no data of LengthLengthParameter Assert.assertEquals(DtoModelClasses.REFERENTIAL_TYPES.size() - 1, types.size()); assertValidateResult(result, SpeciesGroupReleaseModeDto.class, 1); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/071ef71a1c28f6a8b8123f2c7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/071ef71a1c28f6a8b8123f2c7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 19 commits: Contournements des soucis mémoire de l'importeru AVDTH - Closes #2418
by Tony CHEMIT (＠tchemit) 28 Jul '22

28 Jul '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c5afc42e by Tony Chemit at 2022-07-22T06:06:31+02:00 Contournements des soucis mémoire de l'importeru AVDTH - Closes #2418 - - - - - 08ae1bf3 by Tony Chemit at 2022-07-22T06:06:31+02:00 Convertisseur de longueur m/km/nm/ftm - Closes #2378 - - - - - 66b555f0 by Tony Chemit at 2022-07-22T06:06:31+02:00 La boîte 'A propos' ne fontionne pas - Closes #2416 - - - - - 36e8022d by Tony Chemit at 2022-07-22T06:06:31+02:00 update hibernate - - - - - b539d5d0 by Tony Chemit at 2022-07-22T06:06:31+02:00 fix generate detail composition (ll-observation) - - - - - a3d9f432 by Tony Chemit at 2022-07-22T06:06:31+02:00 update pom - - - - - 56e24ae9 by Tony Chemit at 2022-07-22T06:06:31+02:00 Traitement de RAV - Closes #2421 - - - - - 30c9f229 by Tony Chemit at 2022-07-22T06:06:31+02:00 Update changelog for v.9.0.7 [skip CI] - - - - - 8cc268ed by Tony Chemit at 2022-07-22T06:06:31+02:00 Downgrade eugene, does not work, a lot of mixup with all existing xml libs... - - - - - 94acbc47 by Tony Chemit at 2022-07-22T06:06:31+02:00 Il faudrait mettre à jour le script qui crée les colonnes postgis pour chaque champ lat/lon - Closes #2422 - - - - - 33ab661a by Tony Chemit at 2022-07-22T06:06:31+02:00 Remove old scripts from client archive - - - - - 77281ed2 by Tony Chemit at 2022-07-22T06:06:31+02:00 Il faudrait un type d'accès en écriture mais qui empêche la modification des références - Closes #2370 - - - - - 21e4919b by Tony Chemit at 2022-07-22T06:22:16+02:00 Contournements des soucis mémoire de l'importeru AVDTH - Closes #2418 - - - - - 9c84f327 by Tony Chemit at 2022-07-28T07:03:08+02:00 Sur les données LL port et associées, rajouter 2 nouveaux champs data entry operators - See ultreiaio/ird-observe#2343 - - - - - 09e8d0f2 by Tony Chemit at 2022-07-28T07:03:17+02:00 Ajouter un champ position sur le formulaire Landing LL - See ultreiaio/ird-observe#2345 - - - - - 36f574fc by Tony Chemit at 2022-07-28T07:03:29+02:00 update pom update site plugin - - - - - 9facd56d by Tony Chemit at 2022-07-28T07:03:29+02:00 Fix validation context reset (for not standalone content ui) - - - - - b7735b12 by Tony Chemit at 2022-07-28T07:03:29+02:00 Erreur calcul des données sur V9 - Closes #2423 - - - - - db305cb5 by Tony Chemit at 2022-07-28T07:32:47+02:00 Remove 9.0.0-RC-* milestones (all goes to 9.0.0-RC) - - - - - 30 changed files: - CHANGELOG.md - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ClientValidationContext.java - client/core/src/main/java/fr/ird/observe/client/main/actions/ReloadApplicationAction.java - client/core/src/main/java/fr/ird/observe/client/main/actions/ShowAboutAction.java - client/core/src/main/java/fr/ird/observe/client/main/callback/ReloadApplicationCallback.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/i18n/templates/storageModelDataSourceConfiguration_en_GB.ftl - client/datasource/editor/api/src/main/i18n/templates/storageModelDataSourceConfiguration_es_ES.ftl - client/datasource/editor/api/src/main/i18n/templates/storageModelDataSourceConfiguration_fr_FR.ftl - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialog.jaxx - 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/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/Quit.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/NewImport.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModelStatesTypeTranslator.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpen.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpenWithValidator.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUIOpenExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/RolesTableModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/tabs/RolesUIHandler.java - client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUI.jaxx - client/runner/src/main/assembly/dist/scripts/postgresql/README.txt - − client/runner/src/main/assembly/dist/scripts/postgresql/createdb/create-empty-obstuna.sh - − client/runner/src/main/assembly/dist/scripts/postgresql/createdb/create-ird_obstuna.sh - − client/runner/src/main/assembly/dist/scripts/postgresql/createdb/create-test_obstuna.sh - + client/runner/src/main/assembly/dist/scripts/postgresql/extra/01_0_create-postgis-functions.sql - client/runner/src/main/assembly/dist/scripts/postgresql/extra/03_create-postgis-3-activity-seine.sql → client/runner/src/main/assembly/dist/scripts/postgresql/extra/01_1_create-postgis-referential.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e39a26c52894d302cebd853a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e39a26c52894d302cebd853a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: Traitement de RAV - Closes #2421
by Tony CHEMIT (＠tchemit) 21 Jul '22

21 Jul '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ef9bb95c by Tony Chemit at 2022-07-19T09:54:23+02:00 Traitement de RAV - Closes #2421 - - - - - ef8bff04 by Tony Chemit at 2022-07-19T09:54:23+02:00 Update changelog for v.9.0.7 [skip CI] - - - - - 80bc3d94 by Tony Chemit at 2022-07-19T09:54:23+02:00 Downgrade eugene, does not work, a lot of mixup with all existing xml libs... - - - - - f776615a by Tony Chemit at 2022-07-21T12:34:21+02:00 Il faudrait mettre à jour le script qui crée les colonnes postgis pour chaque champ lat/lon - Closes #2422 - - - - - e39a26c5 by Tony Chemit at 2022-07-21T12:35:42+02:00 Remove old scripts from client archive - - - - - 30 changed files: - CHANGELOG.md - client/runner/src/main/assembly/dist/scripts/postgresql/README.txt - − client/runner/src/main/assembly/dist/scripts/postgresql/createdb/create-empty-obstuna.sh - − client/runner/src/main/assembly/dist/scripts/postgresql/createdb/create-ird_obstuna.sh - − client/runner/src/main/assembly/dist/scripts/postgresql/createdb/create-test_obstuna.sh - + client/runner/src/main/assembly/dist/scripts/postgresql/extra/01_0_create-postgis-functions.sql - client/runner/src/main/assembly/dist/scripts/postgresql/extra/03_create-postgis-3-activity-seine.sql → client/runner/src/main/assembly/dist/scripts/postgresql/extra/01_1_create-postgis-referential.sql - + client/runner/src/main/assembly/dist/scripts/postgresql/extra/01_2_create-postgis-ps.sql - + client/runner/src/main/assembly/dist/scripts/postgresql/extra/01_3_create-postgis-ll.sql - − client/runner/src/main/assembly/dist/scripts/postgresql/extra/01_create-postgis-1-activity.sql - − client/runner/src/main/assembly/dist/scripts/postgresql/extra/02_create-postgis-2-harbour.sql - − client/runner/src/main/assembly/dist/scripts/postgresql/extra/04_create-postgis-4-activity-longine.sql - − client/runner/src/main/assembly/dist/util/README.txt - − client/runner/src/main/assembly/dist/util/backup-obstuna.sh - − client/runner/src/main/assembly/dist/util/create-postgis.sh - − client/runner/src/main/assembly/dist/util/generate-id.bat - − client/runner/src/main/assembly/dist/util/generate-id.sh - − client/runner/src/main/assembly/dist/util/tables/data-tables.txt - − client/runner/src/main/assembly/dist/util/tables/referentiel-tables.txt - − client/runner/src/main/assembly/sql/v1/README.txt - − client/runner/src/main/assembly/sql/v1/create-obstuna-linux.sh - − client/runner/src/main/assembly/sql/v1/create-obstuna-solaris.sh - − client/runner/src/main/assembly/sql/v1/create-postgis.sh - − client/runner/src/main/assembly/sql/v1/createdb-script.sh - − client/runner/src/main/assembly/sql/v1/security/create-admin-security-script.sh - − client/runner/src/main/assembly/sql/v1/security/create-default-security-script.sh - − client/runner/src/main/assembly/sql/v1/security/create-reader-security-script.sh - − client/runner/src/main/assembly/sql/v1/security/create-security-script.sh - − client/runner/src/main/assembly/sql/v1/security/create-technicien-security-script.sh - − client/runner/src/main/assembly/sql/v1/security/tables.txt The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0de24f381b2f5ab3f3fcab4b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0de24f381b2f5ab3f3fcab4b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.0.7 [skip CI]
by Tony CHEMIT (＠tchemit) 13 Jul '22

13 Jul '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0de24f38 by Tony Chemit at 2022-07-13T14:10:58+02:00 Update changelog for v.9.0.7 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,29 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2022-06-20 18:06. + * Last generated at 2022-07-13 14:08. + +## Version [9.0.7](https://gitlab.com/ultreiaio/ird-observe/-/milestones/232) + +**Closed at 2022-07-13.** + + +### Download +* [Client (observe-9.0.7-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) +* [Serveur (observe-9.0.7.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) +* [Serveur (observe-9.0.7-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) + +### Issues + * [[Type::Anomalie 2411]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2411) **HResponseErrorException / InvalidAuthenticationTokenException en 9.0.6 en quittant l'application** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2412]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2412) **Certains services sont encore en GET alors qu'ils devraient être en POST** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2419]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2419) **Erreur de migration de l'espèce AVDTH 8 de CAPT_ELEM vers ps_logbook.catch** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2420]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2420) **Statut de la doc de mapping des espèces AVDTH/ObServe** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2104]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2104) **On pourrait avoir un service de génération de topiaid** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2378]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2378) **Convertisseur de longueur m/km/nm/ftm** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2410]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2410) **Ordonancement par défaut des 3 combos section, basket, avançon sur les observations** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2417]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2417) **Improve statistics API** (Thanks to ) (Reported by Tony CHEMIT) + * [[Type::Evolution 2418]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2418) **Contournements des soucis mémoire de l'importeru AVDTH** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2421]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2421) **Traitement de RAV** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ## Version [9.0.6](https://gitlab.com/ultreiaio/ird-observe/-/milestones/231) @@ -12,7 +34,6 @@ * [Serveur (observe-9.0.6.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) * [Serveur (observe-9.0.6-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) - ### Issues * [[Type::Anomalie 2005]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2005) **Erreur d'ajout de trip ( methode POST)** (Thanks to Tony CHEMIT) (Reported by adelphe n'goran) * [[Type::Anomalie 2283]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2283) **Nom du fichier de log constant sur le serveur quelque soit la version installée** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0de24f381b2f5ab3f3fcab4b6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0de24f381b2f5ab3f3fcab4b6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 8 commits: HResponseErrorException / InvalidAuthenticationTokenException en 9.0.6 en...
by Tony CHEMIT (＠tchemit) 13 Jul '22

13 Jul '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ff692d59 by Tony Chemit at 2022-07-11T07:55:27+02:00 HResponseErrorException / InvalidAuthenticationTokenException en 9.0.6 en quittant l'application - Closes #2411 - - - - - a1397ce0 by Tony Chemit at 2022-07-11T09:35:24+02:00 Contournements des soucis mémoire de l'importeru AVDTH - Closes #2418 - - - - - 33719f6e by Tony Chemit at 2022-07-11T10:08:57+02:00 Convertisseur de longueur m/km/nm/ftm - Closes #2378 - - - - - 6c2f8f91 by Tony Chemit at 2022-07-11T10:29:26+02:00 La boîte 'A propos' ne fontionne pas - Closes #2416 - - - - - 95f62120 by Tony Chemit at 2022-07-12T14:47:26+02:00 update hibernate - - - - - ff54ce12 by Tony Chemit at 2022-07-12T14:48:44+02:00 fix generate detail composition (ll-observation) - - - - - 392186b4 by Tony Chemit at 2022-07-13T14:00:12+02:00 update pom - - - - - e818278e by Tony Chemit at 2022-07-13T14:00:12+02:00 Traitement de RAV - Closes #2421 - - - - - 30 changed files: - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveDataSourcesManager.java - client/core/src/main/java/fr/ird/observe/client/main/actions/ReloadApplicationAction.java - client/core/src/main/java/fr/ird/observe/client/main/actions/ShowAboutAction.java - client/core/src/main/java/fr/ird/observe/client/main/callback/ReloadApplicationCallback.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialog.jaxx - 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/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/Quit.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/NewImport.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModelStatesTypeTranslator.java - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties - core/api/dto/pom.xml - core/api/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsCommon.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ll/observation/SectionTemplateDto.java - core/api/dto/src/main/java/fr/ird/observe/dto/migration/avdth/AvdthDataImportConfiguration.java - core/api/dto/src/main/java/fr/ird/observe/dto/migration/avdth/AvdthReferentialImportConfiguration.java - core/api/dto/src/test/java/fr/ird/observe/dto/data/ll/observation/SectionTemplateDtoTest.java - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/referential/AvdthReferentialImportContext.java - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/referential/SpeciesCache.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/avdth/data/AvdthAtlanticDataBuilderAddSampleActivitiesTest.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/avdth/data/AvdthAtlanticDataBuilderAllTest.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/avdth/data/AvdthAtlanticDataBuilderByYearNotValidTest.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/avdth/data/AvdthAtlanticDataBuilderByYearTest.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/avdth/data/AvdthIndianDataBuilderAllTest.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/avdth/data/AvdthIndianDataBuilderByYearTest.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/avdth/referential/AvdthReferentialBuilderTest.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4be6b33f81cee0af9f4ee9f4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4be6b33f81cee0af9f4ee9f4… You're receiving this email because of your account on gitlab.com.

1 0