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

[Git][ultreiaio/ird-observe][develop] 6 commits: Persistence / script - For SynchronizeService.applySql use a SqlScriptConsumer...
by Tony CHEMIT (＠tchemit) 03 Oct '22

03 Oct '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2cae4cee by Tony Chemit at 2022-10-03T16:47:31+02:00 Persistence / script - For SynchronizeService.applySql use a SqlScriptConsumer (FIXME should use it anywhere, because it gives us the correct line where error occurs, and batch is not so good in fact...) - - - - - 24b02ad3 by Tony Chemit at 2022-10-03T16:50:28+02:00 Persistence / script - Always add a line end on entity sql script (otherwise in file sql script there is no line - - - - - 584a769e by Tony Chemit at 2022-10-03T17:10:03+02:00 Persistence / script - Always add a line end on entity sql script (otherwise in file sql script there is no line...) - - - - - f122995d by Tony Chemit at 2022-10-03T17:12:29+02:00 See #2429 (https://gitlab.com/ultreiaio/ird-observe/-/issues/2429#note_1122519368) - - - - - e90b62b8 by Tony Chemit at 2022-10-03T17:21:07+02:00 Problème dans la synchronisation simple de référentiels - les désactivations sont executées après les suppressions... - See #2444 - - - - - 6c6c9178 by Tony Chemit at 2022-10-03T17:31:12+02:00 Merge branch 'feature/issue_2444' into develop Problème dans la synchronisation simple de référentiels - les désactivations sont executées après les suppressions.... - Closes #2444 - - - - - 6 changed files: - core/persistence/resources/src/main/resources/db/migration/v9/9.0/96_add_referential_ps_common_ObservedSystem_110-common.sql - core/services/local/src/main/java/fr/ird/observe/services/local/service/referential/SynchronizeServiceLocalSupport.java - toolkit/api/src/main/java/fr/ird/observe/spi/referential/synchro/OneSideSqlResult.java - toolkit/persistence/src/main/java/fr/ird/observe/spi/context/DtoEntityContext.java - toolkit/persistence/src/main/java/fr/ird/observe/spi/referential/OneSideSqlResultBuilderForType.java - toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/script/EntitySqlScript.java Changes: ===================================== core/persistence/resources/src/main/resources/db/migration/v9/9.0/96_add_referential_ps_common_ObservedSystem_110-common.sql ===================================== @@ -20,4 +20,4 @@ -- #L% --- -- See https://gitlab.com/ultreiaio/ird-observe/-/issues/2070 -INSERT INTO ps_common.ObservedSystem(topiaId, topiaVersion, code, status, topiaCreateDate, lastUpdateDate, needComment, schoolType, allowObservation, allowLogbook, label1, label2, label3)VALUES ('fr.ird.referential.common.ObservedSystem#${REFERENTIAL_PREFIX}110', 0, '110', 1, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, false, '${SchoolType_0}', TRUE, TRUE, 'Emptying the sack', 'Chavirage de la poche', 'Emptying the sack TODO'); +INSERT INTO ps_common.ObservedSystem(topiaId, topiaVersion, code, status, topiaCreateDate, lastUpdateDate, needComment, schoolType, allowObservation, allowLogbook, label1, label2, label3)VALUES ('fr.ird.referential.common.ObservedSystem#${REFERENTIAL_PREFIX}110', 0, '110', 1, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, false, '${SchoolType_0}', TRUE, TRUE, 'Discarding the content of the sack at sea', 'Chavirage de la poche', 'Discarding the content of the sack at sea TODO'); ===================================== core/services/local/src/main/java/fr/ird/observe/services/local/service/referential/SynchronizeServiceLocalSupport.java ===================================== @@ -35,6 +35,7 @@ import fr.ird.observe.spi.module.ObserveBusinessProject; import fr.ird.observe.spi.referential.synchro.OneSideSqlRequest; import fr.ird.observe.spi.referential.synchro.OneSideSqlResult; import io.ultreia.java4all.util.sql.SqlScript; +import io.ultreia.java4all.util.sql.SqlScriptConsumer; import java.util.LinkedHashSet; import java.util.Map; @@ -78,7 +79,7 @@ public class SynchronizeServiceLocalSupport extends ObserveServiceLocal implemen @Override public void applySql(SqlScript script, String lastUpdateDateKey) { if (script != null) { - getTopiaPersistenceContext().executeSqlScript(script); + getTopiaPersistenceContext().executeSqlScript(SqlScriptConsumer.of(script)); } updateLastUpdateDates(lastUpdateDateKey); } ===================================== toolkit/api/src/main/java/fr/ird/observe/spi/referential/synchro/OneSideSqlResult.java ===================================== @@ -186,8 +186,8 @@ public class OneSideSqlResult implements JsonAware { statements.addAll(oppositeSqlResult.getUpdateSqlCode()); statements.addAll(oppositeSqlResult.getUpdateAssociationSqlCode()); } - statements.addAll(getDeleteSqlCode()); statements.addAll(getDeactivateSqlCode()); + statements.addAll(getDeleteSqlCode()); if (statements.isEmpty()) { return Optional.empty(); } ===================================== toolkit/persistence/src/main/java/fr/ird/observe/spi/context/DtoEntityContext.java ===================================== @@ -287,14 +287,14 @@ public interface DtoEntityContext< default List<String> updateLastUpdateDateField(ToolkitTopiaPersistenceContextSupport persistenceContext, String id, Date timeStamp) { List<String> requests = getUpdateLastUpdateDateFieldScript().generate(id, timeStamp); - String sql = String.join("\n", requests); + String sql = String.join("", requests); persistenceContext.executeSqlScript(SqlScriptReader.of(sql)); return requests; } default List<String> updateLastUpdateDateTable(ToolkitTopiaPersistenceContextSupport persistenceContext, Date timeStamp) { List<String> requests = getUpdateLastUpdateDateTableScript().generate(timeStamp); - String sql = String.join("\n", requests); + String sql = String.join("", requests); persistenceContext.executeSqlScript(SqlScriptReader.of(sql)); return requests; } ===================================== toolkit/persistence/src/main/java/fr/ird/observe/spi/referential/OneSideSqlResultBuilderForType.java ===================================== @@ -31,6 +31,7 @@ import fr.ird.observe.spi.referential.synchro.SynchronizeTask; import fr.ird.observe.spi.service.ServiceContext; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.nuiton.topia.service.sql.script.EntitySqlScript; import org.nuiton.topia.service.sql.script.ReplaceReferentialScript; import java.util.Date; @@ -117,7 +118,7 @@ public class OneSideSqlResultBuilderForType<D extends ReferentialDto, E extends } for (E entity : insertEntities) { List<String> sqlList = copyScript.generateCopyScript(context.getTopiaPersistenceContext(), entity, idsOnlyExistingOnThisSide); - sqlList.forEach(resultBuilder::addInsertStatement); + EntitySqlScript.appendEol(sqlList.stream()).forEach(resultBuilder::addInsertStatement); } } @@ -129,7 +130,7 @@ public class OneSideSqlResultBuilderForType<D extends ReferentialDto, E extends Set<String> optionalIncludedPropertyNames = task.getOptionalIncludedPropertyNames().orElse(null); Date lastUpdateDate = date(task.getLastUpdateDate()); List<String> sqlList = updateScript.generateUpdateScript(context.getTopiaPersistenceContext(), entity, optionalIncludedPropertyNames, lastUpdateDate, idsOnlyExistingOnThisSide); - sqlList.forEach(resultBuilder::addUpdateStatement); + EntitySqlScript.appendEol(sqlList.stream()).forEach(resultBuilder::addUpdateStatement); } } @@ -141,7 +142,7 @@ public class OneSideSqlResultBuilderForType<D extends ReferentialDto, E extends Set<String> optionalIncludedPropertyNames = task.getOptionalIncludedPropertyNames().orElse(null); Date lastUpdateDate = date(task.getLastUpdateDate()); List<String> sqlList = updateScript.generateUpdateScript(context.getTopiaPersistenceContext(), entity, optionalIncludedPropertyNames, lastUpdateDate, idsOnlyExistingOnThisSide); - sqlList.forEach(resultBuilder::addUpdateStatement); + EntitySqlScript.appendEol(sqlList.stream()).forEach(resultBuilder::addUpdateStatement); } } ===================================== toolkit/persistence/src/main/java/org/nuiton/topia/service/sql/script/EntitySqlScript.java ===================================== @@ -36,6 +36,7 @@ import java.util.stream.Stream; */ public class EntitySqlScript { + private static final String EOL = "\n"; //FIXME Add also parameters descriptions (how many and their type) to produce a safe script private final List<String> requests; @@ -45,7 +46,7 @@ public class EntitySqlScript { public List<String> generate(Function<String, String> lineTransformer) { Stream<String> requests = stream(); - return requests.map(lineTransformer).collect(Collectors.toList()); + return appendEol(requests.map(lineTransformer)).collect(Collectors.toList()); } public Stream<String> stream() { @@ -55,4 +56,15 @@ public class EntitySqlScript { public List<String> requests() { return requests; } + + public static String appendEol(String l) { + if (l.endsWith(EOL)) { + return l; + } + return l + EOL; + } + + public static Stream<String> appendEol(Stream<String> s) { + return s.map(EntitySqlScript::appendEol); + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a1862b5a6ca679a0e37da236… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a1862b5a6ca679a0e37da236… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: update pom
by Tony CHEMIT (＠tchemit) 03 Oct '22

