December 2024 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] 2 commits: Amélioration possible sur l'UI PS / Logbook / Echantillon / minus10weight et...
by Tony CHEMIT (＠tchemit) Dec. 11, 2024

Dec. 11, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 36e4a668 by Tony Chemit at 2024-12-11T17:56:46+01:00 Amélioration possible sur l'UI PS / Logbook / Echantillon / minus10weight et plus10weight - Closes #2954 - - - - - 93f16ff2 by Tony Chemit at 2024-12-11T18:01:50+01:00 Libellés sur l'UI consolidation - Closes #2957 - - - - - 5 changed files: - client/datasource/editor/ps/src/main/i18n/getters/java.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUIHandler.java - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/actions/SampleUIResetWeights.java - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties Changes: ===================================== client/datasource/editor/ps/src/main/i18n/getters/java.getter ===================================== @@ -1,3 +1,4 @@ +bean.action.reset.tip boolean.true observe.Common.action.move.down.tip observe.Common.action.move.up.tip ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUI.jaxx ===================================== @@ -114,6 +114,9 @@ <cell anchor='west'> <JLabel id='smallsWeightLabel'/> </cell> + <cell> + <JPanel/> + </cell> <cell anchor='east' weightx="1" fill="both"> <NumberEditor id='smallsWeight' styleClass="float2"/> </cell> @@ -126,6 +129,11 @@ <cell anchor='west'> <JLabel id='bigsWeightLabel'/> </cell> + <cell> + <JToolBar> + <JButton id='resetWeights'/> + </JToolBar> + </cell> <cell anchor='east' weightx="1" fill="both"> <NumberEditor id='bigsWeight' styleClass="float2"/> </cell> @@ -140,6 +148,9 @@ <cell anchor='west'> <JLabel id='totalWeightLabel'/> </cell> + <cell> + <JPanel/> + </cell> <cell anchor='east' weightx="1" fill="both"> <NumberEditor id='totalWeight' styleClass="float2"/> </cell> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/SampleUIHandler.java ===================================== @@ -58,6 +58,9 @@ public class SampleUIHandler extends GeneratedSampleUIHandler { public void onInit(SampleUI ui) { super.onInit(ui); ui.getSampleActivityTableModel().init(ui); + ui.getTotalWeight().setShowReset(false); + ui.getSmallsWeight().setShowReset(false); + ui.getBigsWeight().setShowReset(false); } @Override ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/actions/SampleUIResetWeights.java ===================================== @@ -0,0 +1,55 @@ +package fr.ird.observe.client.datasource.editor.ps.data.logbook.actions; + +/*- + * #%L + * ObServe Client :: DataSource :: Editor :: PS + * %% + * Copyright (C) 2008 - 2024 IRD, 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.client.datasource.editor.api.content.data.open.actions.ContentOpenableUIActionSupport; +import fr.ird.observe.client.datasource.editor.ps.data.logbook.SampleUI; +import fr.ird.observe.client.util.UIHelper; +import fr.ird.observe.dto.data.ps.logbook.SampleDto; + +import java.awt.event.ActionEvent; + +import static io.ultreia.java4all.i18n.I18n.n; + +/** + * To reset the three weights values on {@link SampleDto}. + * <p> + * Created at 11/12/2024. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.4.0 + * @see <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2957">issue 2957</a> + */ +public class SampleUIResetWeights extends ContentOpenableUIActionSupport<SampleDto, SampleUI> { + + public SampleUIResetWeights() { + super(SampleDto.class, null, n("bean.action.reset.tip"), "combobox-reset", null); + } + + @Override + protected final void doActionPerformed(ActionEvent e, SampleUI ui) { + ui.getModel().getStates().getBean().setTotalWeight(null); + ui.getModel().getStates().getBean().setSmallsWeight(null); + ui.getModel().getStates().getBean().setBigsWeight(null); + } +} ===================================== client/runner/src/main/i18n/translations/client-runner_fr_FR.properties ===================================== @@ -39,8 +39,8 @@ observe.config.client.logFiles.timeout.description=Nettoyage des fichiers de log observe.config.client.temporaryFiles.timeout.description=Nettoyage des fichiers temporaires (en heures) observe.config.consolidation.failIfLengthLengthParameterNotFound=Dans l'action de consolidation, déclencher une erreur si une relation taille-taille n'est pas trouvée, sinon consigner cela en avertissement de l'action observe.config.consolidation.failIfLengthWeightParameterNotFound=Dans l'action de consolidation, déclencher une erreur si une relation taille-poids n'est pas trouvée, sinon consigner cela en avertissement de l'action -observe.config.consolidation.speciesListForLogbookSampleActivityWeightedWeight=Liste des espèces à utiliser dans l'action de consolidation du champs Poids pondéré des échantillons calée (Senne / Livre de bord) -observe.config.consolidation.speciesListForLogbookSampleWeights=Liste des espèces à utiliser dans l'action de consolidation des champs Poids des échantillons (Senne / Livre de bord) +observe.config.consolidation.speciesListForLogbookSampleActivityWeightedWeight=Liste des espèces pour le calcul des poids pondérés des échantillons calée (Senne / Livre de bord) +observe.config.consolidation.speciesListForLogbookSampleWeights=Liste des espèces pour la sommation des poids des cuves échantillonnées (Senne / Livre de bord) observe.config.coordinate.format=Format des positions (DMD, DD, DMS) observe.config.db.locale=La langue du référentiel (fr_FR, en_GB ou es_ES) observe.config.dcpPresetsDirectory.description=Répertoire des pré-configurations de DCP View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/07f534f1c21ac8f2865063eb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/07f534f1c21ac8f2865063eb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: update data.ll.observation.FloatlinesComposition.length boundNauticalLength max value
by Tony CHEMIT (＠tchemit) Dec. 11, 2024

Dec. 11, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 80a7e30b by Tony Chemit at 2024-12-11T14:55:20+01:00 update data.ll.observation.FloatlinesComposition.length boundNauticalLength max value - - - - - 3e591281 by Tony Chemit at 2024-12-11T17:22:24+01:00 update generated validation files - - - - - 25878fae by Tony Chemit at 2024-12-11T17:22:24+01:00 Update public api documentation - - - - - 07f534f1 by Tony Chemit at 2024-12-11T17:22:26+01:00 Merge branch 'feature/issue_2949' into develop Bornes de longueurs d'orins en ftm - Closes #2949 - - - - - 6 changed files: - core/api/validation/src/main/filtered-resources/META-INF/validation/model-default.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/FloatlinesCompositionDto-create-error-validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/FloatlinesCompositionDto-update-error-validation.json - model/src/main/models/Observe/dto/attribute/boundNauticalLength.properties - server/runner/src/main/webResources/doc/api/public/data/ll/observation/FloatlinesComposition/validation-create-error.json - server/runner/src/main/webResources/doc/api/public/data/ll/observation/FloatlinesComposition/validation-update-error.json Changes: ===================================== core/api/validation/src/main/filtered-resources/META-INF/validation/model-default.json ===================================== @@ -3150,7 +3150,7 @@ "length": [ "length is mandatory", "length is a positive number", - "Nautical Length bound (unit m) 0.0 <= length <= 100.0" + "Nautical Length bound (unit m) 0.0 <= length <= 125.0" ], "lineType": [ "lineType is mandatory", @@ -3178,7 +3178,7 @@ "length": [ "length is mandatory", "length is a positive number", - "Nautical Length bound (unit m) 0.0 <= length <= 100.0" + "Nautical Length bound (unit m) 0.0 <= length <= 125.0" ], "lineType": [ "lineType is mandatory", ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/FloatlinesCompositionDto-create-error-validation.json ===================================== @@ -16,10 +16,10 @@ }, { "validator": "io.ultreia.java4all.jaxx.widgets.validation.validator.NauticalLengthBoundFieldValidator", - "comment": "Nautical Length bound (unit m) 0.0 <= length <= 100.0", + "comment": "Nautical Length bound (unit m) 0.0 <= length <= 125.0", "parameters": { "min": "0.0", - "max": "100.0", + "max": "125.0", "defaultNauticalLengthFormat": "m" } } ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/FloatlinesCompositionDto-update-error-validation.json ===================================== @@ -16,10 +16,10 @@ }, { "validator": "io.ultreia.java4all.jaxx.widgets.validation.validator.NauticalLengthBoundFieldValidator", - "comment": "Nautical Length bound (unit m) 0.0 <= length <= 100.0", + "comment": "Nautical Length bound (unit m) 0.0 <= length <= 125.0", "parameters": { "min": "0.0", - "max": "100.0", + "max": "125.0", "defaultNauticalLengthFormat": "m" } } ===================================== model/src/main/models/Observe/dto/attribute/boundNauticalLength.properties ===================================== @@ -27,5 +27,5 @@ data.ll.observation.Basket.attribute.floatline2Length=0.0:150.0:M data.ll.observation.Branchline.attribute.branchlineLength=0.0:50.0:M data.ll.observation.Branchline.attribute.tracelineLength=0.0:50.0:M data.ll.observation.BranchlinesComposition.attribute.length=0.0:50.0:M -data.ll.observation.FloatlinesComposition.attribute.length=0.0:100.0:M +data.ll.observation.FloatlinesComposition.attribute.length=0.0:125.0:M data.ll.observation.Set.attribute.maxDepthTargeted=0.0:1000.0:M ===================================== server/runner/src/main/webResources/doc/api/public/data/ll/observation/FloatlinesComposition/validation-create-error.json ===================================== @@ -16,10 +16,10 @@ }, { "validator": "io.ultreia.java4all.jaxx.widgets.validation.validator.NauticalLengthBoundFieldValidator", - "comment": "Nautical Length bound (unit m) 0.0 <= length <= 100.0", + "comment": "Nautical Length bound (unit m) 0.0 <= length <= 125.0", "parameters": { "min": "0.0", - "max": "100.0", + "max": "125.0", "defaultNauticalLengthFormat": "m" } } ===================================== server/runner/src/main/webResources/doc/api/public/data/ll/observation/FloatlinesComposition/validation-update-error.json ===================================== @@ -16,10 +16,10 @@ }, { "validator": "io.ultreia.java4all.jaxx.widgets.validation.validator.NauticalLengthBoundFieldValidator", - "comment": "Nautical Length bound (unit m) 0.0 <= length <= 100.0", + "comment": "Nautical Length bound (unit m) 0.0 <= length <= 125.0", "parameters": { "min": "0.0", - "max": "100.0", + "max": "125.0", "defaultNauticalLengthFormat": "m" } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d7fc7e1771d24864d8267daf… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d7fc7e1771d24864d8267daf… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: Fix speciesList 100 labels
by Tony CHEMIT (＠tchemit) Dec. 11, 2024

