Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: 19f8c13e by Tony CHEMIT at 2017-06-08T10:02:10+02:00 Problème lors de la synchro de relation taille-poids entre la base française et la base espagnole (See #774) - - - - - ba5c754a by Tony CHEMIT at 2017-06-08T10:02:23+02:00 prepare release 5.4 - - - - - 27 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - entities-migration/pom.xml - entities/pom.xml - observe/pom.xml - pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-dto/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia-validation/pom.xml - services-topia-validators/pom.xml - services-topia/pom.xml - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataEntity.java - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.8-SNAPSHOT</version> + <version>5.4-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.8-SNAPSHOT</version> + <version>5.4-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.8-SNAPSHOT</version> + <version>5.4-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.8-SNAPSHOT</version> + <version>5.4-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.8-SNAPSHOT</version> + <version>5.4-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.8-SNAPSHOT</version> + <version>5.4-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.8-SNAPSHOT</version> + <version>5.4-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== entities-migration/pom.xml ===================================== --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.8-SNAPSHOT</version> + <version>5.4-SNAPSHOT</version> </parent> <artifactId>entities-migration</artifactId> ===================================== entities/pom.xml ===================================== --- a/entities/pom.xml +++ b/entities/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.8-SNAPSHOT</version> + <version>5.4-SNAPSHOT</version> </parent> <artifactId>entities</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.8-SNAPSHOT</version> + <version>5.4-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.8-SNAPSHOT</version> + <version>5.4-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.8-SNAPSHOT</version> + <version>5.4-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.8-SNAPSHOT</version> + <version>5.4-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.8-SNAPSHOT</version> + <version>5.4-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-dto/pom.xml ===================================== --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.8-SNAPSHOT</version> + <version>5.4-SNAPSHOT</version> </parent> <artifactId>services-dto</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.8-SNAPSHOT</version> + <version>5.4-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.8-SNAPSHOT</version> + <version>5.4-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia-validation/pom.xml ===================================== --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.8-SNAPSHOT</version> + <version>5.4-SNAPSHOT</version> </parent> <artifactId>services-topia-validation</artifactId> ===================================== services-topia-validators/pom.xml ===================================== --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.8-SNAPSHOT</version> + <version>5.4-SNAPSHOT</version> </parent> <artifactId>services-topia-validators</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.8-SNAPSHOT</version> + <version>5.4-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java @@ -141,7 +141,7 @@ public class ReferentialSynchronizeSqlsRequestBuilder { Class<E> entityType = binderEngine.getReferentialEntityType(type); TopiaMetadataEntity metadata = metadataModel.getEntity(referentialName); List<E> insertEntities = loadEntities(entityType, tasks); - if (metadata.withShell()) { + if (metadata.withEntities()) { InsertSqlWithCascadeStatementGenerator<R> insertGenerator = new InsertSqlWithCascadeStatementGenerator<R>(metadata, type, request.getIdsOnlyExistingOnThisSide()) { @@ -184,7 +184,7 @@ public class ReferentialSynchronizeSqlsRequestBuilder { Class<E> entityType = binderEngine.getReferentialEntityType(type); List<E> updateEntities = loadEntities(entityType, tasks); - if (metadata.withShell()) { + if (metadata.withEntities()) { UpdateSqlWithCascadeStatementGenerator<R> updateGenerator = new UpdateSqlWithCascadeStatementGenerator<R>(metadata, type, request.getIdsOnlyExistingOnThisSide()) { @Override ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.8-SNAPSHOT</version> + <version>5.4-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.8-SNAPSHOT</version> + <version>5.4-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.8-SNAPSHOT</version> + <version>5.4-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.8-SNAPSHOT</version> + <version>5.4-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataEntity.java ===================================== --- a/topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataEntity.java +++ b/topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataEntity.java @@ -358,6 +358,10 @@ public class TopiaMetadataEntity { return !(reversedAssociations.isEmpty() && oneToManyAssociations.isEmpty() && manyToManyAssociations.isEmpty()); } + public boolean withEntities() { + return withShell() || !manyToOneAssociations.isEmpty(); + } + private void addDbColumnName(String name, String dbColumnName) { if (!name.equals(dbColumnName)) { dbColumnsName.put(name, dbColumnName); ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.8-SNAPSHOT</version> + <version>5.4-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/85a40b54032b611205cbd6c5f84... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/85a40b54032b611205cbd6c5f84... You're receiving this email because of your account on gitlab.com.