Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: ee52baba by Tony Chemit at 2023-03-10T18:51:38+01:00 update pom - - - - - e4ecc3d7 by Tony Chemit at 2023-03-10T20:30:54+01:00 Problème de sérialisation sur le retour de la consolidation en mode serveur - Closes #2641 - - - - - 3 changed files: - core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/ActivityConsolidateEngine.java - pom.xml - toolkit/api/src/main/java/fr/ird/observe/dto/ToolkitIdModifications.java Changes: ===================================== core/persistence/consolidation/src/main/java/fr/ird/observe/consolidation/data/ps/observation/ActivityConsolidateEngine.java ===================================== @@ -100,8 +100,10 @@ public class ActivityConsolidateEngine { if (r.withWarnings()) { log.info(String.format("%s Found some warnings on activity: %s - %s", activityPrefix, activity.getTopiaId(), r.getActivityLabel())); } - - + if (r.getCatchModifications() != null) { + // Replace in modifications any entity by his id (only necessary for catches modifications) + r.getCatchModifications().forEach(ToolkitIdModifications::replaceToolkitIdReferencesById); + } }); return result; } catch (Exception e) { ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.11</version> + <version>2023.12</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -128,7 +128,6 @@ <!-- FIXME <lib.version.jts>1.18.2</lib.version.jts>--> <lib.version.hsqldb>2.7.0</lib.version.hsqldb> <!-- FIXME <lib.version.hsqldb>2.7.1</lib.version.hsqldb>--> - <lib.version.java4all.java-lang>2.0.5</lib.version.java4all.java-lang> <!-- license header configuration --> <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>IRD, Ultreia.io</license.organizationName> ===================================== toolkit/api/src/main/java/fr/ird/observe/dto/ToolkitIdModifications.java ===================================== @@ -79,4 +79,15 @@ public class ToolkitIdModifications extends JavaBeanModifications implements Jso public int warningsCount() { return getWarnings() == null ? 0 : getWarnings().size(); } + + public void replaceToolkitIdReferencesById() { + for (JavaBeanPropertyModification modification : getModifications()) { + if (modification.getOldValue() instanceof ToolkitId) { + modification.setOldValue(((ToolkitId) modification.getOldValue()).getTopiaId()); + } + if (modification.getNewValue() instanceof ToolkitId) { + modification.setNewValue(((ToolkitId) modification.getNewValue()).getTopiaId()); + } + } + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ca00c3d358414d6fb1afefcb4... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ca00c3d358414d6fb1afefcb4... You're receiving this email because of your account on gitlab.com.