Dec. 11, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5ccdb8cd by Tony Chemit at 2024-12-11T14:19:14+01:00 Fix speciesList 100 labels - - - - - 2378fde7 by Tony Chemit at 2024-12-11T14:19:20+01:00 Fix speciesList 101 labels - - - - - 2cae2d9f by Tony Chemit at 2024-12-11T14:28:09+01:00 add speciesList 102 and 103 - - - - - d3d58cd2 by Tony Chemit at 2024-12-11T14:29:14+01:00 Update tests fixtures - - - - - d7fc7e17 by Tony Chemit at 2024-12-11T14:45:00+01:00 Merge branch 'feature/issue_2958' into develop A propos des listes d'espèces pour les calculs de consolidation - Closes #2958 - - - - - 7 changed files: - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_4.java - core/persistence/migration/src/main/resources/db/migration/v9/9.4/01_issue-2931-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.4/04_02_issue-2669-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.4/07_issue-2958-common.sql - core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-common-default.json - model/src/main/resources/fixtures/global.properties Changes: ===================================== core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_4.java ===================================== @@ -71,6 +71,10 @@ public class DataSourceMigrationForVersion_9_4 extends ByMajorMigrationVersionRe issue2932(executor,withIds); // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2959 issue2959(executor,withIds); + if (withIds) { + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2958 + executor.addScript("07", "issue-2958"); + } } private void issue2914(MigrationVersionResourceExecutor executor) { ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.4/01_issue-2931-common.sql ===================================== @@ -20,7 +20,7 @@ -- #L% --- -- add a new species list PS - Catch -INSERT INTO common.SpeciesList (topiaid, topiaversion, topiacreatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate, homeid) VALUES ('fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}100', 0, ${CURRENT_DATE}, '100', 1, null, 'Consolidation (PS Logbook SampleActivity.weightedWeight)', 'Consolidation (PS Logbook SampleActivity.weightedWeight)', 'Consolidation (PS Logbook SampleActivity.weightedWeight) TODO', null, null, null, null, null, false, ${CURRENT_TIMESTAMP} , null); +INSERT INTO common.SpeciesList (topiaid, topiaversion, topiacreatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate, homeid) VALUES ('fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}100', 0, ${CURRENT_DATE}, '100', 1, null, 'Consolidation - PS Logbook - Weighted weights - fleet France', 'Consolidation - PS Logbook - Poids pondérés - flotte France', 'Consolidación - PS Logbook - Pesos ponderados - flota de Francia', null, null, null, null, null, false, ${CURRENT_TIMESTAMP} , null); INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685474#0.8943253454598569', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}100'); INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685474#0.975344121171992', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}100'); INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685475#0.13349466123905152', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}100'); ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.4/04_02_issue-2669-common.sql ===================================== @@ -19,7 +19,7 @@ -- <http://www.gnu.org/licenses/gpl-3.0.html>. -- #L% --- -INSERT INTO common.SpeciesList (topiaid, topiaversion, topiacreatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate, homeid) VALUES ('fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}101', 0, ${CURRENT_DATE}, '101', 1, null, 'Consolidation (PS Logbook Sample.weights)', 'Consolidation (PS Logbook Sample.weights)', 'Consolidation (PS Logbook Sample.weights) TODO', null, null, null, null, null, false, ${CURRENT_TIMESTAMP} , null); +INSERT INTO common.SpeciesList (topiaid, topiaversion, topiacreatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate, homeid) VALUES ('fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}101', 0, ${CURRENT_DATE}, '101', 1, null, ' Consolidation - PS Logbook - Categories'' weights - fleet France', 'Consolidation - PS Logbook - Poids des catégories - flotte France', 'Consolidación - PS Logbook - Pesos de categorías - flota de Francia', null, null, null, null, null, false, ${CURRENT_TIMESTAMP} , null); INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685475#0.13349466123905152', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}101'); -- BET INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685474#0.8943253454598569', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}101'); -- YFT INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685474#0.975344121171992', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}101'); -- SKJ ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.4/07_issue-2958-common.sql ===================================== @@ -0,0 +1,40 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2024 IRD, 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% +--- +INSERT INTO common.SpeciesList (topiaid, topiaversion, topiacreatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate, homeid) VALUES ('fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102', 0, ${CURRENT_DATE}, '102', 1, null, 'Consolidation - PS Logbook - Weighted weights - fleet Spain', 'Consolidation - PS Logbook - Poids pondérés - flotte Espagne', 'Consolidación - PS Logbook - Pesos ponderados - flota de España', null, null, null, null, null, false, ${CURRENT_TIMESTAMP} , null); +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685474#0.8943253454598569', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102'); +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685474#0.975344121171992', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102'); +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685475#0.13349466123905152', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102'); +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685476#0.5618871286604711', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102'); +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685477#0.8024257002747615', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102'); +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685477#0.3846921632590058', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102'); +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1441287921299#0.016754076421811148', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102'); +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1433499265113#0.891799515346065', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102'); +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685477#0.2673009297087321', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102'); +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685478#0.7676744877900202', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102'); +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685477#0.5989181185528589', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102'); +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685476#0.36339915670317835', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}102'); +INSERT INTO common.SpeciesList (topiaid, topiaversion, topiacreatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment, lastupdatedate, homeid) VALUES ('fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}103', 0, ${CURRENT_DATE}, '103', 1, null, ' Consolidation - PS Logbook - Categories'' weights - fleet Spain', 'Consolidation - PS Logbook - Poids des catégories - flotte Espagne', 'Consolidación - PS Logbook - Pesos de categorías - flota de España', null, null, null, null, null, false, ${CURRENT_TIMESTAMP} , null); +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685475#0.13349466123905152', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}103'); -- BET +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685474#0.8943253454598569', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}103'); -- YFT +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685474#0.975344121171992', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}103'); -- SKJ +INSERT INTO common.speciesList_species (species, speciesList) VALUES ('fr.ird.referential.common.Species#1239832685476#0.5618871286604711', 'fr.ird.referential.common.SpeciesList#${REFERENTIAL_PREFIX}103'); -- ALB +UPDATE common.LastUpdateDate SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type = 'fr.ird.observe.entities.referential.common.SpeciesList'; ===================================== core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties ===================================== @@ -42,7 +42,7 @@ common.sizeMeasureType=21 common.species=315 common.speciesGroup=12 common.speciesGroupReleaseMode=10 -common.speciesList=12 +common.speciesList=14 common.vessel=1250 common.vesselSizeCategory=13 common.vesselType=18 @@ -120,4 +120,4 @@ common.gear_allowedGearCharacteristic=108 common.gear_defaultGearCharacteristic=45 common.species_ocean=553 common.speciesGroup_speciesGroupReleaseMode=19 -common.speciesList_species=981 +common.speciesList_species=997 ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-common-default.json ===================================== @@ -44081,24 +44081,14 @@ }, { "datum": { - "text": "100##Consolidation (PS Logbook SampleActivity.weightedWeight)", + "text": "100##Consolidation - PS Logbook - Poids pondérés - flotte France", "type": "fr.ird.observe.dto.referential.common.SpeciesListDto", "id": "fr.ird.referential.common.SpeciesList#1464000000000#100", "topiaVersion": 0, "lastUpdateDate": "2024-09-11T00:00:00.000Z" }, "messages": [ - { - "fieldName": "label1", - "scope": "WARNING", - "message": "Le libellé anglais n'est pas traduit." - }, - { - "fieldName": "label3", - "scope": "WARNING", - "message": "Le libellé espagnol n'est pas traduit." - }, - { + { "fieldName": "uri", "scope": "WARNING", "message": "Le champ n'est pas renseigné." @@ -44107,23 +44097,46 @@ }, { "datum": { - "text": "101##Consolidation (PS Logbook Sample.weights)", + "text": "101##Consolidation - PS Logbook - Poids des catégories - flotte France", "type": "fr.ird.observe.dto.referential.common.SpeciesListDto", "id": "fr.ird.referential.common.SpeciesList#1464000000000#101", "topiaVersion": 0, "lastUpdateDate": "2024-09-11T00:00:00.000Z" }, "messages": [ + { - "fieldName": "label1", + "fieldName": "uri", "scope": "WARNING", - "message": "Le libellé anglais n'est pas traduit." - }, + "message": "Le champ n'est pas renseigné." + } + ] + }, + { + "datum": { + "text": "100##Consolidation - PS Logbook - Poids pondérés - flotte Espagne", + "type": "fr.ird.observe.dto.referential.common.SpeciesListDto", + "id": "fr.ird.referential.common.SpeciesList#1464000000000#102", + "topiaVersion": 0, + "lastUpdateDate": "2024-09-11T00:00:00.000Z" + }, + "messages": [ { - "fieldName": "label3", + "fieldName": "uri", "scope": "WARNING", - "message": "Le libellé espagnol n'est pas traduit." - }, + "message": "Le champ n'est pas renseigné." + } + ] + }, + { + "datum": { + "text": "101##Consolidation - PS Logbook - Poids des catégories - flotte Espagne", + "type": "fr.ird.observe.dto.referential.common.SpeciesListDto", + "id": "fr.ird.referential.common.SpeciesList#1464000000000#103", + "topiaVersion": 0, + "lastUpdateDate": "2024-09-11T00:00:00.000Z" + }, + "messages": [ { "fieldName": "uri", "scope": "WARNING", ===================================== model/src/main/resources/fixtures/global.properties ===================================== @@ -25,4 +25,4 @@ REFERENCE_DATA_COUNT=68 ENTITIES_LIMIT_SIZE=100 # fr.ird.observe.services.service.referential.ReferentialService # fr.ird.observe.services.local.service.referential.DifferentialModelTest -REFERENTIAL_COUNT=4393 +REFERENTIAL_COUNT=4395 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/62e92c6727efc2b1d37343e5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/62e92c6727efc2b1d37343e5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: Review import code for Landing.fate field
by Tony CHEMIT (＠tchemit) Dec. 11, 2024