03 Oct '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e3518d64 by Tony Chemit at 2022-10-03T13:08:14+02:00 update pom - - - - - 621d5c71 by Tony Chemit at 2022-10-03T13:08:14+02:00 tidy pom - - - - - 85a1e43b by Tony Chemit at 2022-10-03T13:08:14+02:00 remove unused import - - - - - 73def8de by Tony Chemit at 2022-10-03T13:08:32+02:00 add saxon in dependency management use last eugene version - - - - - a1862b5a by Tony Chemit at 2022-10-03T13:08:32+02:00 update maven-fluido-skin - - - - - 12 changed files: - client/runner/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/resources/pom.xml - core/services/pom.xml - model/pom.xml - observe/pom.xml - pom.xml - server/runner/pom.xml - src/site/site_fr.xml - toolkit/api/pom.xml - toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/validation/ValidationTagValues.java Changes: ===================================== client/runner/pom.xml ===================================== @@ -348,7 +348,7 @@ <phase>generate-resources</phase> <configuration> <target> - <copy failonerror="true" file="../../CHANGELOG.md" overwrite="true" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md" /> + <copy failonerror="true" file="../../CHANGELOG.md" overwrite="true" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md"/> </target> </configuration> </execution> @@ -362,7 +362,7 @@ <target> <copy failonerror="true" overwrite="true" todir="${project.build.outputDirectory}/META-INF/configuration/"> <fileset dir="${config.targetDirectory}"> - <include name="${applicationName}.*" /> + <include name="${applicationName}.*"/> </fileset> </copy> </target> @@ -376,7 +376,7 @@ <phase>integration-test</phase> <configuration> <target> - <copy failonerror="true" file="${project.build.directory}/${project.build.finalName}.jar" overwrite="true" tofile="${project.build.directory}/${applicationJarName}.jar" /> + <copy failonerror="true" file="${project.build.directory}/${project.build.finalName}.jar" overwrite="true" tofile="${project.build.directory}/${applicationJarName}.jar"/> </target> </configuration> </execution> @@ -410,7 +410,7 @@ <phase>integration-test</phase> <configuration> <target> - <copy failonerror="true" file="${project.build.directory}/${project.build.finalName}.exe" overwrite="true" tofile="${project.build.directory}/${applicationJarName}.exe" /> + <copy failonerror="true" file="${project.build.directory}/${project.build.finalName}.exe" overwrite="true" tofile="${project.build.directory}/${applicationJarName}.exe"/> </target> </configuration> </execution> ===================================== core/api/validation/pom.xml ===================================== @@ -204,6 +204,17 @@ <artifactId>log4j-slf4j2-impl</artifactId> <version>${lib.version.log4j2}</version> </dependency> + <dependency> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxon</artifactId> + <version>${lib.version.saxon}</version> + </dependency> + <dependency> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxon</artifactId> + <version>${lib.version.saxon}</version> + <classifier>dom</classifier> + </dependency> </dependencies> </plugin> </plugins> ===================================== core/persistence/java/pom.xml ===================================== @@ -144,6 +144,11 @@ <artifactId>byte-buddy</artifactId> <scope>runtime</scope> </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <scope>runtime</scope> + </dependency> <dependency> <groupId>org.glassfish.jaxb</groupId> <artifactId>jaxb-runtime</artifactId> ===================================== core/persistence/resources/pom.xml ===================================== @@ -131,6 +131,16 @@ <artifactId>postgresql</artifactId> <version>${lib.version.postgresql}</version> </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${lib.version.jaxb-api}</version> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>${lib.version.jaxb-runtime}</version> + </dependency> </dependencies> </plugin> </plugins> ===================================== core/services/pom.xml ===================================== @@ -36,7 +36,7 @@ <module>client</module> </modules> <properties> - <serviceClassifier /> + <serviceClassifier/> </properties> <profiles> <profile> ===================================== model/pom.xml ===================================== @@ -84,11 +84,11 @@ <target> <copy failonerror="true" filtering="true" overwrite="true" todir="${project.build.outputDirectory}/models"> <filterset> - <filter token="persistence.model.version" value="${persistence.model.version}" /> - <filter token="model.name" value="${model.name}" /> + <filter token="persistence.model.version" value="${persistence.model.version}"/> + <filter token="model.name" value="${model.name}"/> </filterset> <fileset dir="${basedir}/src/main/models"> - <include name="**/*" /> + <include name="**/*"/> </fileset> </copy> </target> @@ -104,12 +104,12 @@ <target> <delete includeEmptyDirs="true"> <fileset dir="${project.build.outputDirectory}/models/${model.name}"> - <include name="${model.dto.classifier}/*/*" /> - <include name="${model.dto.classifier}/*" /> - <include name="${model.dto.classifier}" /> - <include name="${model.persistence.classifier}/*/*" /> - <include name="${model.persistence.classifier}/*" /> - <include name="${model.persistence.classifier}" /> + <include name="${model.dto.classifier}/*/*"/> + <include name="${model.dto.classifier}/*"/> + <include name="${model.dto.classifier}"/> + <include name="${model.persistence.classifier}/*/*"/> + <include name="${model.persistence.classifier}/*"/> + <include name="${model.persistence.classifier}"/> </fileset> </delete> </target> ===================================== observe/pom.xml ===================================== @@ -31,7 +31,7 @@ <description>ObServe Release</description> <properties> <deploy>false</deploy> - <deployFileSuffix /> + <deployFileSuffix/> </properties> <build> <plugins> @@ -184,7 +184,7 @@  </properties> <build> - <plugins /> + <plugins/> </build> </profile> </profiles> ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2022.87</version> + <version>2022.90</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -127,8 +127,6 @@  <lib.version.jts>1.16.1</lib.version.jts>  -  - <lib.version.java4all.eugene>3.0-alpha-42</lib.version.java4all.eugene>  <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>IRD, Ultreia.io</license.organizationName> @@ -168,6 +166,17 @@ </properties> <dependencyManagement> <dependencies> + <dependency> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxon</artifactId> + <version>${lib.version.saxon}</version> + </dependency> + <dependency> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxon</artifactId> + <version>${lib.version.saxon}</version> + <classifier>dom</classifier> + </dependency> <dependency> <groupId>com.esotericsoftware.yamlbeans</groupId> <artifactId>yamlbeans</artifactId> @@ -1185,11 +1194,11 @@ <phase>pre-site</phase> <configuration> <target> - <copy failonerror="true" file="CHANGELOG.md" overwrite="true" todir="${project.basedir}/src/site/markdown" /> - <copy failonerror="true" file="${project.basedir}/client/runner/src/main/assembly/dist/config/observe-client.md" overwrite="true" todir="${project.basedir}/src/site/markdown/" /> - <copy failonerror="true" file="${project.basedir}/client/runner/src/main/assembly/dist/config/observe-client.conf" overwrite="true" todir="${project.basedir}/src/site/resources/" /> - <copy failonerror="true" file="${project.basedir}/server/runner/src/main/assembly/dist/config/observe-server.md" overwrite="true" todir="${project.basedir}/src/site/markdown/" /> - <copy failonerror="true" file="${project.basedir}/server/runner/src/main/assembly/dist/config/observe-server.conf" overwrite="true" todir="${project.basedir}/src/site/resources/" /> + <copy failonerror="true" file="CHANGELOG.md" overwrite="true" todir="${project.basedir}/src/site/markdown"/> + <copy failonerror="true" file="${project.basedir}/client/runner/src/main/assembly/dist/config/observe-client.md" overwrite="true" todir="${project.basedir}/src/site/markdown/"/> + <copy failonerror="true" file="${project.basedir}/client/runner/src/main/assembly/dist/config/observe-client.conf" overwrite="true" todir="${project.basedir}/src/site/resources/"/> + <copy failonerror="true" file="${project.basedir}/server/runner/src/main/assembly/dist/config/observe-server.md" overwrite="true" todir="${project.basedir}/src/site/markdown/"/> + <copy failonerror="true" file="${project.basedir}/server/runner/src/main/assembly/dist/config/observe-server.conf" overwrite="true" todir="${project.basedir}/src/site/resources/"/> </target> </configuration> </execution> ===================================== server/runner/pom.xml ===================================== @@ -246,7 +246,7 @@ <phase>generate-resources</phase> <configuration> <target> - <copy failonerror="true" file="../../CHANGELOG.md" overwrite="true" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md" /> + <copy failonerror="true" file="../../CHANGELOG.md" overwrite="true" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md"/> </target> </configuration> </execution> @@ -260,7 +260,7 @@ <target> <copy failonerror="true" overwrite="true" todir="${project.build.outputDirectory}/META-INF/configuration/"> <fileset dir="${config.targetDirectory}"> - <include name="${applicationName}.*" /> + <include name="${applicationName}.*"/> </fileset> </copy> </target> ===================================== src/site/site_fr.xml ===================================== @@ -27,7 +27,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.11.0</version> + <version>1.11.1</version> </skin> <custom> ===================================== toolkit/api/pom.xml ===================================== @@ -260,7 +260,7 @@  <skip>${maven.test.skip}</skip> <target> - <mkdir dir="${basedir}/target/surefire-workdir" /> + <mkdir dir="${basedir}/target/surefire-workdir"/> </target> </configuration> </execution> ===================================== toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/validation/ValidationTagValues.java ===================================== @@ -23,7 +23,6 @@ package fr.ird.observe.toolkit.templates.validation; */ import com.google.auto.service.AutoService; -import fr.ird.observe.toolkit.templates.ToolkitTagValues; import org.codehaus.plexus.component.annotations.Component; import org.nuiton.eugene.models.extension.tagvalue.TagValueMetadata; import org.nuiton.eugene.models.extension.tagvalue.TagValueUtil; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/21870a47960bc61532c590ff… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/21870a47960bc61532c590ff… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: Validator - add at least endDate >= startDate on (ll/ps) Trip
by Tony CHEMIT (＠tchemit) 02 Oct '22

