Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 6c50725a by Tony Chemit at 2023-02-24T15:43:42+01:00 Toolkit API - Use new JavaBeanMonitor API and review modifications API - - - - - bd47ef4b by Tony Chemit at 2023-02-24T15:51:18+01:00 Introduce core-api-dto-consolidation maven module - - - - - f22b19e3 by Tony Chemit at 2023-02-24T15:51:18+01:00 Log - add package fr.ird.observe.consolidation to info level (since it contains all logs of consolidation action and we want to show them in logs) - - - - - 8c291406 by Tony Chemit at 2023-02-24T15:51:18+01:00 I18n - add missing label (for computed fields on consolidate action we are now showing in log and action messages) - - - - - 7fc92d04 by Tony Chemit at 2023-02-24T15:51:18+01:00 Introduce core-persistence-consolidation maven Module and rethink consolidate API - - - - - 199297ad by Tony Chemit at 2023-02-24T15:51:18+01:00 Consolidate action - add all action results in message - - - - - 17b40e5f by Tony Chemit at 2023-02-24T16:10:12+01:00 Merge branch 'feature/issue_2630' into develop-9.0.x Revue du code de l'action de consolidation et amélioration de la sortie de l'action - Closes #2630 - - - - - 30 changed files: - client/configuration/pom.xml - client/configuration/src/main/filtered-resources/observe-log4j2.xml - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/datasource/actions/pom.xml - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client/datasource/editor/ps/pom.xml - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/DcpUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/TripBatchUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUIModelStates.java - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties - + core/api/dto-consolidation/.mvn/add-auto-service - + core/api/dto-consolidation/.mvn/pom.gitflow.develop - + core/api/dto-consolidation/.mvn/pom.gitflow.master - + core/api/dto-consolidation/.mvn/pom.organizationId - + core/api/dto-consolidation/.mvn/pom.projectId - + core/api/dto-consolidation/.mvn/pom.stageId - + core/api/dto-consolidation/LICENSE.txt - + core/api/dto-consolidation/README.md - + core/api/dto-consolidation/pom.xml - + core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/AtomicConsolidateAction.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/LengthWeightComputableAware.java → core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/ConsolidateContext.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/common/consolidate/TripConsolidateRequest.java → core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateRequest.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/common/consolidate/TripConsolidateResult.java → core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/common/TripConsolidateResult.java - + core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/dcp/ComputeBiodegradableAction.java - + core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/dcp/ComputeNonEntanglingAction.java - + core/api/dto-consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/dcp/ComputeSimplifiedObjectTypeAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3588b20bfe412dd0784fd30a8... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3588b20bfe412dd0784fd30a8... You're receiving this email because of your account on gitlab.com.