Dec. 11, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: daaf003d by Tony Chemit at 2024-12-11T11:23:11+01:00 Review import code for Landing.fate field - - - - - 0c74c297 by Tony Chemit at 2024-12-11T11:23:11+01:00 Update AVDTH documentation - - - - - 0c44ebc6 by Tony Chemit at 2024-12-11T11:23:11+01:00 Add by migration ps_landing.Fate 3 and 4 if necessary - - - - - 2bca2b11 by Tony Chemit at 2024-12-11T11:43:57+01:00 Update tests fixtures - - - - - 62e92c67 by Tony Chemit at 2024-12-11T13:46:33+01:00 Merge branch 'feature/issue_2959' into develop Peaufinage sur la migration des LOT_COM AVDTH - Closes #2959 - - - - - 10 changed files: - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/common/LandingReader.java - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_4.java - + core/persistence/migration/src/main/resources/db/migration/v9/9.4/06_issue-2959_add_referential_ps_landing_Fate_3-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.4/06_issue-2959_add_referential_ps_landing_Fate_4-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.4/06_issue-2959_add_referential_ps_landing_Fate_finalize-common.sql - core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-ps-default.json - model/src/main/resources/fixtures/global.properties - src/site/markdown/avdth/landing.md Changes: ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java ===================================== @@ -69,7 +69,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.TreeMap; -import java.util.function.Consumer; /** * Contains all referential used in import and all the logic of them. @@ -113,8 +112,10 @@ public class ImportReferentialContext { private SizeMeasureType sizeMeasureTypeDL; private DataQuality dataQualityA; private DataQuality dataQualityE; - private Fate fate1; - private Fate fate2; + private Fate fateProcessed; + private Fate fateDiscarded; + private Fate fateSoldOnLocalMarket; + private Fate fateTransshipment; private AcquisitionStatus acquisitionStatus1; private AcquisitionStatus acquisitionStatus999; private TransmittingBuoyType transmittingBuoyType98; @@ -185,8 +186,10 @@ public class ImportReferentialContext { landingCategories = Maps.uniqueIndex(referential.getWeightCategory(), WeightCategory::getCode); Map<String, Fate> fates = Maps.uniqueIndex(referential.getFate(), Fate::getCode); - fate1 = fates.get("1"); - fate2 = fates.get("2"); + fateProcessed = fates.get("1"); + fateDiscarded = fates.get("2"); + fateSoldOnLocalMarket = fates.get("3"); + fateTransshipment = fates.get("4"); destinations = Maps.uniqueIndex(referential.getDestination(), Destination::getCode); @@ -388,8 +391,12 @@ public class ImportReferentialContext { return schoolType2; } + public boolean isSpeciesDiscarded(String speciesCode) { + return speciesCode.equals("8") || (speciesCode.startsWith("8") && speciesCode.length() == 3); + } + public SpeciesFate getSpeciesFate(String speciesCode) { - if (speciesCode.equals("8") || (speciesCode.startsWith("8") && speciesCode.length() == 3)) { + if (isSpeciesDiscarded(speciesCode)) { // all species in avdth with code 8 or 8xx are discard return speciesFate11; } @@ -453,12 +460,20 @@ public class ImportReferentialContext { return transmittingBuoyOperation1; } - public Fate getFateBySpeciesCode(String originalSpeciesCode) { - // fate 1 if not discarded, 2 discarded (only for species 8) - if (originalSpeciesCode.equals("8")) { - return fate2; - } - return fate1; + public Fate getFateProcessed() { + return fateProcessed; + } + + public Fate getFateDiscarded() { + return fateDiscarded; + } + + public Fate getFateSoldOnLocalMarket() { + return fateSoldOnLocalMarket; + } + + public Fate getFateTransshipment() { + return fateTransshipment; } public Harbour getHarbour(String code) { ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/common/LandingReader.java ===================================== @@ -27,6 +27,7 @@ import fr.ird.observe.entities.data.ps.landing.Landing; import fr.ird.observe.entities.referential.common.Species; import fr.ird.observe.entities.referential.ps.common.WeightCategory; import fr.ird.observe.entities.referential.ps.landing.Destination; +import fr.ird.observe.entities.referential.ps.landing.Fate; import fr.ird.observe.persistence.avdth.data.DataQueryDefinition; import fr.ird.observe.persistence.avdth.data.DataReader; import fr.ird.observe.persistence.avdth.data.ImportDataContext; @@ -106,8 +107,34 @@ public class LandingReader extends DataReader<Landing> { String destinationCode = resultSet.getString(7); Destination destination = dataContext.getDestination(destinationCode); entity.setDestination(destination); - entity.setFate(dataContext.getFateBySpeciesCode(originalSpeciesCode)); + Fate fate = getFate(dataContext, originalSpeciesCode, destinationCode); + entity.setFate(fate); return entity; } + + private Fate getFate(ImportDataContext dataContext, String originalSpeciesCode, String avdthDestinationCode) { + if (avdthDestinationCode != null) { + int code = Integer.parseInt(avdthDestinationCode); + if (isDestinationCodeToTransshipment(code)) { + return dataContext.getFateTransshipment(); + } + if (isDestinationCodeToSoldOnLocalMarket(code)) { + return dataContext.getFateSoldOnLocalMarket(); + } + } + if (dataContext.isSpeciesDiscarded(originalSpeciesCode)) { + return dataContext.getFateDiscarded(); + } + return dataContext.getFateProcessed(); + } + + private boolean isDestinationCodeToTransshipment(int code) { + return code == 3 || code == 4; + } + + private boolean isDestinationCodeToSoldOnLocalMarket(int code) { + return code == 18 || code == 28 || (code >= 40 && code <= 61) || (code >= 64 && code <= 65); + } + } ===================================== core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_4.java ===================================== @@ -34,6 +34,9 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.sql.ResultSet; import java.sql.SQLException; +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.stream.Stream; /** * Created at 11/09/2024. @@ -66,6 +69,8 @@ public class DataSourceMigrationForVersion_9_4 extends ByMajorMigrationVersionRe issue2669(executor); // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2932 issue2932(executor,withIds); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2959 + issue2959(executor,withIds); } private void issue2914(MigrationVersionResourceExecutor executor) { @@ -104,6 +109,23 @@ public class DataSourceMigrationForVersion_9_4 extends ByMajorMigrationVersionRe executor.addScript("05_06", "issue-2932_update-table-ll-observation-weight-measure"); } + + private void issue2959(MigrationVersionResourceExecutor executor, boolean withIds) { + if (withIds) { + Set<String> existingCodes = executor.findMultipleResultAstSet(SqlQuery.wrap("SELECT CODE FROM ps_landing.Fate", resultSet -> resultSet.getString(1))); + Set<String> newCodes = new LinkedHashSet<>(); + Stream.of("3", "4").forEach(code -> { + if (!existingCodes.contains(code)) { + executor.addScript("06_issue-2959_add_referential_ps_landing_Fate", code); + newCodes.add(code); + } + }); + if (!newCodes.isEmpty()) { + executor.addScript("06_issue-2959_add_referential_ps_landing_Fate", "finalize"); + } + } + } + private static class BasketRecord { private final String id; private final Float floatline1Length; ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.4/06_issue-2959_add_referential_ps_landing_Fate_3-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2024 IRD, 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% +--- +INSERT INTO ps_landing.Fate(topiaid, topiaversion, topiacreatedate, lastUpdateDate, needComment, status, code, label1, label2, label3, discard) VALUES ('fr.ird.referential.ps.landing.Fate#1714114980513#0.3095970028802679', 0, '2024-04-26T09:00:41.215Z'::timestamp, '2024-04-26T09:03:00.513Z'::timestamp, FALSE, 1, '3' , 'Sold for local market', 'Vendu sur le marché local', 'Vendido en el mercado local', false); ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.4/06_issue-2959_add_referential_ps_landing_Fate_4-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2024 IRD, 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% +--- +INSERT INTO ps_landing.Fate(topiaid, topiaversion, topiacreatedate, lastUpdateDate, needComment, status, code, label1, label2, label3, discard) VALUES ('fr.ird.referential.ps.landing.Fate#1714115075625#0.4347800278392995', 0, '2024-04-26T09:03:12.339Z'::timestamp, '2024-04-26T09:04:35.625Z'::timestamp, FALSE, 1, '4' , 'Transshipment (container or cargo)', 'Transbordé (conteneur ou cargo)', 'Transbordo (contenedor o carga)', false); ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.4/06_issue-2959_add_referential_ps_landing_Fate_finalize-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2024 IRD, 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% +--- +UPDATE common.LastUpdateDate SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type ='fr.ird.observe.entities.referential.ps.landing.Fate'; ===================================== core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties ===================================== @@ -95,7 +95,7 @@ ps_common.transmittingBuoyType=62 ps_common.vesselActivity=39 ps_common.weightCategory=137 ps_landing.destination=30 -ps_landing.fate=2 +ps_landing.fate=4 ps_localmarket.batchComposition=3 ps_localmarket.batchWeightType=4 ps_localmarket.packaging=53 ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-ps-default.json ===================================== @@ -13483,6 +13483,38 @@ } ] }, + { + "datum": { + "text": "3##Vendu sur le marché local", + "type": "fr.ird.observe.dto.referential.ps.landing.FateDto", + "id": "fr.ird.referential.ps.landing.Fate#1714114980513#0.3095970028802679", + "topiaVersion": 0, + "lastUpdateDate": "2024-04-26T11:03:00.513Z" + }, + "messages": [ + { + "fieldName": "uri", + "scope": "WARNING", + "message": "Le champ n'est pas renseigné." + } + ] + }, + { + "datum": { + "text": "4##Transbordé (conteneur ou cargo)", + "type": "fr.ird.observe.dto.referential.ps.landing.FateDto", + "id": "fr.ird.referential.ps.landing.Fate#1714115075625#0.4347800278392995", + "topiaVersion": 0, + "lastUpdateDate": "2024-04-26T11:04:35.625Z" + }, + "messages": [ + { + "fieldName": "uri", + "scope": "WARNING", + "message": "Le champ n'est pas renseigné." + } + ] + }, { "datum": { "text": "1##Multi spécifique (sondage)", ===================================== model/src/main/resources/fixtures/global.properties ===================================== @@ -25,4 +25,4 @@ REFERENCE_DATA_COUNT=68 ENTITIES_LIMIT_SIZE=100 # fr.ird.observe.services.service.referential.ReferentialService # fr.ird.observe.services.local.service.referential.DifferentialModelTest -REFERENTIAL_COUNT=4391 +REFERENTIAL_COUNT=4393 ===================================== src/site/markdown/avdth/landing.md ===================================== @@ -14,7 +14,7 @@ Table déversée dans la table d'ObServe **Landing**. | LOT_COM_04 | C_ESP | Landing.species | [2](#n_0_2), [5](#n_0_5) | | LOT_COM_05 | C_CAT_C | Landing.weightCategory | [3](#n_0_3) | | LOT_COM_06 | V_POIDS_LC | Landing.weight | | -| LOT_COM_07 | C_DEST | Landing.destination | [4](#n_0_4) | +| LOT_COM_07 | C_DEST | Landing.destination | [4](#n_0_4), [5](#n_0_5) | * Note 1 <a name="n_0_1"></a> @@ -34,8 +34,15 @@ Mapping direct sur le code du référentiel **ps_landing.Destination**. * Note 5 <a name="n_0_5"></a> -On positionne **ps_landing.Landing.fate** à partir du code suivant +On positionne **ps_landing.Landing.fate** en suivant ce code -```ps_landing.Fate(LOT_COM.C_ESP == 8 ? 2 : 1)``` +**FIXME Voir https://gitlab.com/ultreiaio/ird-observe/-/issues/2959 ** + +On distingue quatre cas : + +1. Si LOT_COM.C_DEST dans ```4 ou 5``` alors on utilise ps_landing.Fate de code 4 (transbordement) +2. Si LOT_COM.C_DEST dans ```18, 28, 40 à 61, 64 à 65)``` alors on utilise ps_landing.Fate de code 3 (vendu au marché local) +2. Sinon si LOT_COM.C_ESP est dans ```8, 800 à 899``` alors on utilise ps_landing.Fate de code 2 (rejeté) +3. Sinon on utilise ps_landing.Fate de code 1 (traité) [Retour à l'introduction](./index.html) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2fd990750c8b5a6f5535b7c4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/2fd990750c8b5a6f5535b7c4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/issue_2959
by Tony CHEMIT (＠tchemit) Dec. 11, 2024