02 Oct '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1832fc9a by Tony Chemit at 2022-10-02T15:58:45+02:00 Validator - add at least endDate >= startDate on (ll/ps) Trip - - - - - 2e698bd3 by Tony Chemit at 2022-10-02T15:58:45+02:00 UI de gestion des associations espèce/océan pas disponible sur Océan - See #2366 - - - - - 9b24a7eb by Tony Chemit at 2022-10-02T15:58:45+02:00 validation - Fix one missing line separator on quadrant required - - - - - 337d5f9d by Tony Chemit at 2022-10-02T16:01:16+02:00 Update changelog for v.9.0.10 [skip CI] - - - - - 8a551263 by Tony Chemit at 2022-10-02T16:02:14+02:00 update pom - - - - - 21870a47 by Tony Chemit at 2022-10-02T16:03:54+02:00 tidy pom - - - - - 30 changed files: - CHANGELOG.md - client/runner/pom.xml - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/common/Trip/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/common/Trip/validation-update.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/common/Trip/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/common/Trip/validation-update.json - core/services/pom.xml - model/pom.xml - observe/pom.xml - pom.xml - server/runner/pom.xml - server/runner/src/main/webResources/doc/api/public/data/ll/common/Trip/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/common/Trip/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ll/common/Trip/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/common/Trip/validation-update.json - server/runner/src/main/webResources/doc/api/public/data/ll/landing/Landing/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/landing/Landing/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/Activity/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/Activity/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/ActivitySample/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/ActivitySample/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/Sample/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/Sample/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/Set/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/Set/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/validation-update.json - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/Activity/validation-create-error.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1b9e5aee65efdc535c0197c4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1b9e5aee65efdc535c0197c4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 11 commits: Une fois la base locale fermée, on ne peut plus la rouvrir (la base vient...
by Tony CHEMIT (＠tchemit) 02 Oct '22

