May 2019 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][release/7.0.7] [jgitflow-maven-plugin]updating poms for branch'release/7.0.7' with non-snapshot versions[skip ci]
by Tony CHEMIT 13 May '19

13 May '19

Tony CHEMIT pushed to branch release/7.0.7 at ultreiaio / ird-observe Commits: 25874e1c by tchemit at 2019-05-13T18:14:48Z [jgitflow-maven-plugin]updating poms for branch'release/7.0.7' with non-snapshot versions[skip ci] - - - - - 16 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.7</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.7</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.7</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.7</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.7</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.7</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.7</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.7</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.7</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.7</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.7</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.7</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.7</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.7</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.7</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.7</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/25874e1cc752a48a1eb13244032… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/25874e1cc752a48a1eb13244032… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master-7.x] 8 commits: [jgitflow-maven-plugin]updating poms for 7.0.7-SNAPSHOT development[skip ci]
by Tony CHEMIT 13 May '19

13 May '19

Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe Commits: 89f1244e by tchemit at 2019-05-06T12:03:13Z [jgitflow-maven-plugin]updating poms for 7.0.7-SNAPSHOT development[skip ci] - - - - - 56293427 by tchemit at 2019-05-06T12:09:52Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 923006e8 by tchemit at 2019-05-06T12:09:52Z [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - d1c0e65b by tchemit at 2019-05-06T12:09:53Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 43c3f745 by tchemit at 2019-05-10T14:48:20Z update pom - - - - - 56f88bf2 by tchemit at 2019-05-13T11:42:54Z [SYNCHRO SIMPLE] Une requête DELETE échoue pour cause de violation de contrainte FK - Closes #1270 - - - - - 25874e1c by tchemit at 2019-05-13T18:14:48Z [jgitflow-maven-plugin]updating poms for branch'release/7.0.7' with non-snapshot versions[skip ci] - - - - - 83b59311 by tchemit at 2019-05-13T18:33:25Z [jgitflow-maven-plugin]merging 'release/7.0.7' into 'master-7.x' - - - - - 17 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.6</version> + <version>7.0.7</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.6</version> + <version>7.0.7</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.6</version> + <version>7.0.7</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.6</version> + <version>7.0.7</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.6</version> + <version>7.0.7</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.6</version> + <version>7.0.7</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.6</version> + <version>7.0.7</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -26,12 +26,12 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.15</version> + <version>2019.8.16</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.6</version> + <version>7.0.7</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> @@ -165,7 +165,7 @@ <lib.version.java4all.eugene>3.0-alpha-26</lib.version.java4all.eugene> <lib.version.java4all.jaxx>3.0-alpha-50</lib.version.java4all.jaxx>  - <lib.version.java4all.topia>1.1.12</lib.version.java4all.topia> + <lib.version.java4all.topia>1.1.13</lib.version.java4all.topia>   ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.6</version> + <version>7.0.7</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.6</version> + <version>7.0.7</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.6</version> + <version>7.0.7</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.6</version> + <version>7.0.7</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.6</version> + <version>7.0.7</version> </parent> <artifactId>services-local</artifactId> ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java ===================================== @@ -23,6 +23,9 @@ package fr.ird.observe.services.local.service.actions.synchro.referential.sql; */ import com.google.common.collect.ImmutableList; +import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; +import fr.ird.observe.persistence.ObserveEntityEnum; +import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.metadata.TopiaMetadataAssociation; import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; import org.nuiton.topia.persistence.metadata.TopiaMetadataModel; @@ -42,11 +45,13 @@ import java.util.Set; public class DeleteSqlStatementGenerator { private final Set<TopiaMetadataAssociation> associations; + private final Set<TopiaMetadataAssociation> reverseAssociations; private final TopiaMetadataEntity metadataEntity; public DeleteSqlStatementGenerator(TopiaMetadataModel topiaMetadataModel, TopiaMetadataEntity metadataEntity) { this.metadataEntity = Objects.requireNonNull(metadataEntity); - this.associations = topiaMetadataModel.getReverseAssociations(metadataEntity); + this.associations = topiaMetadataModel.getAssociations(metadataEntity); + this.reverseAssociations = topiaMetadataModel.getReverseAssociations(metadataEntity); } public List<String> generateSql(String id) { @@ -54,9 +59,19 @@ public class DeleteSqlStatementGenerator { String sql = TopiaSqlStatements.generateDeleteStatement(metadataEntity, id); result.add(sql); for (TopiaMetadataAssociation association : associations) { - String sql2 = TopiaSqlStatements.generateAssociationDeleteStatement(association, id); + String sql2 = TopiaSqlStatements.generateManyToManyAssociationDeleteStatement(association, id); result.add(TopiaSqlStatements.boxAssociationStatement(sql2)); } + for (TopiaMetadataAssociation association : reverseAssociations) { + Class<? extends TopiaEntity> entityType = ObserveEntityEnum.valueOf(association.getOwner().getType()).getContract(); + if (ObserveReferentialEntity.class.isAssignableFrom(entityType)) { + // always delete referential associations + // this is the opposite of https://gitlab.com/ultreiaio/ird-observe/issues/1065 + // See https://gitlab.com/ultreiaio/ird-observe/issues/11270 + String sql2 = TopiaSqlStatements.generateAssociationDeleteStatement(association, id); + result.add(TopiaSqlStatements.boxAssociationStatement(sql2)); + } + } return result.build(); } ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.6</version> + <version>7.0.7</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.6</version> + <version>7.0.7</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.6</version> + <version>7.0.7</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/d88e954191356187335149c5b8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/d88e954191356187335149c5b8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/7.0.7' with non-snapshot versions[skip ci]
by Tony CHEMIT 13 May '19

13 May '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 25874e1c by tchemit at 2019-05-13T18:14:48Z [jgitflow-maven-plugin]updating poms for branch'release/7.0.7' with non-snapshot versions[skip ci] - - - - - 83b59311 by tchemit at 2019-05-13T18:33:25Z [jgitflow-maven-plugin]merging 'release/7.0.7' into 'master-7.x' - - - - - ff29c80c by tchemit at 2019-05-13T18:33:27Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - e77faede by tchemit at 2019-05-13T18:33:28Z [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - a54578a4 by tchemit at 2019-05-13T18:33:28Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/658a87315d77b02f077e5b0bad… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/658a87315d77b02f077e5b0bad… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [jgitflow-maven-plugin]updating poms for 7.0.8-SNAPSHOT development[skip ci]
by Tony CHEMIT 13 May '19

13 May '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 658a8731 by tchemit at 2019-05-13T18:10:43Z [jgitflow-maven-plugin]updating poms for 7.0.8-SNAPSHOT development[skip ci] - - - - - 16 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.8-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.8-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.8-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.8-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.8-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.8-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.8-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.8-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.8-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.8-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.8-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.8-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.8-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.8-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.8-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.7-SNAPSHOT</version> + <version>7.0.8-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/658a87315d77b02f077e5b0bad0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/658a87315d77b02f077e5b0bad0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.0.7
by Tony CHEMIT 13 May '19

13 May '19

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

1 0

[Git][ultreiaio/ird-observe][develop] update pom
by Tony CHEMIT 13 May '19

13 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7d2d359c by tchemit at 2019-05-13T13:15:01Z update pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.16</version> + <version>2019.8.17</version> </parent> <groupId>fr.ird.observe</groupId> @@ -161,7 +161,7 @@  <lib.version.h2>1.4.196</lib.version.h2> - <lib.version.java4all.topia>1.8</lib.version.java4all.topia> +     View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7d2d359cb94e57bcf2843703fda… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7d2d359cb94e57bcf2843703fda… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: add a way to deploy yo central
by Tony CHEMIT 13 May '19

13 May '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 91500115 by tchemit at 2019-05-07T13:19:51Z add a way to deploy yo central - - - - - 737ad92d by tchemit at 2019-05-13T11:55:00Z update pom - - - - - 75e3bbcb by tchemit at 2019-05-13T12:25:53Z [SYNCHRO SIMPLE] Une requête DELETE échoue pour cause de violation de contrainte FK - Closes #1270 - - - - - 3 changed files: - observe/pom.xml - pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java Changes: ===================================== observe/pom.xml ===================================== @@ -140,4 +140,20 @@ </plugins> </build> + + <profiles> + <profile> + <id>deploy-to-central</id> + <activation> + <property> + <name>deploy.to.central</name> + <value>true</value> + </property> + </activation> + <properties> +  + <maven.deploy.skip>false</maven.deploy.skip> + </properties> + </profile> + </profiles> </project> ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.15</version> + <version>2019.8.16</version> </parent> <groupId>fr.ird.observe</groupId> @@ -161,7 +161,7 @@  <lib.version.h2>1.4.196</lib.version.h2> -  + <lib.version.java4all.topia>1.8</lib.version.java4all.topia>    ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java ===================================== @@ -23,6 +23,9 @@ package fr.ird.observe.services.local.service.actions.synchro.referential.sql; */ import com.google.common.collect.ImmutableList; +import fr.ird.observe.entities.ObserveEntityEnum; +import fr.ird.observe.entities.referential.ObserveReferentialEntity; +import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.metadata.TopiaMetadataAssociation; import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; import org.nuiton.topia.persistence.metadata.TopiaMetadataModel; @@ -42,11 +45,13 @@ import java.util.Set; public class DeleteSqlStatementGenerator { private final Set<TopiaMetadataAssociation> associations; + private final Set<TopiaMetadataAssociation> reverseAssociations; private final TopiaMetadataEntity metadataEntity; public DeleteSqlStatementGenerator(TopiaMetadataModel topiaMetadataModel, TopiaMetadataEntity metadataEntity) { this.metadataEntity = Objects.requireNonNull(metadataEntity); - this.associations = topiaMetadataModel.getReverseAssociations(metadataEntity); + this.associations = topiaMetadataModel.getAssociations(metadataEntity); + this.reverseAssociations = topiaMetadataModel.getReverseAssociations(metadataEntity); } public List<String> generateSql(String id) { @@ -54,9 +59,19 @@ public class DeleteSqlStatementGenerator { String sql = TopiaSqlStatements.generateDeleteStatement(metadataEntity, id); result.add(sql); for (TopiaMetadataAssociation association : associations) { - String sql2 = TopiaSqlStatements.generateAssociationDeleteStatement(association, id); + String sql2 = TopiaSqlStatements.generateManyToManyAssociationDeleteStatement(association, id); result.add(TopiaSqlStatements.boxAssociationStatement(sql2)); } + for (TopiaMetadataAssociation association : reverseAssociations) { + Class<? extends TopiaEntity> entityType = ObserveEntityEnum.valueOf(association.getOwner().getType()).getContract(); + if (ObserveReferentialEntity.class.isAssignableFrom(entityType)) { + // always delete referential associations + // this is the opposite of https://gitlab.com/ultreiaio/ird-observe/issues/1065 + // See https://gitlab.com/ultreiaio/ird-observe/issues/11270 + String sql2 = TopiaSqlStatements.generateAssociationDeleteStatement(association, id); + result.add(TopiaSqlStatements.boxAssociationStatement(sql2)); + } + } return result.build(); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4e6d2f2c573b229548ead0e272… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4e6d2f2c573b229548ead0e272… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [SYNCHRO SIMPLE] Une requête DELETE échoue pour cause de violation de contrainte FK - Closes #1270
by Tony CHEMIT 13 May '19

13 May '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 56f88bf2 by tchemit at 2019-05-13T11:42:54Z [SYNCHRO SIMPLE] Une requête DELETE échoue pour cause de violation de contrainte FK - Closes #1270 - - - - - 2 changed files: - pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java Changes: ===================================== pom.xml ===================================== @@ -165,7 +165,7 @@ <lib.version.java4all.eugene>3.0-alpha-26</lib.version.java4all.eugene> <lib.version.java4all.jaxx>3.0-alpha-50</lib.version.java4all.jaxx>  - <lib.version.java4all.topia>1.1.12</lib.version.java4all.topia> + <lib.version.java4all.topia>1.1.13</lib.version.java4all.topia>   ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java ===================================== @@ -23,6 +23,9 @@ package fr.ird.observe.services.local.service.actions.synchro.referential.sql; */ import com.google.common.collect.ImmutableList; +import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; +import fr.ird.observe.persistence.ObserveEntityEnum; +import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.metadata.TopiaMetadataAssociation; import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; import org.nuiton.topia.persistence.metadata.TopiaMetadataModel; @@ -42,11 +45,13 @@ import java.util.Set; public class DeleteSqlStatementGenerator { private final Set<TopiaMetadataAssociation> associations; + private final Set<TopiaMetadataAssociation> reverseAssociations; private final TopiaMetadataEntity metadataEntity; public DeleteSqlStatementGenerator(TopiaMetadataModel topiaMetadataModel, TopiaMetadataEntity metadataEntity) { this.metadataEntity = Objects.requireNonNull(metadataEntity); - this.associations = topiaMetadataModel.getReverseAssociations(metadataEntity); + this.associations = topiaMetadataModel.getAssociations(metadataEntity); + this.reverseAssociations = topiaMetadataModel.getReverseAssociations(metadataEntity); } public List<String> generateSql(String id) { @@ -54,9 +59,19 @@ public class DeleteSqlStatementGenerator { String sql = TopiaSqlStatements.generateDeleteStatement(metadataEntity, id); result.add(sql); for (TopiaMetadataAssociation association : associations) { - String sql2 = TopiaSqlStatements.generateAssociationDeleteStatement(association, id); + String sql2 = TopiaSqlStatements.generateManyToManyAssociationDeleteStatement(association, id); result.add(TopiaSqlStatements.boxAssociationStatement(sql2)); } + for (TopiaMetadataAssociation association : reverseAssociations) { + Class<? extends TopiaEntity> entityType = ObserveEntityEnum.valueOf(association.getOwner().getType()).getContract(); + if (ObserveReferentialEntity.class.isAssignableFrom(entityType)) { + // always delete referential associations + // this is the opposite of https://gitlab.com/ultreiaio/ird-observe/issues/1065 + // See https://gitlab.com/ultreiaio/ird-observe/issues/11270 + String sql2 = TopiaSqlStatements.generateAssociationDeleteStatement(association, id); + result.add(TopiaSqlStatements.boxAssociationStatement(sql2)); + } + } return result.build(); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/56f88bf235707db3bf619f038fb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/56f88bf235707db3bf619f038fb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] update pom
by Tony CHEMIT 11 May '19

11 May '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 43c3f745 by tchemit at 2019-05-10T14:48:20Z update pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.15</version> + <version>2019.8.16</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/43c3f745980983f1c55955fbeb5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/43c3f745980983f1c55955fbeb5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe :: Pom
by Tony CHEMIT 06 May '19

06 May '19

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: fc8aca59 by 166231 at 2019-05-06T12:38:53Z Site checkin for project ObServe :: Pom - - - - - 5 changed files: - administration-web.html - architecture-logicielle.html - index.html - install-serverPG.html - install.html Changes: ===================================== administration-web.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190220" /> + <meta name="Date-Revision-yyyymmdd" content="20190506" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation de lapplication web</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a>»</li> <li class="active ">Installation de lapplication web</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2019-02-20</li> - <li id="projectVersion" class="pull-right">|Version: 7.0.5</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2019-05-06</li> + <li id="projectVersion" class="pull-right">|Version: 7.0.6</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -101,7 +101,7 @@ <pre class="source"> /var/local/observeweb/{contextPath} |-- databases.yml # configuration des bases de données |-- log - | `-- observeweb-7.0.5.log # logs de l'application + | `-- observeweb-7.0.6.log # logs de l'application |-- observeweb-log4j2.xml # configuration des logs |-- temp # répertoire temporaire `-- users.yml # configuration des utilisateurs ===================================== architecture-logicielle.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190220" /> + <meta name="Date-Revision-yyyymmdd" content="20190506" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Architecture logicielle dObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a>»</li> <li class="active ">Architecture logicielle dObServe</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2019-02-20</li> - <li id="projectVersion" class="pull-right">|Version: 7.0.5</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2019-05-06</li> + <li id="projectVersion" class="pull-right">|Version: 7.0.6</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== index.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190220" /> + <meta name="Date-Revision-yyyymmdd" content="20190506" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – ObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a>»</li> <li class="active ">ObServe</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2019-02-20</li> - <li id="projectVersion" class="pull-right">|Version: 7.0.5</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2019-05-06</li> + <li id="projectVersion" class="pull-right">|Version: 7.0.6</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== install-serverPG.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190220" /> + <meta name="Date-Revision-yyyymmdd" content="20190506" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation du serveur Obstuna</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a>»</li> <li class="active ">Installation du serveur Obstuna</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2019-02-20</li> - <li id="projectVersion" class="pull-right">|Version: 7.0.5</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2019-05-06</li> + <li id="projectVersion" class="pull-right">|Version: 7.0.6</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> ===================================== install.html ===================================== @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20190220" /> + <meta name="Date-Revision-yyyymmdd" content="20190506" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation dObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a>»</li> <li class="active ">Installation dObServe</li> - <li id="publishDate" class="pull-right">| Dernière publication: 2019-02-20</li> - <li id="projectVersion" class="pull-right">|Version: 7.0.5</li> + <li id="publishDate" class="pull-right">| Dernière publication: 2019-05-06</li> + <li id="projectVersion" class="pull-right">|Version: 7.0.6</li> <li class="pull-right">| <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/fc8aca592ba3a742683740887d3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/fc8aca592ba3a742683740887d3… You're receiving this email because of your account on gitlab.com.

1 0