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
-
ba5c754a
by Tony CHEMIT at 2017-06-08T10:02:23+02:00
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:
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 28 | 28 |
<artifactId>pom</artifactId>
|
| 29 |
- <version>5.3.8-SNAPSHOT</version>
|
|
| 29 |
+ <version>5.4-SNAPSHOT</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<artifactId>application-swing-configuration</artifactId>
|
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 28 | 28 |
<artifactId>pom</artifactId>
|
| 29 |
- <version>5.3.8-SNAPSHOT</version>
|
|
| 29 |
+ <version>5.4-SNAPSHOT</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<artifactId>application-swing-decoration</artifactId>
|
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 28 | 28 |
<artifactId>pom</artifactId>
|
| 29 |
- <version>5.3.8-SNAPSHOT</version>
|
|
| 29 |
+ <version>5.4-SNAPSHOT</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<artifactId>application-swing-validation</artifactId>
|
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 28 | 28 |
<artifactId>pom</artifactId>
|
| 29 |
- <version>5.3.8-SNAPSHOT</version>
|
|
| 29 |
+ <version>5.4-SNAPSHOT</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<artifactId>application-swing-validators</artifactId>
|
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 28 | 28 |
<artifactId>pom</artifactId>
|
| 29 |
- <version>5.3.8-SNAPSHOT</version>
|
|
| 29 |
+ <version>5.4-SNAPSHOT</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<artifactId>application-swing</artifactId>
|
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 28 | 28 |
<artifactId>pom</artifactId>
|
| 29 |
- <version>5.3.8-SNAPSHOT</version>
|
|
| 29 |
+ <version>5.4-SNAPSHOT</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<artifactId>application-web-configuration</artifactId>
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 |
<parent>
|
| 28 | 28 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 29 |
<artifactId>pom</artifactId>
|
| 30 |
- <version>5.3.8-SNAPSHOT</version>
|
|
| 30 |
+ <version>5.4-SNAPSHOT</version>
|
|
| 31 | 31 |
</parent>
|
| 32 | 32 |
|
| 33 | 33 |
<artifactId>application-web</artifactId>
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 |
<parent>
|
| 28 | 28 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 29 |
<artifactId>pom</artifactId>
|
| 30 |
- <version>5.3.8-SNAPSHOT</version>
|
|
| 30 |
+ <version>5.4-SNAPSHOT</version>
|
|
| 31 | 31 |
</parent>
|
| 32 | 32 |
|
| 33 | 33 |
<artifactId>entities-migration</artifactId>
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 |
<parent>
|
| 28 | 28 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 29 |
<artifactId>pom</artifactId>
|
| 30 |
- <version>5.3.8-SNAPSHOT</version>
|
|
| 30 |
+ <version>5.4-SNAPSHOT</version>
|
|
| 31 | 31 |
</parent>
|
| 32 | 32 |
|
| 33 | 33 |
<artifactId>entities</artifactId>
|
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 28 | 28 |
<artifactId>pom</artifactId>
|
| 29 |
- <version>5.3.8-SNAPSHOT</version>
|
|
| 29 |
+ <version>5.4-SNAPSHOT</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<artifactId>observe</artifactId>
|
| ... | ... | @@ -32,7 +32,7 @@ |
| 32 | 32 |
|
| 33 | 33 |
<groupId>fr.ird.observe</groupId>
|
| 34 | 34 |
<artifactId>pom</artifactId>
|
| 35 |
- <version>5.3.8-SNAPSHOT</version>
|
|
| 35 |
+ <version>5.4-SNAPSHOT</version>
|
|
| 36 | 36 |
<packaging>pom</packaging>
|
| 37 | 37 |
|
| 38 | 38 |
<name>ObServe :: Pom</name>
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 |
<parent>
|
| 28 | 28 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 29 |
<artifactId>pom</artifactId>
|
| 30 |
- <version>5.3.8-SNAPSHOT</version>
|
|
| 30 |
+ <version>5.4-SNAPSHOT</version>
|
|
| 31 | 31 |
</parent>
|
| 32 | 32 |
|
| 33 | 33 |
<artifactId>services-configuration-rest</artifactId>
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 |
<parent>
|
| 28 | 28 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 29 |
<artifactId>pom</artifactId>
|
| 30 |
- <version>5.3.8-SNAPSHOT</version>
|
|
| 30 |
+ <version>5.4-SNAPSHOT</version>
|
|
| 31 | 31 |
</parent>
|
| 32 | 32 |
|
| 33 | 33 |
<artifactId>services-configuration-topia</artifactId>
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 |
<parent>
|
| 28 | 28 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 29 |
<artifactId>pom</artifactId>
|
| 30 |
- <version>5.3.8-SNAPSHOT</version>
|
|
| 30 |
+ <version>5.4-SNAPSHOT</version>
|
|
| 31 | 31 |
</parent>
|
| 32 | 32 |
|
| 33 | 33 |
<artifactId>services-configuration</artifactId>
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 |
<parent>
|
| 28 | 28 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 29 |
<artifactId>pom</artifactId>
|
| 30 |
- <version>5.3.8-SNAPSHOT</version>
|
|
| 30 |
+ <version>5.4-SNAPSHOT</version>
|
|
| 31 | 31 |
</parent>
|
| 32 | 32 |
|
| 33 | 33 |
<artifactId>services-dto</artifactId>
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 |
<parent>
|
| 28 | 28 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 29 |
<artifactId>pom</artifactId>
|
| 30 |
- <version>5.3.8-SNAPSHOT</version>
|
|
| 30 |
+ <version>5.4-SNAPSHOT</version>
|
|
| 31 | 31 |
</parent>
|
| 32 | 32 |
|
| 33 | 33 |
<artifactId>services-rest</artifactId>
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 |
<parent>
|
| 28 | 28 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 29 |
<artifactId>pom</artifactId>
|
| 30 |
- <version>5.3.8-SNAPSHOT</version>
|
|
| 30 |
+ <version>5.4-SNAPSHOT</version>
|
|
| 31 | 31 |
</parent>
|
| 32 | 32 |
|
| 33 | 33 |
<artifactId>services-runner</artifactId>
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 |
<parent>
|
| 28 | 28 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 29 |
<artifactId>pom</artifactId>
|
| 30 |
- <version>5.3.8-SNAPSHOT</version>
|
|
| 30 |
+ <version>5.4-SNAPSHOT</version>
|
|
| 31 | 31 |
</parent>
|
| 32 | 32 |
|
| 33 | 33 |
<artifactId>services-topia-validation</artifactId>
|
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 28 | 28 |
<artifactId>pom</artifactId>
|
| 29 |
- <version>5.3.8-SNAPSHOT</version>
|
|
| 29 |
+ <version>5.4-SNAPSHOT</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<artifactId>services-topia-validators</artifactId>
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 |
<parent>
|
| 28 | 28 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 29 |
<artifactId>pom</artifactId>
|
| 30 |
- <version>5.3.8-SNAPSHOT</version>
|
|
| 30 |
+ <version>5.4-SNAPSHOT</version>
|
|
| 31 | 31 |
</parent>
|
| 32 | 32 |
|
| 33 | 33 |
<artifactId>services-topia</artifactId>
|
| ... | ... | @@ -141,7 +141,7 @@ public class ReferentialSynchronizeSqlsRequestBuilder { |
| 141 | 141 |
Class<E> entityType = binderEngine.getReferentialEntityType(type);
|
| 142 | 142 |
TopiaMetadataEntity metadata = metadataModel.getEntity(referentialName);
|
| 143 | 143 |
List<E> insertEntities = loadEntities(entityType, tasks);
|
| 144 |
- if (metadata.withShell()) {
|
|
| 144 |
+ if (metadata.withEntities()) {
|
|
| 145 | 145 |
|
| 146 | 146 |
InsertSqlWithCascadeStatementGenerator<R> insertGenerator = new InsertSqlWithCascadeStatementGenerator<R>(metadata, type, request.getIdsOnlyExistingOnThisSide()) {
|
| 147 | 147 |
|
| ... | ... | @@ -184,7 +184,7 @@ public class ReferentialSynchronizeSqlsRequestBuilder { |
| 184 | 184 |
Class<E> entityType = binderEngine.getReferentialEntityType(type);
|
| 185 | 185 |
List<E> updateEntities = loadEntities(entityType, tasks);
|
| 186 | 186 |
|
| 187 |
- if (metadata.withShell()) {
|
|
| 187 |
+ if (metadata.withEntities()) {
|
|
| 188 | 188 |
|
| 189 | 189 |
UpdateSqlWithCascadeStatementGenerator<R> updateGenerator = new UpdateSqlWithCascadeStatementGenerator<R>(metadata, type, request.getIdsOnlyExistingOnThisSide()) {
|
| 190 | 190 |
@Override
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 |
<parent>
|
| 28 | 28 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 29 |
<artifactId>pom</artifactId>
|
| 30 |
- <version>5.3.8-SNAPSHOT</version>
|
|
| 30 |
+ <version>5.4-SNAPSHOT</version>
|
|
| 31 | 31 |
</parent>
|
| 32 | 32 |
|
| 33 | 33 |
<artifactId>services</artifactId>
|
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 28 | 28 |
<artifactId>pom</artifactId>
|
| 29 |
- <version>5.3.8-SNAPSHOT</version>
|
|
| 29 |
+ <version>5.4-SNAPSHOT</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<artifactId>test</artifactId>
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 |
<parent>
|
| 28 | 28 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 29 |
<artifactId>pom</artifactId>
|
| 30 |
- <version>5.3.8-SNAPSHOT</version>
|
|
| 30 |
+ <version>5.4-SNAPSHOT</version>
|
|
| 31 | 31 |
</parent>
|
| 32 | 32 |
|
| 33 | 33 |
<artifactId>toolbox-maven-plugin</artifactId>
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 |
<parent>
|
| 28 | 28 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 29 |
<artifactId>pom</artifactId>
|
| 30 |
- <version>5.3.8-SNAPSHOT</version>
|
|
| 30 |
+ <version>5.4-SNAPSHOT</version>
|
|
| 31 | 31 |
</parent>
|
| 32 | 32 |
|
| 33 | 33 |
<artifactId>topia-extension</artifactId>
|
| ... | ... | @@ -358,6 +358,10 @@ public class TopiaMetadataEntity { |
| 358 | 358 |
return !(reversedAssociations.isEmpty() && oneToManyAssociations.isEmpty() && manyToManyAssociations.isEmpty());
|
| 359 | 359 |
}
|
| 360 | 360 |
|
| 361 |
+ public boolean withEntities() {
|
|
| 362 |
+ return withShell() || !manyToOneAssociations.isEmpty();
|
|
| 363 |
+ }
|
|
| 364 |
+ |
|
| 361 | 365 |
private void addDbColumnName(String name, String dbColumnName) {
|
| 362 | 366 |
if (!name.equals(dbColumnName)) {
|
| 363 | 367 |
dbColumnsName.put(name, dbColumnName);
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 |
<parent>
|
| 28 | 28 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 29 |
<artifactId>pom</artifactId>
|
| 30 |
- <version>5.3.8-SNAPSHOT</version>
|
|
| 30 |
+ <version>5.4-SNAPSHOT</version>
|
|
| 31 | 31 |
</parent>
|
| 32 | 32 |
|
| 33 | 33 |
<artifactId>topia-templates-extension</artifactId>
|