02 Oct '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 60cb1a46 by Tony Chemit at 2022-10-02T10:23:26+02:00 Une fois la base locale fermée, on ne peut plus la rouvrir (la base vient juste d'être créé depuis un référentiel distant) - Closes #2439 - - - - - 4fe02598 by Tony Chemit at 2022-10-02T10:26:07+02:00 NPE sur la création d'une nouvelle base centrale - Closes #2440 - - - - - 535d03d0 by Tony Chemit at 2022-10-02T10:29:34+02:00 Si on change la modalité d'une marée, il se peut que l'interface graphique plante - Closes #2441 - - - - - 3dbe54b1 by Tony Chemit at 2022-10-02T11:04:05+02:00 Supprimer vesselActivity 28 via la migration qui a été ajouté en 8.1 pour rien... + correction du nouveau système observé 110 - Closes #2442 - - - - - 7e3c1d8d by Tony Chemit at 2022-10-02T14:50:37+02:00 validation - default validators (not using dto model) - - - - - 4ef16976 by Tony Chemit at 2022-10-02T14:50:37+02:00 validation - Fix one missing line separator on quadrant required - - - - - 72bb1fba by Tony Chemit at 2022-10-02T14:50:37+02:00 Validator - add at least endDate >= startDate on (ll/ps) Trip - - - - - 6c467959 by Tony Chemit at 2022-10-02T14:50:37+02:00 validation - validation.json is now in source files (it will be regenerated at each compilation...) - - - - - ac3c6f4a by Tony Chemit at 2022-10-02T14:51:14+02:00 validation - review ValidatorsCache and now generate validators in resources (they will be regenerated at each compilation...) - - - - - e88a46a5 by Tony Chemit at 2022-10-02T14:51:43+02:00 validation - add in resources final generated validators (they will be regenerated at each compilation...) - - - - - 1b9e5aee by Tony Chemit at 2022-10-02T14:51:55+02:00 Merge branch 'feature/issue_2443' into develop Revue de la génération des validateurs (ils sont désormais dans les sources du projet) - Closes #2443 - - - - - 30 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/ropen/actions/SaveContentRootOpenableUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/DataSourceHelper.java - core/api/validation/README.md - core/api/validation/pom.xml - + core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/validation/fr/ird/observe/dto/data/ll/observation/SetDetailCompositionUIDto-update-error-validation.xml → core/api/validation/src/main/filtered-resources/fr/ird/observe/dto/data/ll/observation/SetDetailCompositionUIDto-update-error-validation.xml - core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/dcp/FloatingObjectPreset-create-error-validation.xml → core/api/validation/src/main/filtered-resources/fr/ird/observe/dto/data/ps/dcp/FloatingObjectPreset-create-error-validation.xml - core/api/validation/src/main/validation/fr/ird/observe/dto/data/ps/dcp/FloatingObjectPreset-create-warning-validation.xml → core/api/validation/src/main/filtered-resources/fr/ird/observe/dto/data/ps/dcp/FloatingObjectPreset-create-warning-validation.xml - core/api/validation/src/main/resources/validators.xml → core/api/validation/src/main/filtered-resources/validators.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/GearUseFeaturesDto-create-error-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/GearUseFeaturesDto-create-warning-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/GearUseFeaturesDto-update-error-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/GearUseFeaturesDto-update-warning-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/GearUseFeaturesMeasurementDto-create-error-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/GearUseFeaturesMeasurementDto-create-warning-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/GearUseFeaturesMeasurementDto-update-error-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/GearUseFeaturesMeasurementDto-update-warning-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/TripDto-create-error-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/TripDto-create-warning-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/TripDto-update-error-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/TripDto-update-warning-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/TripGearUseFeaturesDto-create-error-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/TripGearUseFeaturesDto-create-warning-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/TripGearUseFeaturesDto-update-error-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/common/TripGearUseFeaturesDto-update-warning-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/landing/LandingDto-create-error-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/landing/LandingDto-create-warning-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/landing/LandingDto-update-error-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/landing/LandingDto-update-warning-validation.xml - + core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/landing/LandingPartDto-create-error-validation.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d24edd12941ea98fd9ca7c5b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d24edd12941ea98fd9ca7c5b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.0.9)
by Tony CHEMIT (＠tchemit) 01 Oct '22