Dec. 11, 2024

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

1 0

[Git][ultreiaio/ird-observe][feature/issue_2959] Update tests fixtures
by Tony CHEMIT (＠tchemit) Dec. 11, 2024

Dec. 11, 2024

Tony CHEMIT pushed to branch feature/issue_2959 at ultreiaio / ird-observe Commits: 2bca2b11 by Tony Chemit at 2024-12-11T11:43:57+01:00 Update tests fixtures - - - - - 3 changed files: - core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-ps-default.json - model/src/main/resources/fixtures/global.properties Changes: ===================================== core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties ===================================== @@ -95,7 +95,7 @@ ps_common.transmittingBuoyType=62 ps_common.vesselActivity=39 ps_common.weightCategory=137 ps_landing.destination=30 -ps_landing.fate=2 +ps_landing.fate=4 ps_localmarket.batchComposition=3 ps_localmarket.batchWeightType=4 ps_localmarket.packaging=53 ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-ps-default.json ===================================== @@ -13483,6 +13483,38 @@ } ] }, + { + "datum": { + "text": "3##Vendu sur le marché local", + "type": "fr.ird.observe.dto.referential.ps.landing.FateDto", + "id": "fr.ird.referential.ps.landing.Fate#1714114980513#0.3095970028802679", + "topiaVersion": 0, + "lastUpdateDate": "2024-04-26T11:03:00.513Z" + }, + "messages": [ + { + "fieldName": "uri", + "scope": "WARNING", + "message": "Le champ n'est pas renseigné." + } + ] + }, + { + "datum": { + "text": "4##Transbordé (conteneur ou cargo)", + "type": "fr.ird.observe.dto.referential.ps.landing.FateDto", + "id": "fr.ird.referential.ps.landing.Fate#1714115075625#0.4347800278392995", + "topiaVersion": 0, + "lastUpdateDate": "2024-04-26T11:04:35.625Z" + }, + "messages": [ + { + "fieldName": "uri", + "scope": "WARNING", + "message": "Le champ n'est pas renseigné." + } + ] + }, { "datum": { "text": "1##Multi spécifique (sondage)", ===================================== model/src/main/resources/fixtures/global.properties ===================================== @@ -25,4 +25,4 @@ REFERENCE_DATA_COUNT=68 ENTITIES_LIMIT_SIZE=100 # fr.ird.observe.services.service.referential.ReferentialService # fr.ird.observe.services.local.service.referential.DifferentialModelTest -REFERENTIAL_COUNT=4391 +REFERENTIAL_COUNT=4393 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2bca2b11d357233f4fcf2b97d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/2bca2b11d357233f4fcf2b97d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/issue_2959] 3 commits: Review import code for Landing.fate field
by Tony CHEMIT (＠tchemit) Dec. 11, 2024

Dec. 11, 2024

Tony CHEMIT pushed to branch feature/issue_2959 at ultreiaio / ird-observe Commits: daaf003d by Tony Chemit at 2024-12-11T11:23:11+01:00 Review import code for Landing.fate field - - - - - 0c74c297 by Tony Chemit at 2024-12-11T11:23:11+01:00 Update AVDTH documentation - - - - - 0c44ebc6 by Tony Chemit at 2024-12-11T11:23:11+01:00 Add by migration ps_landing.Fate 3 and 4 if necessary - - - - - 7 changed files: - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/common/LandingReader.java - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_4.java - + core/persistence/migration/src/main/resources/db/migration/v9/9.4/06_issue-2959_add_referential_ps_landing_Fate_3-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.4/06_issue-2959_add_referential_ps_landing_Fate_4-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.4/06_issue-2959_add_referential_ps_landing_Fate_finalize-common.sql - src/site/markdown/avdth/landing.md Changes: ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java ===================================== @@ -69,7 +69,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.TreeMap; -import java.util.function.Consumer; /** * Contains all referential used in import and all the logic of them. @@ -113,8 +112,10 @@ public class ImportReferentialContext { private SizeMeasureType sizeMeasureTypeDL; private DataQuality dataQualityA; private DataQuality dataQualityE; - private Fate fate1; - private Fate fate2; + private Fate fateProcessed; + private Fate fateDiscarded; + private Fate fateSoldOnLocalMarket; + private Fate fateTransshipment; private AcquisitionStatus acquisitionStatus1; private AcquisitionStatus acquisitionStatus999; private TransmittingBuoyType transmittingBuoyType98; @@ -185,8 +186,10 @@ public class ImportReferentialContext { landingCategories = Maps.uniqueIndex(referential.getWeightCategory(), WeightCategory::getCode); Map<String, Fate> fates = Maps.uniqueIndex(referential.getFate(), Fate::getCode); - fate1 = fates.get("1"); - fate2 = fates.get("2"); + fateProcessed = fates.get("1"); + fateDiscarded = fates.get("2"); + fateSoldOnLocalMarket = fates.get("3"); + fateTransshipment = fates.get("4"); destinations = Maps.uniqueIndex(referential.getDestination(), Destination::getCode); @@ -388,8 +391,12 @@ public class ImportReferentialContext { return schoolType2; } + public boolean isSpeciesDiscarded(String speciesCode) { + return speciesCode.equals("8") || (speciesCode.startsWith("8") && speciesCode.length() == 3); + } + public SpeciesFate getSpeciesFate(String speciesCode) { - if (speciesCode.equals("8") || (speciesCode.startsWith("8") && speciesCode.length() == 3)) { + if (isSpeciesDiscarded(speciesCode)) { // all species in avdth with code 8 or 8xx are discard return speciesFate11; } @@ -453,12 +460,20 @@ public class ImportReferentialContext { return transmittingBuoyOperation1; } - public Fate getFateBySpeciesCode(String originalSpeciesCode) { - // fate 1 if not discarded, 2 discarded (only for species 8) - if (originalSpeciesCode.equals("8")) { - return fate2; - } - return fate1; + public Fate getFateProcessed() { + return fateProcessed; + } + + public Fate getFateDiscarded() { + return fateDiscarded; + } + + public Fate getFateSoldOnLocalMarket() { + return fateSoldOnLocalMarket; + } + + public Fate getFateTransshipment() { + return fateTransshipment; } public Harbour getHarbour(String code) { ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/common/LandingReader.java ===================================== @@ -27,6 +27,7 @@ import fr.ird.observe.entities.data.ps.landing.Landing; import fr.ird.observe.entities.referential.common.Species; import fr.ird.observe.entities.referential.ps.common.WeightCategory; import fr.ird.observe.entities.referential.ps.landing.Destination; +import fr.ird.observe.entities.referential.ps.landing.Fate; import fr.ird.observe.persistence.avdth.data.DataQueryDefinition; import fr.ird.observe.persistence.avdth.data.DataReader; import fr.ird.observe.persistence.avdth.data.ImportDataContext; @@ -106,8 +107,34 @@ public class LandingReader extends DataReader<Landing> { String destinationCode = resultSet.getString(7); Destination destination = dataContext.getDestination(destinationCode); entity.setDestination(destination); - entity.setFate(dataContext.getFateBySpeciesCode(originalSpeciesCode)); + Fate fate = getFate(dataContext, originalSpeciesCode, destinationCode); + entity.setFate(fate); return entity; } + + private Fate getFate(ImportDataContext dataContext, String originalSpeciesCode, String avdthDestinationCode) { + if (avdthDestinationCode != null) { + int code = Integer.parseInt(avdthDestinationCode); + if (isDestinationCodeToTransshipment(code)) { + return dataContext.getFateTransshipment(); + } + if (isDestinationCodeToSoldOnLocalMarket(code)) { + return dataContext.getFateSoldOnLocalMarket(); + } + } + if (dataContext.isSpeciesDiscarded(originalSpeciesCode)) { + return dataContext.getFateDiscarded(); + } + return dataContext.getFateProcessed(); + } + + private boolean isDestinationCodeToTransshipment(int code) { + return code == 3 || code == 4; + } + + private boolean isDestinationCodeToSoldOnLocalMarket(int code) { + return code == 18 || code == 28 || (code >= 40 && code <= 61) || (code >= 64 && code <= 65); + } + } ===================================== core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_4.java ===================================== @@ -34,6 +34,9 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.sql.ResultSet; import java.sql.SQLException; +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.stream.Stream; /** * Created at 11/09/2024. @@ -66,6 +69,8 @@ public class DataSourceMigrationForVersion_9_4 extends ByMajorMigrationVersionRe issue2669(executor); // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2932 issue2932(executor,withIds); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2959 + issue2959(executor,withIds); } private void issue2914(MigrationVersionResourceExecutor executor) { @@ -104,6 +109,23 @@ public class DataSourceMigrationForVersion_9_4 extends ByMajorMigrationVersionRe executor.addScript("05_06", "issue-2932_update-table-ll-observation-weight-measure"); } + + private void issue2959(MigrationVersionResourceExecutor executor, boolean withIds) { + if (withIds) { + Set<String> existingCodes = executor.findMultipleResultAstSet(SqlQuery.wrap("SELECT CODE FROM ps_landing.Fate", resultSet -> resultSet.getString(1))); + Set<String> newCodes = new LinkedHashSet<>(); + Stream.of("3", "4").forEach(code -> { + if (!existingCodes.contains(code)) { + executor.addScript("06_issue-2959_add_referential_ps_landing_Fate", code); + newCodes.add(code); + } + }); + if (!newCodes.isEmpty()) { + executor.addScript("06_issue-2959_add_referential_ps_landing_Fate", "finalize"); + } + } + } + private static class BasketRecord { private final String id; private final Float floatline1Length; ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.4/06_issue-2959_add_referential_ps_landing_Fate_3-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2024 IRD, 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% +--- +INSERT INTO ps_landing.Fate(topiaid, topiaversion, topiacreatedate, lastUpdateDate, needComment, status, code, label1, label2, label3, discard) VALUES ('fr.ird.referential.ps.landing.Fate#1714114980513#0.3095970028802679', 0, '2024-04-26T09:00:41.215Z'::timestamp, '2024-04-26T09:03:00.513Z'::timestamp, FALSE, 1, '3' , 'Sold for local market', 'Vendu sur le marché local', 'Vendido en el mercado local', false); ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.4/06_issue-2959_add_referential_ps_landing_Fate_4-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2024 IRD, 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% +--- +INSERT INTO ps_landing.Fate(topiaid, topiaversion, topiacreatedate, lastUpdateDate, needComment, status, code, label1, label2, label3, discard) VALUES ('fr.ird.referential.ps.landing.Fate#1714115075625#0.4347800278392995', 0, '2024-04-26T09:03:12.339Z'::timestamp, '2024-04-26T09:04:35.625Z'::timestamp, FALSE, 1, '4' , 'Transshipment (container or cargo)', 'Transbordé (conteneur ou cargo)', 'Transbordo (contenedor o carga)', false); ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.4/06_issue-2959_add_referential_ps_landing_Fate_finalize-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2024 IRD, 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% +--- +UPDATE common.LastUpdateDate SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type ='fr.ird.observe.entities.referential.ps.landing.Fate'; ===================================== src/site/markdown/avdth/landing.md ===================================== @@ -14,7 +14,7 @@ Table déversée dans la table d'ObServe **Landing**. | LOT_COM_04 | C_ESP | Landing.species | [2](#n_0_2), [5](#n_0_5) | | LOT_COM_05 | C_CAT_C | Landing.weightCategory | [3](#n_0_3) | | LOT_COM_06 | V_POIDS_LC | Landing.weight | | -| LOT_COM_07 | C_DEST | Landing.destination | [4](#n_0_4) | +| LOT_COM_07 | C_DEST | Landing.destination | [4](#n_0_4), [5](#n_0_5) | * Note 1 <a name="n_0_1"></a> @@ -34,8 +34,15 @@ Mapping direct sur le code du référentiel **ps_landing.Destination**. * Note 5 <a name="n_0_5"></a> -On positionne **ps_landing.Landing.fate** à partir du code suivant +On positionne **ps_landing.Landing.fate** en suivant ce code -```ps_landing.Fate(LOT_COM.C_ESP == 8 ? 2 : 1)``` +**FIXME Voir https://gitlab.com/ultreiaio/ird-observe/-/issues/2959 ** + +On distingue quatre cas : + +1. Si LOT_COM.C_DEST dans ```4 ou 5``` alors on utilise ps_landing.Fate de code 4 (transbordement) +2. Si LOT_COM.C_DEST dans ```18, 28, 40 à 61, 64 à 65)``` alors on utilise ps_landing.Fate de code 3 (vendu au marché local) +2. Sinon si LOT_COM.C_ESP est dans ```8, 800 à 899``` alors on utilise ps_landing.Fate de code 2 (rejeté) +3. Sinon on utilise ps_landing.Fate de code 1 (traité) [Retour à l'introduction](./index.html) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9bc1160aed3074cbdf48383c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9bc1160aed3074cbdf48383c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/issue_2959] Update AVDTH documentation
by Tony CHEMIT (＠tchemit) Dec. 10, 2024

Dec. 10, 2024

Tony CHEMIT pushed to branch feature/issue_2959 at ultreiaio / ird-observe Commits: 9bc1160a by Tony Chemit at 2024-12-10T20:47:04+01:00 Update AVDTH documentation - - - - - 1 changed file: - src/site/markdown/avdth/landing.md Changes: ===================================== src/site/markdown/avdth/landing.md ===================================== @@ -14,7 +14,7 @@ Table déversée dans la table d'ObServe **Landing**. | LOT_COM_04 | C_ESP | Landing.species | [2](#n_0_2), [5](#n_0_5) | | LOT_COM_05 | C_CAT_C | Landing.weightCategory | [3](#n_0_3) | | LOT_COM_06 | V_POIDS_LC | Landing.weight | | -| LOT_COM_07 | C_DEST | Landing.destination | [4](#n_0_4) | +| LOT_COM_07 | C_DEST | Landing.destination | [4](#n_0_4), [5](#n_0_5) | * Note 1 <a name="n_0_1"></a> @@ -34,8 +34,15 @@ Mapping direct sur le code du référentiel **ps_landing.Destination**. * Note 5 <a name="n_0_5"></a> -On positionne **ps_landing.Landing.fate** à partir du code suivant +On positionne **ps_landing.Landing.fate** en suivant ce code -```ps_landing.Fate(LOT_COM.C_ESP == 8 ? 2 : 1)``` +**FIXME Voir https://gitlab.com/ultreiaio/ird-observe/-/issues/2959 ** + +On distingue quatre cas : + +1. Si LOT_COM.C_DEST dans ```4 ou 5``` alors on utilise ps_landing.Fate de code 4 (transbordement) +2. Si LOT_COM.C_DEST dans ```18, 28, 40 à 61, 64 à 65)``` alors on utilise ps_landing.Fate de code 3 (vendu au marché local) +2. Sinon si LOT_COM.C_ESP est dans ```8, 800 à 899``` alors on utilise ps_landing.Fate de code 2 (rejeté) +3. Sinon on utilise ps_landing.Fate de code 1 (traité) [Retour à l'introduction](./index.html) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9bc1160aed3074cbdf48383c0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9bc1160aed3074cbdf48383c0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/issue_2959
by Tony CHEMIT (＠tchemit) Dec. 10, 2024

Dec. 10, 2024

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

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: Rename ImportDataContext.observedSystemCodes to ImportDataContext.avdthObservedSystemCodes
by Tony CHEMIT (＠tchemit) Dec. 10, 2024

Dec. 10, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0029ceac by Tony Chemit at 2024-12-10T19:27:42+01:00 Rename ImportDataContext.observedSystemCodes to ImportDataContext.avdthObservedSystemCodes - - - - - 6cf171ff by Tony Chemit at 2024-12-10T19:27:59+01:00 Clean ImportDataContext.avdthObservedSystemCodes at a better place and no more in FloatingObjectReader.resetContext method (which is removed) - - - - - 18425465 by Tony Chemit at 2024-12-10T19:27:59+01:00 Clean code - - - - - 70cf3133 by Tony Chemit at 2024-12-10T19:38:17+01:00 Now just clean the method to add observed system 20 if required from avdth observed system code found - - - - - 2fd99075 by Tony Chemit at 2024-12-10T19:44:09+01:00 Merge branch 'feature/issue_2961' into develop 2 mappings AVDTH ASSOC non fonctionnels - Closes #2961 - - - - - 4 changed files: - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportDataContext.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportEngineExecution.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/ActivityReader.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java Changes: ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportDataContext.java ===================================== @@ -28,7 +28,6 @@ import fr.ird.observe.entities.data.ps.logbook.Route; import fr.ird.observe.entities.referential.ps.common.ObservedSystem; import fr.ird.observe.persistence.avdth.data.logbook.FloatingObjectReader; -import java.util.Iterator; import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; @@ -50,7 +49,12 @@ public class ImportDataContext extends ImportReferentialContext { private Trip trip; private Route route; private Activity activity; - private Set<String> observedSystemCodes; + /** + * Collected avdth observed system code from the ACT_ASSOC. + * + * @see fr.ird.observe.persistence.avdth.data.logbook.ActivityReader.ActivityObservedSystemTableReader + */ + private Set<String> avdthObservedSystemCodes; private boolean canCreateActivity; public boolean isCanCreateActivity() { @@ -96,50 +100,42 @@ public class ImportDataContext extends ImportReferentialContext { return activityPkToId; } - public Set<String> getObservedSystemCodes() { - return observedSystemCodes; + public Set<String> getAvdthObservedSystemCodes() { + return avdthObservedSystemCodes; } public Set<ObservedSystem> getObservedSystems() { return observedSystems; } - public void setObservedSystemCodes(Set<String> observedSystemCodes) { - this.observedSystemCodes = observedSystemCodes; + public void setAvdthObservedSystemCodes(Set<String> avdthObservedSystemCodes) { + this.avdthObservedSystemCodes = avdthObservedSystemCodes; } public void addDefaultObservedSystemOrSanitizeFloatingObjectOnes(Activity entity) { - if (entity.isObservedSystemEmpty()) { - // add no observed system - entity.addObservedSystem(getObservedSystem0()); - } else { - // Remove any observed system from code 21 to 25, and at last if one of them has been found - // add (if not already present the observed system 20, this case should never happen, but just in case...) - // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2548 - boolean observedSystemsToRemoveFound = false; - boolean observedSystem20Found = false; - - Set<ObservedSystem> observedSystems = entity.getObservedSystem(); - Iterator<ObservedSystem> iterator = observedSystems.iterator(); + // Remove any observed system from code 21 to 25, and at last if one of them has been found + // add (if not already present the observed system 20, this case should never happen, but just in case...) + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2548 + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2961 - while (iterator.hasNext()) { - ObservedSystem observedSystem = iterator.next(); - if (FloatingObjectReader.OBSERVED_SYTEM_CODES_TO_REMOVE.contains(observedSystem.getCode())) { - // remove this one - iterator.remove(); - observedSystemsToRemoveFound = true; - continue; - } + boolean floatingObjectCreatedByObservedSystem = avdthObservedSystemCodes.stream().anyMatch(FloatingObjectReader.OBSERVED_SYTEM_CODES_WITH_DCP::contains); + if (floatingObjectCreatedByObservedSystem) { + boolean observedSystem20Found = false; + for (ObservedSystem observedSystem : entity.getObservedSystem()) { if ("20".equals(observedSystem.getCode())) { observedSystem20Found = true; } } - if (observedSystemsToRemoveFound && !observedSystem20Found) { - // add the Observed system 20 (This cas should never happen, but I can not afford to check it now...) - ObservedSystem observedSystem20 = getObservedSystem20(); - observedSystems.add(observedSystem20); + if (!observedSystem20Found) { + // add the Observed system 20 + entity.addObservedSystem(getObservedSystem20()); + return; } } + if (entity.isObservedSystemEmpty()) { + // add no observed system + entity.addObservedSystem(getObservedSystem0()); + } } public void computeCanCreateActivity() { ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportEngineExecution.java ===================================== @@ -157,7 +157,7 @@ public class ImportEngineExecution extends ImportEngine { // load observed systems for this activity Set<String> observedSystemCodes = activityReader.readObservedSystem(context, tables.activityObservedSystemTableReader, ActivityReader.getActivityPk(activityRow)); - context.setObservedSystemCodes(observedSystemCodes); + context.setAvdthObservedSystemCodes(observedSystemCodes); // load activity Activity activity = activityWriter.intercept(activityRow, routeId, 0); @@ -176,6 +176,8 @@ public class ImportEngineExecution extends ImportEngine { // add default observed system (if none found) and sanitize some observed system coming from DCP context.addDefaultObservedSystemOrSanitizeFloatingObjectOnes(activity); + // clean this data context state + context.setAvdthObservedSystemCodes(null); // write activity observed systems activityWriter.writeObservedSystems(activity); // while loading Floating objects, we may have change the vessel activity of the activity ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/ActivityReader.java ===================================== @@ -361,10 +361,10 @@ public class ActivityReader extends DataReader<Activity> { ResultSet activityObservedSystemRow = activityObservedSystemTableReader.next(); String avdthSystemCode = activityObservedSystemRow.getString(6); observedSystemCodes.add(avdthSystemCode); - if (!ObservedSystemInterceptor.CODE_MAPPING.containsKey(avdthSystemCode)) { + String observeSystemCode = ObservedSystemInterceptor.CODE_MAPPING.get(avdthSystemCode); + if (observeSystemCode == null) { throw new IllegalStateException(String.format("Can't find observedSystem with code: %s from ad-hoc AVDTH to ObServe mapping", avdthSystemCode)); } - String observeSystemCode = ObservedSystemInterceptor.CODE_MAPPING.get(avdthSystemCode); ObservedSystem observedSystem = dataContext.getObservedSystem(observeSystemCode); observedSystems.add(observedSystem); } ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java ===================================== @@ -208,11 +208,7 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { * Observed system from {@code ACT_ASSOC} which can create a Floating object. */ public static final Set<String> OBSERVED_SYTEM_CODES_WITH_DCP = Set.of("20", "21", "22", "23", "24", "25", "81"); - /** - * We need to remove thoses observed system at the end when writing them to activity. - * See <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2548">issue 2548</a> - */ - public static final Set<String> OBSERVED_SYTEM_CODES_TO_REMOVE = Set.of("21", "22", "23", "24", "25"); + private final MutableInt floatingObjectPartCount = new MutableInt(); private final MutableInt transmittingBuoyCount = new MutableInt(); @@ -232,13 +228,13 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { VesselActivity vesselActivity = activity.getVesselActivity(); // Avdth observed system codes associated to the current activity (need them to compute ex nihilo floating object) - Set<String> observedSystemCodes = dataContext.getObservedSystemCodes(); + Set<String> avdthObservedSystemCodes = dataContext.getAvdthObservedSystemCodes(); // We need to get the original vessel activity code from AVDTH (to compute some mapping) String vesselActivityCode = resultSet.getString(13); // Is the floating object can be created by the observed systems? - boolean floatingObjectCreatedByObservedSystem = observedSystemCodes.stream().anyMatch(OBSERVED_SYTEM_CODES_WITH_DCP::contains); + boolean floatingObjectCreatedByObservedSystem = avdthObservedSystemCodes.stream().anyMatch(OBSERVED_SYTEM_CODES_WITH_DCP::contains); // Is the current vessel activity accept to create Floating object? boolean vesselActivityAllowFad = vesselActivity.isAllowFad(); @@ -266,7 +262,6 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { // neither the buoy exist in avdth, // neither need to be created by observed system, // Do not create the floating object (no log is required here: we are on an activity with no floating object) - reset(dataContext); return null; } @@ -296,7 +291,6 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { } // do not create the floating object - reset(dataContext); return null; } @@ -323,16 +317,11 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { if (observedSystem != null) { activity.addObservedSystem(observedSystem); } - // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2802 - if (observedSystemCodes.contains("81")) { - activity.addObservedSystem(dataContext.getObservedSystem20()); - } - boolean addBuoyFromObservedSystem = addFloatingObjectMaterials(dataContext, resultSet, vesselActivityCode, objectTypeCode, - observedSystemCodes, + avdthObservedSystemCodes, objectOperation, entity, floatingObjectExistsInAvdth, @@ -348,7 +337,6 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { // only add buoy if buoy type known entity.addTransmittingBuoy(transmittingBuoy); } - reset(dataContext); return entity; } @@ -356,7 +344,7 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { ResultSet resultSet, String vesselActivityCode, String objectTypeCode, - Set<String> observedSystemCodes, + Set<String> avdthObservedSystemCodes, ObjectOperation objectOperation, FloatingObject entity, boolean floatingObjectExistsInAvdth, @@ -379,40 +367,40 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { } } - if (observedSystemCodes.contains("20")) { + if (avdthObservedSystemCodes.contains("20")) { // add ObjectMaterial FOB addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialFOB(), whenArriving, whenLeaving, entity); addDefaultObjectMaterialOnUnknownObjectType = false; } - if (observedSystemCodes.contains("21")) { + if (avdthObservedSystemCodes.contains("21")) { // add ObjectMaterial 2-1-1 VNLOG addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialVNLOG(), whenArriving, whenLeaving, entity); addDefaultObjectMaterialOnUnknownObjectType = false; } - if (observedSystemCodes.contains("22")) { + if (avdthObservedSystemCodes.contains("22")) { // add ObjectMaterial 2-1-1 VNLOG + 1-1 DFAD addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialVNLOG(), whenArriving, whenLeaving, entity); addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialDFAD(), whenArriving, whenLeaving, entity); addDefaultObjectMaterialOnUnknownObjectType = false; addBuoyFromObservedSystem = true; } - if (observedSystemCodes.contains("23")) { + if (avdthObservedSystemCodes.contains("23")) { // add ObjectMaterial 2-2 ALOG addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialALOG(), whenArriving, whenLeaving, entity); addDefaultObjectMaterialOnUnknownObjectType = false; } - if (observedSystemCodes.contains("24")) { + if (avdthObservedSystemCodes.contains("24")) { // add ObjectMaterial 1-1 DFAD addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialDFAD(), whenArriving, whenLeaving, entity); addDefaultObjectMaterialOnUnknownObjectType = false; addBuoyFromObservedSystem = true; } - if (observedSystemCodes.contains("25")) { + if (avdthObservedSystemCodes.contains("25")) { // add ObjectMaterial 1-2 AFAD addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialAFAD(), whenArriving, whenLeaving, entity); addDefaultObjectMaterialOnUnknownObjectType = false; } - if (observedSystemCodes.contains("81")) { + if (avdthObservedSystemCodes.contains("81")) { // add ObjectMaterial 2-1-2-1 Carrion addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialCarrion(), whenArriving, whenLeaving, entity); addDefaultObjectMaterialOnUnknownObjectType = false; @@ -475,11 +463,6 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { return transmittingBuoy; } - private void reset(ImportDataContext dataContext) { - // as soon as entity was flush, let's clear internal states - dataContext.setObservedSystemCodes(null); - } - private void addObjectMaterial(String vesselActivityCode, Set<String> objectMaterialUsed, ObjectMaterial objectMaterial, boolean whenArriving, boolean whenLeaving, FloatingObject floatingObject) { if (!whenArriving && !whenLeaving) { throw new IllegalStateException(String.format("Can't have not whenArriving and not whenLeaving from ACTIVITE.C_OPERA: %s", vesselActivityCode)); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3774d8273efe98d3f0094a48… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3774d8273efe98d3f0094a48… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: use proper callback for the dedicated option (we need to reload database to...
by Tony CHEMIT (＠tchemit) Dec. 10, 2024

Dec. 10, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1ad00f06 by Tony Chemit at 2024-12-10T16:39:40+01:00 use proper callback for the dedicated option (we need to reload database to recompute all permissions) - - - - - a5305eba by Tony Chemit at 2024-12-10T17:08:44+01:00 fix content title text and icon when db is editable - - - - - 3774d827 by Tony Chemit at 2024-12-10T17:11:33+01:00 Merge branch 'feature/issue_2951' into develop L'option d'édition du référentiel d'une base locale nécessite un rechargement manuel de la source de données - Closes #2951 - - - - - 2 changed files: - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIHandler.java Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java ===================================== @@ -414,7 +414,7 @@ public class ClientConfigUI extends JXTitledPanel implements WithClientUIContext helper.addOption(ClientConfigOption.H2_CAN_MIGRATE).setOptionCallBack("application"); helper.addOption(ClientConfigOption.OBSTUNA_CAN_MIGRATE).setOptionCallBack("application"); helper.addOption(ClientConfigOption.H2_SERVER_PORT).setOptionCallBack("application"); - helper.addOption(ClientConfigOption.H2_CAN_EDIT_REFERENTIAL).setOptionCallBack("ui"); + helper.addOption(ClientConfigOption.H2_CAN_EDIT_REFERENTIAL).setOptionCallBack("db"); helper.addOption(ClientConfigOption.AVDTH_FORCE_IMPORT).setOptionCallBack("ui"); helper.addOption(ClientConfigOption.SHOW_SQL); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/ContentReferentialUIHandler.java ===================================== @@ -207,6 +207,23 @@ public class ContentReferentialUIHandler<D extends ReferentialDto, R extends Ref } }; ChangeMode<U> changeMode = new ChangeMode<>(request, changeModeProducer, null) { + @Override + protected void rebuildTitle(U ui, ContentMode newValue) { + if (Objects.equals(newValue, ContentMode.READ) ) { + ContentReferentialUIModelStates<D, R> states = ui.getModel().getStates(); + boolean editable = states.isEditable(); + String titleSuffix; + if (editable) { + titleSuffix = I18n.t("observe.Common.action.updating"); + } else { + titleSuffix = I18n.t("observe.Common.action.notEditable"); + } + String contentTitle = states.getContentTitle() + " - " + titleSuffix; + ui.setTitle(contentTitle); + return; + } + super.rebuildTitle(ui, newValue); + } protected void rebuildAction(U ui, ContentMode newValue) { boolean editable; @@ -230,7 +247,7 @@ public class ContentReferentialUIHandler<D extends ReferentialDto, R extends Ref editable = states.isEditable(); if (editable) { tip = I18n.n("observe.data.Openable.action.editable.tip"); - icon = UIHelper.getContentActionIcon("locked"); + icon = UIHelper.getContentActionIcon("unlocked"); } else { tip = I18n.n("observe.data.Openable.action.notEditable.tip"); icon = UIHelper.getContentActionIcon("not-editable"); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5f4f009403f9958233e68599… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5f4f009403f9958233e68599… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Remove tagNumber data-binding (this is already done by the handler)
by Tony CHEMIT (＠tchemit) Dec. 10, 2024

Dec. 10, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ae91f8e4 by Tony Chemit at 2024-12-10T16:25:47+01:00 Remove tagNumber data-binding (this is already done by the handler) - - - - - 7bd20224 by Tony Chemit at 2024-12-10T16:26:03+01:00 Remove tagNumber data-binding (this is already done by the handler) - - - - - 1c05758d by Tony Chemit at 2024-12-10T16:26:46+01:00 Make number enabled when individual and disabled (with value removed) when grouped - - - - - 5f4f0094 by Tony Chemit at 2024-12-10T16:26:52+01:00 Merge branch 'feature/issue_2950' into develop LL/observations/capture : Champ numéro au virage devrait être désactivé en saisie groupée - Closes #2950 - - - - - 2 changed files: - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java Changes: ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jcss ===================================== @@ -58,10 +58,6 @@ enabled:{!tableModel.isEditable() || tableModel.isCreate()}; } -#tagNumber { - enabled:{tableEditBean.getAcquisitionMode() == 0}; -} - /* ***************************************************************************** */ /* DEPREDATED TAB ************************************************************* */ /* ***************************************************************************** */ ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java ===================================== @@ -257,6 +257,7 @@ public class SetCatchUIHandler extends GeneratedSetCatchUIHandler { case GROUPED: if (createMode) { editBean.setCount(null); + editBean.setNumber(null); editBean.setTagNumber(null); editBean.setSection(null); editBean.setBasket(null); @@ -286,6 +287,8 @@ public class SetCatchUIHandler extends GeneratedSetCatchUIHandler { ui.getSection().setEnabled(isIndividual); ui.getBasket().setEnabled(isIndividual); ui.getBranchline().setEnabled(isIndividual); + ui.getNumber().setEnabled(isIndividual); + ui.getTagNumber().setEnabled(isIndividual); if (createMode) { // on propage le mode de saisie dans le bean editBean.setAcquisitionMode(newMode.ordinal()); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/13479925786d8dc245f45b6b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/13479925786d8dc245f45b6b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Rename method ObjectMaterialDto.isCodeValid to...
by Tony CHEMIT (＠tchemit) Dec. 10, 2024

Dec. 10, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 22ff23ea by Tony Chemit at 2024-12-10T15:57:59+01:00 Rename method ObjectMaterialDto.isCodeValid to ObjectMaterialDto.isCodeCompliantWithParent and improve it - - - - - 981ba480 by Tony Chemit at 2024-12-10T15:58:36+01:00 Rename method ObjectMaterialDto.isCodeValid to ObjectMaterialDto.isCodeCompliantWithParent and improve it - - - - - c8f2b90f by Tony Chemit at 2024-12-10T15:59:18+01:00 Only validate code if material has a parent - - - - - 13479925 by Tony Chemit at 2024-12-10T15:59:31+01:00 Merge branch 'feature/issue_2952' into develop Problème dans la consultation des données de référence Objet flottant matériel - Closes #2952 - - - - - 5 changed files: - core/api/dto/src/main/java/fr/ird/observe/dto/referential/ps/common/ObjectMaterialDto.java - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/ObjectMaterialDto-create-error-validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/ObjectMaterialDto-update-error-validation.json - core/api/validation/src/main/validation/fr/ird/observe/dto/referential/ps/common/ObjectMaterialDto-create-error-validation.json - core/api/validation/src/main/validation/fr/ird/observe/dto/referential/ps/common/ObjectMaterialDto-update-error-validation.json Changes: ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/referential/ps/common/ObjectMaterialDto.java ===================================== @@ -45,16 +45,28 @@ public class ObjectMaterialDto extends GeneratedObjectMaterialDto { return objectMaterialType != null && ProtectedIdsPs.PS_COMMON_OBJECT_MATERIAL_TYPE_FLOAT.equals(objectMaterialType.getId()); } - public boolean isCodeValid() { + /** + * @return {@code true} if code is compliant with his associated parent code, {@code false} otherwise. + * @see #getParent() + * @see #getCode() + */ + public boolean isCodeCompliantWithParent() { ObjectMaterialReference parent = getParent(); + String code = getCode(); if (parent == null) { + // If no parent, then accept anything here return true; } + if (code == null || code.trim().isEmpty()) { + // If a parent is defined, code can not be null nor empty + return false; + } String parentCode = parent.getCode(); - if (parentCode == null || parentCode.isEmpty()) { + if (parentCode == null || parentCode.trim().isEmpty()) { + // if parent code is null or empty, then accept any code (even if we might only accept code without any «-» inside it) return true; } - String code = getCode(); + // In any other cases, code must starts with «parentCode-» return code.startsWith(parentCode + "-"); } ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/ObjectMaterialDto-create-error-validation.json ===================================== @@ -16,7 +16,8 @@ "validator": "io.ultreia.java4all.validation.impl.java.validator.FieldExpressionValidator", "comment": "code must be compliant with his parent code", "parameters": { - "expression": "$o.codeValid" + "skip": "$o.parent == null", + "expression": "$o.codeCompliantWithParent" }, "message": "observe.referential.ps.common.ObjectMaterial.validation.bad.parentCode##$o.parent.code" } ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/referential/ps/common/ObjectMaterialDto-update-error-validation.json ===================================== @@ -16,7 +16,8 @@ "validator": "io.ultreia.java4all.validation.impl.java.validator.FieldExpressionValidator", "comment": "code must be compliant with his parent code", "parameters": { - "expression": "$o.codeValid" + "skip": "$o.parent == null", + "expression": "$o.codeCompliantWithParent" }, "message": "observe.referential.ps.common.ObjectMaterial.validation.bad.parentCode##$o.parent.code" } ===================================== core/api/validation/src/main/validation/fr/ird/observe/dto/referential/ps/common/ObjectMaterialDto-create-error-validation.json ===================================== @@ -4,7 +4,8 @@ "validator": "io.ultreia.java4all.validation.impl.java.validator.FieldExpressionValidator", "comment": "code must be compliant with his parent code", "parameters": { - "expression": "$o.codeValid" + "skip" : "$o.parent == null", + "expression": "$o.codeCompliantWithParent" }, "message": "observe.referential.ps.common.ObjectMaterial.validation.bad.parentCode##$o.parent.code" } ===================================== core/api/validation/src/main/validation/fr/ird/observe/dto/referential/ps/common/ObjectMaterialDto-update-error-validation.json ===================================== @@ -4,7 +4,8 @@ "validator": "io.ultreia.java4all.validation.impl.java.validator.FieldExpressionValidator", "comment": "code must be compliant with his parent code", "parameters": { - "expression": "$o.codeValid" + "skip" : "$o.parent == null", + "expression": "$o.codeCompliantWithParent" }, "message": "observe.referential.ps.common.ObjectMaterial.validation.bad.parentCode##$o.parent.code" } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4d2d332a0d5e8e195959f23f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4d2d332a0d5e8e195959f23f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Souci de l'UI configuration sur les options de type liste - Closes #2956
by Tony CHEMIT (＠tchemit) Dec. 10, 2024

Dec. 10, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4d2d332a by Tony Chemit at 2024-12-10T13:39:45+01:00 Souci de l'UI configuration sur les options de type liste - Closes #2956 - - - - - 1 changed file: - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java ===================================== @@ -123,7 +123,6 @@ public class ClientConfigUI extends JXTitledPanel implements WithClientUIContext public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - String speciesListId = String.valueOf(value); SpeciesListReference speciesList = entityMap.get(speciesListId); return super.getTableCellRendererComponent(table, decorator.decorate(speciesList), isSelected, hasFocus, row, column); @@ -162,13 +161,16 @@ public class ClientConfigUI extends JXTitledPanel implements WithClientUIContext if (value instanceof String) { value = SpeciesListTableCellEditor.this.entityMap.get(String.valueOf(value)); } + if (value==null) { + return; + } component.setSelectedItem((SpeciesListReference) value); } @Override public Object getCellEditorValue() { SpeciesListReference selectedItem = component.getModel().getSelectedItem(); - return selectedItem.getId(); + return selectedItem == null ? null : selectedItem.getId(); } @Override @@ -182,6 +184,10 @@ public class ClientConfigUI extends JXTitledPanel implements WithClientUIContext @Override public boolean stopCellEditing() { + if (component.getModel().getSelectedItem()==null) { + super.cancelCellEditing(); + return true; + } if (component.getConfig().isEditable()) { // Commit edited value. component.getCombobox().actionPerformed(new ActionEvent(SpeciesListTableCellEditor.this, 0, "")); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4d2d332a0d5e8e195959f23f9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4d2d332a0d5e8e195959f23f9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 7 commits: Suppression du pom parent
by Tony CHEMIT (＠tchemit) Dec. 10, 2024

Dec. 10, 2024

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 04c9ca55 by Tony Chemit at 2024-10-09T15:01:50+02:00 Suppression du pom parent - - - - - 0f79c2d6 by Tony Chemit at 2024-10-09T15:15:01+02:00 Suppression de certains profiles déclanchés via des fichiers - - - - - 78f8544c by Tony Chemit at 2024-12-01T19:37:34+01:00 add pmd plugin and let's generate javadoc when build site - - - - - 282e6d07 by Tony Chemit at 2024-12-01T19:37:34+01:00 fix dependency to make pmd report works - - - - - a72f2cd9 by Tony Chemit at 2024-12-01T19:37:34+01:00 add mvn via mvnwrapper - - - - - 656a75cf by Tony Chemit at 2024-12-10T12:56:28+01:00 do generate javadoc when building site - - - - - 37d24904 by Tony Chemit at 2024-12-10T12:57:39+01:00 Merge branch 'feature/issue-2945' into develop Suppression du pom parent qui pointe sur un projet de mon organisation - Closes #2945 - - - - - 85 changed files: - + .mvn/wrapper/maven-wrapper.properties - − client/configuration/.mvn/add-auto-service - − client/configuration/.mvn/add-build-number - client/configuration/pom.xml - − client/core/.mvn/add-auto-service - − client/core/.mvn/jaxx-generate - client/core/pom.xml - − client/datasource/actions/.mvn/add-auto-service - − client/datasource/actions/.mvn/jaxx-generate - client/datasource/actions/pom.xml - − client/datasource/editor/api/.mvn/add-auto-service - − client/datasource/editor/api/.mvn/jaxx-generate - client/datasource/editor/api/pom.xml - − client/datasource/editor/common/.mvn/add-auto-service - − client/datasource/editor/common/.mvn/jaxx-generate - client/datasource/editor/common/pom.xml - − client/datasource/editor/ll-validation/.mvn/add-auto-service - client/datasource/editor/ll-validation/pom.xml - − client/datasource/editor/ll/.mvn/add-auto-service - − client/datasource/editor/ll/.mvn/jaxx-generate - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - − client/datasource/editor/ps-validation/.mvn/add-auto-service - client/datasource/editor/ps-validation/pom.xml - − client/datasource/editor/ps/.mvn/add-auto-service - − client/datasource/editor/ps/.mvn/jaxx-generate - client/datasource/editor/ps/pom.xml - − client/datasource/editor/spi/.mvn/add-auto-service - client/datasource/editor/spi/pom.xml - client/pom.xml - − client/runner/.mvn/add-auto-service - − client/runner/.mvn/add-build-number - − client/runner/.mvn/application-assembly - client/runner/pom.xml - − core/api/dto-consolidation/.mvn/add-auto-service - core/api/dto-consolidation/pom.xml - − core/api/dto-decoration/.mvn/add-auto-service - core/api/dto-decoration/pom.xml - − core/api/dto-pairing/.mvn/add-auto-service - core/api/dto-pairing/pom.xml - − core/api/dto-validation-templates/.mvn/add-auto-service - core/api/dto-validation-templates/pom.xml - − core/api/dto-validation/.mvn/add-auto-service - core/api/dto-validation/pom.xml - − core/api/dto/.mvn/add-auto-service - core/api/dto/pom.xml - − core/api/services/.mvn/add-auto-service - core/api/services/pom.xml - − core/api/tree/.mvn/add-auto-service - core/api/tree/pom.xml - − core/api/validation/.mvn/add-auto-service - core/api/validation/pom.xml - − core/persistence/avdth/.mvn/add-auto-service - core/persistence/avdth/pom.xml - − core/persistence/consolidation/.mvn/add-auto-service - core/persistence/consolidation/pom.xml - − core/persistence/decoration/.mvn/add-auto-service - core/persistence/decoration/pom.xml - − core/persistence/java/.mvn/add-auto-service - core/persistence/java/pom.xml - − core/persistence/migration/.mvn/add-auto-service - core/persistence/migration/pom.xml - − core/persistence/report/.mvn/add-auto-service - core/persistence/report/pom.xml - − core/services/client/.mvn/add-auto-service - core/services/client/pom.xml - − core/services/i18n/.mvn/add-auto-service - core/services/i18n/pom.xml - − core/services/local/.mvn/add-auto-service - core/services/local/pom.xml - − core/services/test/.mvn/add-auto-service - core/services/test/pom.xml - − model/.mvn/add-auto-service - model/pom.xml - + mvnw - + mvnw.cmd - pom.xml - − server/configuration/.mvn/add-auto-service - − server/configuration/.mvn/add-build-number - server/configuration/pom.xml - − server/core/.mvn/add-build-number - server/core/pom.xml - − server/runner/.mvn/add-auto-service - − server/runner/.mvn/add-build-number - server/runner/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c636885847ed5a4de6f69218… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c636885847ed5a4de6f69218… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/issue-2945
by Tony CHEMIT (＠tchemit) Dec. 10, 2024

Dec. 10, 2024

Tony CHEMIT deleted branch feature/issue-2945 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/issue-2945] do generate javadoc when building site
by Tony CHEMIT (＠tchemit) Dec. 10, 2024

Dec. 10, 2024

Tony CHEMIT pushed to branch feature/issue-2945 at ultreiaio / ird-observe Commits: 656a75cf by Tony Chemit at 2024-12-10T12:56:28+01:00 do generate javadoc when building site - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -2357,6 +2357,9 @@ <value>true</value> </property> </activation> + <properties> + <maven.javadoc.skip>false</maven.javadoc.skip> + </properties> <build> <plugins> <plugin> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/656a75cfb53570b684d39a321… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/656a75cfb53570b684d39a321… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/issue-2945] 3 commits: add pmd plugin and let's generate javadoc when build site
by Tony CHEMIT (＠tchemit) Dec. 1, 2024

Dec. 1, 2024

Tony CHEMIT pushed to branch feature/issue-2945 at ultreiaio / ird-observe Commits: 78f8544c by Tony Chemit at 2024-12-01T19:37:34+01:00 add pmd plugin and let's generate javadoc when build site - - - - - 282e6d07 by Tony Chemit at 2024-12-01T19:37:34+01:00 fix dependency to make pmd report works - - - - - a72f2cd9 by Tony Chemit at 2024-12-01T19:37:34+01:00 add mvn via mvnwrapper - - - - - 5 changed files: - + .mvn/wrapper/maven-wrapper.properties - model/pom.xml - + mvnw - + mvnw.cmd - pom.xml Changes: ===================================== .mvn/wrapper/maven-wrapper.properties ===================================== @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip ===================================== model/pom.xml ===================================== @@ -53,6 +53,11 @@ <artifactId>auto-service-annotations</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>io.ultreia.java4all.eugene</groupId> <artifactId>eugene-core</artifactId> ===================================== mvnw ===================================== @@ -0,0 +1,259 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash> +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" ===================================== mvnw.cmd ===================================== @@ -0,0 +1,149 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash> +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" ===================================== pom.xml ===================================== @@ -2419,11 +2419,21 @@ </reportSet> </reportSets> </plugin> -  -  + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jxr-plugin</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0f79c2d65c3736d8c0b00bb8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0f79c2d65c3736d8c0b00bb8… You're receiving this email because of your account on gitlab.com.

1 0