Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: e298675a by Tony CHEMIT at 2018-09-18T21:40:06Z use topia-extension project - - - - - ad130f51 by Tony CHEMIT at 2018-09-18T21:40:08Z clean stream api - - - - - 2b539ff5 by Tony CHEMIT at 2018-09-18T21:40:08Z La suppression d'une espèce avec remplacement de code échoue - Closes #1060 La suppression d'océan avec remplacement de code pose problème - Closes #1061 La suppression d'un sexe avec remplacement de code échoue - Closes #1062 - - - - - 13 changed files: - client/pom.xml - dto/src/main/java/fr/ird/observe/dto/data/seine/RouteDto.java - persistence/pom.xml - pom.xml - server/pom.xml - services-client/pom.xml - services-local/pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/DataSourceServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/ReplaceSqlStatementGenerator.java - services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java - services/pom.xml - services/src/main/java/fr/ird/observe/services/service/sql/AddSqlScriptProducerRequest.java - services/src/main/java/fr/ird/observe/services/service/sql/DeleteSqlScriptProducerRequest.java Changes: ===================================== client/pom.xml ===================================== @@ -376,12 +376,12 @@ <artifactId>common-service</artifactId> </dependency> <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension</artifactId> + <groupId>io.ultreia.java4all.topia</groupId> + <artifactId>persistence</artifactId> </dependency> <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension-migration</artifactId> + <groupId>io.ultreia.java4all.topia</groupId> + <artifactId>service-migration</artifactId> </dependency> <dependency> ===================================== dto/src/main/java/fr/ird/observe/dto/data/seine/RouteDto.java ===================================== @@ -24,8 +24,8 @@ package fr.ird.observe.dto.data.seine; import com.google.common.collect.Iterables; import fr.ird.observe.dto.IdHelper; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.util.DateUtil; import java.util.Date; @@ -47,9 +47,9 @@ public class RouteDto extends GeneratedRouteDto { public boolean isTimeAvailable(String activitySeineId, Date time) { Date currentTime = DateUtil.getTime(time, false, false); - return !getActivitySeine() + return getActivitySeine() .stream() - .anyMatch(activity -> + .noneMatch(activity -> Objects.equals(currentTime, activity.getTimeSecond()) && !Objects.equals(activitySeineId, activity.getId())); } ===================================== persistence/pom.xml ===================================== @@ -50,16 +50,16 @@ </dependency> <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension</artifactId> + <groupId>io.ultreia.java4all.topia</groupId> + <artifactId>persistence</artifactId> </dependency> <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension-migration</artifactId> + <groupId>io.ultreia.java4all.topia</groupId> + <artifactId>service-migration</artifactId> </dependency> <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension-script</artifactId> + <groupId>io.ultreia.java4all.topia</groupId> + <artifactId>service-script</artifactId> </dependency> <dependency> @@ -206,9 +206,15 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-templates-extension</artifactId> - <version>${observeToolkitVersion}</version> + <groupId>io.ultreia.java4all.topia</groupId> + <artifactId>persistence</artifactId> + <version>${lib.version.java4all.topia}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>io.ultreia.java4all.topia</groupId> + <artifactId>templates</artifactId> + <version>${lib.version.java4all.topia}</version> <scope>compile</scope> </dependency> <dependency> ===================================== pom.xml ===================================== @@ -152,7 +152,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>3.7.7</observeToolkitVersion> + <observeToolkitVersion>3.7.8-SNAPSHOT</observeToolkitVersion> <!--<lib.version.java4all.http>1.0.13</lib.version.java4all.http>--> <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation> <!--<lib.version.java4all.config>1.0.3</lib.version.java4all.config>--> @@ -162,7 +162,7 @@ <lib.version.h2>1.4.196</lib.version.h2> <!--<lib.version.nuiton.topia>3.6-SNAPSHOT</lib.version.nuiton.topia>--> <!--<lib.version.java4all.eugene>3.0-alpha-21</lib.version.java4all.eugene>--> - <!--<lib.version.java4all.topia>1.1.2-SNAPSHOT</lib.version.java4all.topia>--> + <lib.version.java4all.topia>1.1.7-SNAPSHOT</lib.version.java4all.topia> <!-- license header configuration --> <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>IRD, Code Lutin, Ultreia.io</license.organizationName> @@ -200,30 +200,6 @@ <dependencyManagement> <dependencies> - <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension</artifactId> - <version>${observeToolkitVersion}</version> - </dependency> - - <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension-migration</artifactId> - <version>${observeToolkitVersion}</version> - </dependency> - - <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension-script</artifactId> - <version>${observeToolkitVersion}</version> - </dependency> - - <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-templates-extension</artifactId> - <version>${observeToolkitVersion}</version> - </dependency> - <dependency> <groupId>fr.ird.observe.toolkit</groupId> <artifactId>common-dto</artifactId> ===================================== server/pom.xml ===================================== @@ -76,8 +76,8 @@ <artifactId>common-service</artifactId> </dependency> <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension</artifactId> + <groupId>io.ultreia.java4all.topia</groupId> + <artifactId>persistence</artifactId> </dependency> <dependency> ===================================== services-client/pom.xml ===================================== @@ -65,8 +65,8 @@ <artifactId>common-service</artifactId> </dependency> <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension</artifactId> + <groupId>io.ultreia.java4all.topia</groupId> + <artifactId>persistence</artifactId> </dependency> <dependency> <groupId>io.ultreia.java4all</groupId> ===================================== services-local/pom.xml ===================================== @@ -79,12 +79,12 @@ <artifactId>common-service</artifactId> </dependency> <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension-migration</artifactId> + <groupId>io.ultreia.java4all.topia</groupId> + <artifactId>service-migration</artifactId> </dependency> <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension-script</artifactId> + <groupId>io.ultreia.java4all.topia</groupId> + <artifactId>service-script</artifactId> </dependency> <dependency> @@ -150,9 +150,8 @@ <artifactId>topia-service-migration</artifactId> </dependency> <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension</artifactId> - <version>${observeToolkitVersion}</version> + <groupId>io.ultreia.java4all.topia</groupId> + <artifactId>persistence</artifactId> </dependency> <dependency> ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/DataSourceServiceLocal.java ===================================== @@ -27,7 +27,6 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.dto.ObserveDbRole; import fr.ird.observe.dto.db.ObserveDbUserDto; import fr.ird.observe.dto.reference.ReferentialDtoReference; -import org.nuiton.topia.persistence.script.TopiaSqlScript; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.persistence.ObserveTopiaApplicationContext; @@ -54,13 +53,14 @@ import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; import fr.ird.observe.services.service.sql.SqlScriptProducerService; import fr.ird.observe.spi.DbModelHelper; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.topia.persistence.jdbc.JdbcHelper; +import org.nuiton.topia.persistence.jdbc.JdbcPostgresHelper; import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; import org.nuiton.topia.persistence.metadata.TopiaMetadataModel; import org.nuiton.topia.persistence.metadata.TopiaMetadataModelVisitor; -import org.nuiton.topia.persistence.jdbc.JdbcPostgresHelper; +import org.nuiton.topia.persistence.script.TopiaSqlScript; import org.nuiton.topia.service.migration.resources.MigrationVersionResourceProvider; import org.nuiton.topia.service.migration.version.TMSVersion; import org.nuiton.topia.service.migration.version.TMSVersionHibernateDao; @@ -618,12 +618,12 @@ public class DataSourceServiceLocal extends ObserveServiceLocal implements DataS } @Override - public void visitEntiyStart(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity) { + public void visitEntityStart(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity) { } @Override - public void visitEntiyEnd(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity) { + public void visitEntityEnd(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity) { } ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/ReplaceSqlStatementGenerator.java ===================================== @@ -23,14 +23,15 @@ package fr.ird.observe.services.local.service.actions.synchro.referential.sql; */ import com.google.common.collect.ImmutableList; -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.stream.Collectors; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; import org.nuiton.topia.persistence.metadata.TopiaMetadataModel; +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.stream.Collectors; + /** * Pour générer une requète sql de remplacement à partir d'un référentiel donné. * Created on 04/07/16. @@ -147,6 +148,14 @@ public class ReplaceSqlStatementGenerator { this.columnName = columnName; } + @Override + public String toString() { + return "ReplacementStruct{" + + "schemaName='" + schemaName + '\'' + + ", tableName='" + tableName + '\'' + + ", columnName='" + columnName + '\'' + + '}'; + } } } ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java ===================================== @@ -22,7 +22,6 @@ package fr.ird.observe.services.local.service.referential; * #L% */ -import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import fr.ird.observe.binder.data.DataEntityReferenceBinderSupport; @@ -211,7 +210,7 @@ public class ReferentialServiceLocal extends ObserveServiceLocal implements Refe ImmutableList<String> sql = generator.generateSqls(idToReplace, replaceId); log.info("Replace sql code:\n" + sql); - getTopiaPersistenceContext().executeSqlScripts(Joiner.on("\n").join(sql).getBytes()); + getTopiaPersistenceContext().executeSqlScripts(String.join("\n", sql).getBytes()); } @Override @@ -232,6 +231,7 @@ public class ReferentialServiceLocal extends ObserveServiceLocal implements Refe //noinspection unchecked addAllReferentialUsage(DbModelHelper.fromReferentialEntity((Class) type), (List) entities, result); } else { + //noinspection unchecked adddAllDataUsage(DbModelHelper.fromDataEntity((Class) type), (List) entities, result); } } ===================================== services/pom.xml ===================================== @@ -59,8 +59,8 @@ <artifactId>common-service</artifactId> </dependency> <dependency> - <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-extension</artifactId> + <groupId>io.ultreia.java4all.topia</groupId> + <artifactId>persistence</artifactId> </dependency> <!-- nuiton dependencies --> ===================================== services/src/main/java/fr/ird/observe/services/service/sql/AddSqlScriptProducerRequest.java ===================================== @@ -32,7 +32,6 @@ import fr.ird.observe.dto.reference.ReferentialDtoReference; import org.nuiton.version.Version; import java.util.Set; -import java.util.stream.Collectors; /** * Created on 31/12/15. @@ -135,8 +134,8 @@ public class AddSqlScriptProducerRequest implements ObserveDto { .add("addReferential", addReferential) .add("addSomeReferential", addSomeReferential) .add("addData", addData) - .add("dataIds", dataIds == null ? "" : "[" + dataIds.stream().collect(Collectors.joining(", ")) + "]") - .add("referentialIds", referentialIds.isEmpty() ? "" : "[" + referentialIds.values().stream().collect(Collectors.joining(", ")) + "]") + .add("dataIds", dataIds == null ? "" : "[" + String.join(", ", dataIds) + "]") + .add("referentialIds", referentialIds.isEmpty() ? "" : "[" + String.join(", ", referentialIds.values()) + "]") .toString(); } } ===================================== services/src/main/java/fr/ird/observe/services/service/sql/DeleteSqlScriptProducerRequest.java ===================================== @@ -27,7 +27,6 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.dto.ObserveDto; import java.util.Objects; -import java.util.stream.Collectors; /** * Created on 31/12/15. @@ -65,7 +64,7 @@ public class DeleteSqlScriptProducerRequest implements ObserveDto { public String toString() { return MoreObjects.toStringHelper(this) .add("deleteData", deleteData) - .add("dataIds", dataIds == null ? "" : "[" + dataIds.stream().collect(Collectors.joining(", ")) + "]") + .add("dataIds", dataIds == null ? "" : "[" + String.join(", ", dataIds) + "]") .toString(); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c44187ccc2b138cde52ad09fa91... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c44187ccc2b138cde52ad09fa91... You're receiving this email because of your account on gitlab.com.