01 Oct '22

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: a208900f by Tony Chemit at 2022-10-01T13:15:44+02:00 Site checkin for project ObServe (version 9.0.9) - - - - - 8 changed files: - + 9.0.9/CHANGELOG.html - + 9.0.9/architecture-logicielle.html - + 9.0.9/avdth/common.html - + 9.0.9/avdth/index.html - + 9.0.9/avdth/landing.html - + 9.0.9/avdth/local_market.html - + 9.0.9/avdth/logbook.html - + 9.0.9/avdth/referential.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a208900fe436f12d1f2b2d55e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a208900fe436f12d1f2b2d55e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/9.0.9
by Tony CHEMIT (＠tchemit) 01 Oct '22

01 Oct '22

Tony CHEMIT deleted branch release/9.0.9 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v9.0.9
by Tony CHEMIT (＠tchemit) 01 Oct '22

01 Oct '22

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

1 0

[Git][ultreiaio/ird-observe][release/9.0.9] [jgitflow-maven-plugin]updating poms for branch'release/9.0.9' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) 01 Oct '22

01 Oct '22

Tony CHEMIT pushed to branch release/9.0.9 at ultreiaio / ird-observe Commits: 9f80ac97 by Tony Chemit at 2022-10-01T12:52:04+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.9' with non-snapshot versions[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml - core/pom.xml - core/services/client/pom.xml - core/services/i18n/pom.xml - core/services/local/pom.xml - core/services/pom.xml - core/services/test/pom.xml - model/pom.xml - observe/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9f80ac97a02b27cecf022636a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9f80ac97a02b27cecf022636a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 14 commits: [jgitflow-maven-plugin]updating poms for 9.0.9-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 01 Oct '22

01 Oct '22

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: 5b4e926f by Tony Chemit at 2022-09-30T18:10:12+02:00 [jgitflow-maven-plugin]updating poms for 9.0.9-SNAPSHOT development[skip ci] - - - - - 9ed0a7f0 by Tony Chemit at 2022-09-30T18:29:55+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - f6d86c9a by Tony Chemit at 2022-09-30T18:29:56+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 9cc0a572 by Tony Chemit at 2022-09-30T18:29:57+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - dc8c95fe by Tony Chemit at 2022-10-01T09:23:31+02:00 Persistence - Add ObservedSystem 110 (See #2429) - - - - - 78599921 by Tony Chemit at 2022-10-01T09:23:31+02:00 Persistence - Modify AVDTH migration for vesselActivity 14 (See #2429) - - - - - ace26191 by Tony Chemit at 2022-10-01T09:23:31+02:00 Persistence - Remove generated resource - - - - - 117f7b7c by Tony Chemit at 2022-10-01T09:23:45+02:00 Merge branch 'feature/issue_2429' into develop Migration AVDTH des activités de type '14 - Chavire la poche' - Closes #2429 - - - - - 1b950311 by Tony Chemit at 2022-10-01T11:40:41+02:00 Decorator/I18n - Review date decoration and groupBy temporal value decoration - - - - - 204bf1eb by Tony Chemit at 2022-10-01T12:33:41+02:00 Decorator/I18n - Review WindAware decoration - - - - - 08ef6fae by Tony Chemit at 2022-10-01T12:45:46+02:00 Merge branch 'feature/issue_2437' into develop Normalisation des dates dans l'arbre de navigation - Closes #2437 - - - - - 7e0bbf9d by Tony Chemit at 2022-10-01T12:50:38+02:00 Update changelog for v.9.0.9 [skip CI] - - - - - 9f80ac97 by Tony Chemit at 2022-10-01T12:52:04+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.9' with non-snapshot versions[skip ci] - - - - - 165e887e by Tony Chemit at 2022-10-01T13:14:03+02:00 [jgitflow-maven-plugin]merging 'release/9.0.9' into 'master' - - - - - 30 changed files: - CHANGELOG.md - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto/pom.xml - core/api/dto/src/main/java/fr/ird/observe/spi/validation/validators/ps/common/TripCheckRouteObsLogValues.java - core/api/dto/src/main/java/fr/ird/observe/spi/validation/validators/ps/observation/RouteCheckStartLogValue.java - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/java/target/extracted-sources/friend/models/Observe/persistence.model - core/persistence/pom.xml - core/persistence/resources/pom.xml - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/ActivityReader.java - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/VesselActivityInterceptor.java - core/persistence/resources/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_0.java - + core/persistence/resources/src/main/resources/db/migration/v9/9.0/96_add_referential_ps_common_ObservedSystem_110-common.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4170ecc94bf6ae39e13655a1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/4170ecc94bf6ae39e13655a1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/9.0.9' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) 01 Oct '22

01 Oct '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9f80ac97 by Tony Chemit at 2022-10-01T12:52:04+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.9' with non-snapshot versions[skip ci] - - - - - 165e887e by Tony Chemit at 2022-10-01T13:14:03+02:00 [jgitflow-maven-plugin]merging 'release/9.0.9' into 'master' - - - - - cf815d92 by Tony Chemit at 2022-10-01T13:14:09+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - f6553c7b by Tony Chemit at 2022-10-01T13:14:10+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - d24edd12 by Tony Chemit at 2022-10-01T13:14:12+02:00 [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/210490e6e189ee54e8a476e0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/210490e6e189ee54e8a476e0… You're receiving this email because of your account on gitlab.com.

1 0