Observe-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
September 2018
- 1 participants
- 147 discussions
[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: Only remove program node if it is enabled (otherwise it is not in navigation tree)
by Tony CHEMIT 18 Sep '18
by Tony CHEMIT 18 Sep '18
18 Sep '18
Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
3b40bcfb by Tony CHEMIT at 2018-09-18T23:36:56Z
Only remove program node if it is enabled (otherwise it is not in navigation tree)
- - - - -
0fbe5ba1 by Tony CHEMIT at 2018-09-18T23:58:06Z
[SYNCHRO] Problème avec la synchro avancée d'un programme - Closes #1063
- - - - -
2 changed files:
- client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java
- services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java
Changes:
=====================================
client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java
=====================================
@@ -828,7 +828,7 @@ public class ContentReferenceUIHandler<D extends ReferentialDto, R extends Refer
@Override
protected void afterDelete() {
D bean = getBean();
- if (bean instanceof ProgramDto) {
+ if (bean instanceof ProgramDto && bean.isEnabled()) {
// remove the program in tree
NavigationTree treeHelper = getNavigationTree();
=====================================
services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java
=====================================
@@ -157,7 +157,8 @@ public class ReferentialSynchronizeSqlsRequestBuilder {
@Override
protected <DD extends ReferentialDto> ImmutableList<String> insertMissingReferential(Class<DD> referentialType, String id) {
- return addExtraInsertStatement(id, binder);
+ ReferentialDtoEntityContext<DD, ?, ?> modelContext = DbModelHelper.fromReferentialDto(referentialType);
+ return addExtraInsertStatement(id, modelContext.toEntityBinder());
}
};
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c49a8186278f983f8ea6f77c06…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c49a8186278f983f8ea6f77c06…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop-7.x] L'UI de synchro de référentiels ne présente plus les éléments à synchroniser…
by Tony CHEMIT 18 Sep '18
by Tony CHEMIT 18 Sep '18
18 Sep '18
Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
c49a8186 by Tony CHEMIT at 2018-09-18T23:21:13Z
L'UI de synchro de référentiels ne présente plus les éléments à synchroniser qu'un par un - Closes #1058
- - - - -
1 changed file:
- server/src/main/java/fr/ird/observe/server/injector/ImmutableSetInjector.java
Changes:
=====================================
server/src/main/java/fr/ird/observe/server/injector/ImmutableSetInjector.java
=====================================
@@ -24,8 +24,8 @@ package fr.ird.observe.server.injector;
import com.google.common.collect.ImmutableSet;
import com.google.gson.Gson;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.debux.webmotion.server.call.Call;
import org.debux.webmotion.server.handler.ExecutorParametersInjectorHandler;
import org.debux.webmotion.server.mapping.Mapping;
@@ -72,14 +72,18 @@ public class ImmutableSetInjector implements ExecutorParametersInjectorHandler.I
Objects.requireNonNull(parameterTree, "Le paramètre " + name + " n'as pas été trouvé, recompiler (parameter)!");
String[] values = (String[]) parameterTree.getValue();
- String value = values[0];
- if (!value.isEmpty() && !value.contains("[")) {
+ StringBuilder value = new StringBuilder(values[0]);
+ if ((value.length() > 0) && !value.toString().contains("[")) {
if (((ParameterizedTypeImpl) generic).getActualTypeArguments()[0].equals(String.class)) {
- value = "\"" + value + "\"";
+ value = new StringBuilder();
+ for (String s : values) {
+ value.append(", \"").append(s).append("\"");
+ }
+ value = new StringBuilder(value.substring(2));
}
- value = "[" + value + "]";
+ value = new StringBuilder("[" + value + "]");
}
- Collection o = gson.fromJson(value, generic);
+ Collection o = gson.fromJson(value.toString(), generic);
if (o != null) {
builder.addAll(o);
}
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c49a8186278f983f8ea6f77c064…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c49a8186278f983f8ea6f77c064…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop-7.x] L'UI de synchro de référentiels ne présente plus les éléments à synchroniser…
by Tony CHEMIT 18 Sep '18
by Tony CHEMIT 18 Sep '18
18 Sep '18
Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
2f98d82d by Tony CHEMIT at 2018-09-18T22:32:51Z
L'UI de synchro de référentiels ne présente plus les éléments à synchroniser qu'un par un - See #1058
- - - - -
2 changed files:
- server/src/main/filtered-resources/mapping
- services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffService.java
Changes:
=====================================
server/src/main/filtered-resources/mapping
=====================================
@@ -74,7 +74,7 @@ POST /api/v1/actions/report/ReportService/executeReport
POST /api/v1/actions/report/ReportService/populateVariables v1.actions.report.ReportServiceRestApi.populateVariables
GET /api/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffService/getEnabledReferentialReferenceSet v1.actions.synchro.referential.diff.ReferentialSynchronizeDiffServiceRestApi.getEnabledReferentialReferenceSet
POST /api/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffService/getReferential v1.actions.synchro.referential.diff.ReferentialSynchronizeDiffServiceRestApi.getReferential
-GET /api/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffService/getReferentialReferenceSet v1.actions.synchro.referential.diff.ReferentialSynchronizeDiffServiceRestApi.getReferentialReferenceSet
+POST /api/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffService/getReferentialReferenceSet v1.actions.synchro.referential.diff.ReferentialSynchronizeDiffServiceRestApi.getReferentialReferenceSet
GET /api/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffService/getSourceReferentialStates v1.actions.synchro.referential.diff.ReferentialSynchronizeDiffServiceRestApi.getSourceReferentialStates
POST /api/v1/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService/applySqlRequests v1.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalServiceRestApi.applySqlRequests
GET /api/v1/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService/filterIdsUsedInLocalSource v1.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalServiceRestApi.filterIdsUsedInLocalSource
=====================================
services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffService.java
=====================================
@@ -23,8 +23,8 @@ package fr.ird.observe.services.service.actions.synchro.referential.diff;
*/
import com.google.common.collect.ImmutableSet;
-import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet;
import fr.ird.observe.dto.reference.ReferentialDtoReference;
+import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet;
import fr.ird.observe.dto.referential.ReferentialDto;
import fr.ird.observe.services.service.ObserveService;
import fr.ird.observe.services.spi.ReadReferentialPermission;
@@ -42,8 +42,7 @@ public interface ReferentialSynchronizeDiffService extends ObserveService {
@ReadReferentialPermission
<D extends ReferentialDto, R extends ReferentialDtoReference<D, R>> ReferentialDtoReferenceSet<R> getEnabledReferentialReferenceSet(Class<R> referentialName);
- @Get
- @Post
+ @Post(useMultiPartForm = true)
@ReadReferentialPermission
<D extends ReferentialDto, R extends ReferentialDtoReference<D, R>> ReferentialDtoReferenceSet<R> getReferentialReferenceSet(Class<R> referentialName, ImmutableSet<String> ids);
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2f98d82d469a0dca1ff7414f24d…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2f98d82d469a0dca1ff7414f24d…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop-7.x] 3 commits: use topia-extension project
by Tony CHEMIT 18 Sep '18
by Tony CHEMIT 18 Sep '18
18 Sep '18
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/c44187ccc2b138cde52ad09fa9…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c44187ccc2b138cde52ad09fa9…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: use topia-extension project
by Tony CHEMIT 18 Sep '18
by Tony CHEMIT 18 Sep '18
18 Sep '18
Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
5c9c11d4 by Tony CHEMIT at 2018-09-18T20:14:39Z
use topia-extension project
- - - - -
c44187cc by Tony CHEMIT at 2018-09-18T20:27:56Z
clean stream api
- - - - -
11 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/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,9 @@
<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>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>-->
@@ -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/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/e5843b1b41c9640071fcc73632…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e5843b1b41c9640071fcc73632…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: En mode serveur, la boîte d'information sur la connexion n'indique pas la BD…
by Tony CHEMIT 18 Sep '18
by Tony CHEMIT 18 Sep '18
18 Sep '18
Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
9b294447 by Tony CHEMIT at 2018-09-18T09:10:37Z
En mode serveur, la boîte d'information sur la connexion n'indique pas la BD (alias) à laquelle on est connecté - Closes #1057
- - - - -
e5843b1b by Tony CHEMIT at 2018-09-18T09:10:37Z
use last pom
- - - - -
4 changed files:
- client/src/main/ftl/dataSourceInformation_en.ftl
- client/src/main/ftl/dataSourceInformation_es.ftl
- client/src/main/ftl/dataSourceInformation_fr.ftl
- pom.xml
Changes:
=====================================
client/src/main/ftl/dataSourceInformation_en.ftl
=====================================
@@ -15,7 +15,7 @@
<#else>
<li><strong>Web service url: </strong>${configuration.serverUrl}</li>
<li><strong>User: </strong>${configuration.login}</li>
- <#if configuration.optionalDatabaseName.present>
+ <#if configuration.optionalDatabaseName.present??>
<li><strong>Database alias: </strong>${configuration.optionalDatabaseName.get()}</li>
</#if>
</#if>
=====================================
client/src/main/ftl/dataSourceInformation_es.ftl
=====================================
@@ -15,7 +15,7 @@
<#else>
<li><strong>URL del servicio web: </strong>${configuration.serverUrl}</li>
<li><strong>Usuario: </strong>${configuration.login}</li>
- <#if configuration.optionalDatabaseName.present>
+ <#if configuration.optionalDatabaseName.present??>
<li><strong>Alias de la base: </strong>${configuration.optionalDatabaseName.get()}</li>
</#if>
</#if>
=====================================
client/src/main/ftl/dataSourceInformation_fr.ftl
=====================================
@@ -15,7 +15,7 @@
<#else>
<li><strong>URL du service web : </strong>${configuration.serverUrl}</li>
<li><strong>Utilisateur : </strong>${configuration.login}</li>
- <#if configuration.optionalDatabaseName.present>
+ <#if configuration.optionalDatabaseName.present??>
<li><strong>Alias de la base : </strong>${configuration.optionalDatabaseName.get()}</li>
</#if>
</#if>
=====================================
pom.xml
=====================================
@@ -26,7 +26,7 @@
<parent>
<groupId>io.ultreia.maven</groupId>
<artifactId>pom</artifactId>
- <version>2018.53</version>
+ <version>2018.56</version>
</parent>
<groupId>fr.ird.observe</groupId>
@@ -153,7 +153,7 @@
<buildDate>${maven.build.timestamp}</buildDate>
<observeToolkitVersion>3.7.7</observeToolkitVersion>
- <lib.version.java4all.http>1.0.13</lib.version.java4all.http>
+ <!--<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>-->
<xworkVersion>2.3.35</xworkVersion>
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1fe7c6c424f908cfb04539163d…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1fe7c6c424f908cfb04539163d…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] 4 commits: Add missing validation messages
by Tony CHEMIT 18 Sep '18
by Tony CHEMIT 18 Sep '18
18 Sep '18
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
676b84e1 by Tony CHEMIT at 2018-09-18T08:51:24Z
Add missing validation messages
- - - - -
38115166 by Tony CHEMIT at 2018-09-18T08:52:52Z
stash pom....
- - - - -
6402c853 by Tony CHEMIT at 2018-09-18T09:11:23Z
En mode serveur, la boîte d'information sur la connexion n'indique pas la BD (alias) à laquelle on est connecté - Closes #1057
- - - - -
68a1691b by Tony CHEMIT at 2018-09-18T09:13:08Z
use last pom
- - - - -
9 changed files:
- client/src/main/ftl/dataSourceInformation_en.ftl
- client/src/main/ftl/dataSourceInformation_es.ftl
- client/src/main/ftl/dataSourceInformation_fr.ftl
- pom.xml
- validation/.mvn/i18n-parse-validation → validation/.mvn/i18n-parse-validation-messages
- validation/pom.xml
- validation/src/main/resources/i18n/validation_en_GB.properties
- validation/src/main/resources/i18n/validation_es_ES.properties
- validation/src/main/resources/i18n/validation_fr_FR.properties
Changes:
=====================================
client/src/main/ftl/dataSourceInformation_en.ftl
=====================================
@@ -15,7 +15,7 @@
<#else>
<li><strong>Web service url: </strong>${configuration.serverUrl}</li>
<li><strong>User: </strong>${configuration.login}</li>
- <#if configuration.optionalDatabaseName.present>
+ <#if configuration.optionalDatabaseName.present??>
<li><strong>Database alias: </strong>${configuration.optionalDatabaseName.get()}</li>
</#if>
</#if>
=====================================
client/src/main/ftl/dataSourceInformation_es.ftl
=====================================
@@ -15,7 +15,7 @@
<#else>
<li><strong>URL del servicio web: </strong>${configuration.serverUrl}</li>
<li><strong>Usuario: </strong>${configuration.login}</li>
- <#if configuration.optionalDatabaseName.present>
+ <#if configuration.optionalDatabaseName.present??>
<li><strong>Alias de la base: </strong>${configuration.optionalDatabaseName.get()}</li>
</#if>
</#if>
=====================================
client/src/main/ftl/dataSourceInformation_fr.ftl
=====================================
@@ -15,7 +15,7 @@
<#else>
<li><strong>URL du service web : </strong>${configuration.serverUrl}</li>
<li><strong>Utilisateur : </strong>${configuration.login}</li>
- <#if configuration.optionalDatabaseName.present>
+ <#if configuration.optionalDatabaseName.present??>
<li><strong>Alias de la base : </strong>${configuration.optionalDatabaseName.get()}</li>
</#if>
</#if>
=====================================
pom.xml
=====================================
@@ -26,7 +26,7 @@
<parent>
<groupId>io.ultreia.maven</groupId>
<artifactId>pom</artifactId>
- <version>2018.55</version>
+ <version>2018.56</version>
</parent>
<groupId>fr.ird.observe</groupId>
@@ -157,7 +157,7 @@
<!--<lib.version.java4all.eugene>3.0-alpha-22</lib.version.java4all.eugene>-->
<!--<lib.version.java4all.jaxx>3.0-alpha-35</lib.version.java4all.jaxx>-->
<!--<lib.version.nuiton.topia>3.4.2-SNAPSHOT</lib.version.nuiton.topia>-->
- <!--<lib.version.java4all.topia>1.1.5-SNAPSHOT</lib.version.java4all.topia>-->
+ <!--<lib.version.java4all.topia>1.1.6</lib.version.java4all.topia>-->
<lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>
<xworkVersion>2.3.35</xworkVersion>
<!--<lib.version.hibernate>5.2.10.Final</lib.version.hibernate>-->
=====================================
validation/.mvn/i18n-parse-validation → validation/.mvn/i18n-parse-validation-messages
=====================================
=====================================
validation/pom.xml
=====================================
@@ -138,6 +138,13 @@
</configuration>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>dto</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
=====================================
validation/src/main/resources/i18n/validation_en_GB.properties
=====================================
@@ -524,6 +524,7 @@ observe.validation.catchLongline.desactivated.catchHealthness=Selected catch he
observe.validation.catchLongline.desactivated.discardHealthness=Selected discard healthness is disabled.
observe.validation.catchLongline.desactivated.hookPosition=Selected hook position is disabled.
observe.validation.catchLongline.desactivated.maturityStatus=Selected maturity status is disabled.
+observe.validation.catchLongline.desactivated.onBoardProcessing=Selected On board processing is disabled.
observe.validation.catchLongline.desactivated.sex=Selected sec is disabled.
observe.validation.catchLongline.desactivated.speciesCatch=Selected species is disabled.
observe.validation.catchLongline.desactivated.stomacFullness=Selected stomac fullness is disabled.
@@ -536,12 +537,25 @@ observe.validation.country.invalid.iso2Code.uniqueKey=Iso 2 code is not unique.
observe.validation.country.invalid.iso3Code.uniqueKey=Iso 3 code is not unique.
observe.validation.country.required.iso2Code=Iso 2 code must be filled.
observe.validation.country.required.iso3Code=Iso 3 code must be filled.
+observe.validation.disabled.compagnies=Selected compagnies is disabled.
+observe.validation.disabled.conservation=Selected conservation is disabled.
+observe.validation.disabled.dataQuality=Selected data quality is disabled.
+observe.validation.disabled.dataSource=Selected data source is disabled.
+observe.validation.disabled.fpaZone=Selected fpa zone is disabled.
+observe.validation.disabled.harbour=Selected harbour is disabled.
+observe.validation.disabled.onBoardProcessing=Selected on board processing is disabled.
+observe.validation.disabled.person=Selected person is disabled.
+observe.validation.disabled.species=Selected species is disabled.
+observe.validation.disabled.vessel=Selected vessel is disabled.
+observe.validation.disabled.weightMeasureMethod=Selected weight measure method is disabled.
observe.validation.encounter.desactivated.encounterType=Selected encounter type is disabled.
observe.validation.encounter.desactivated.species=Selected species is disabled.
observe.validation.encounter.required.count=Count must be filled.
observe.validation.encounter.required.distance=Distance must be filled.
observe.validation.encounter.required.encounterType=Encounter type must be filled.
observe.validation.encounter.required.species=Species must be filled.
+observe.validation.error.desactivated.lengthMeasureMethod=Selected length measure method is disabled.
+observe.validation.error.desactivated.weightMeasureMethod=Selected weight measure method is disabled.
observe.validation.floatingObject.comment.tobig=Comment size can not exceed 1024 characters.
observe.validation.floatingObject.desactivated.objectOperation=Selected operation is disabled.
observe.validation.floatingObject.invalid.parts=There is some errors in materials table.
@@ -597,6 +611,7 @@ observe.validation.lengthWeightParameter.invalid.lengthWeightFormula=Formula is
observe.validation.lengthWeightParameter.invalid.uniqueKey=Tuple (species/ocean/gender/sizeMeasureType/startDate) must be unique.
observe.validation.lengthWeightParameter.invalid.weightLengthFormula=Formula is not valid.
observe.validation.lengthWeightParameter.null.ocean=Ocean is not filled.
+observe.validation.lengthWeightParameter.null.sex=Sex is not filled.
observe.validation.lengthWeightParameter.null.sizeMeasureType=Size measure type is not filled.
observe.validation.lengthWeightParameter.required.coefficients=Coefficients must be filled.
observe.validation.lengthWeightParameter.required.endDate=End date must be filled.
@@ -695,6 +710,11 @@ observe.validation.referentiel.status.desactivated=Status is disabled (it can't
observe.validation.referentiel.status.required=Status must be filled.
observe.validation.referentiel.untranslated.label1=English label is not translated.
observe.validation.referentiel.untranslated.label3=Spanish label is not translated.
+observe.validation.required.categoryMax=Category max is not filled.
+observe.validation.required.categoryMin=Category min is not filled.
+observe.validation.required.compagnies=Compagnies is not filled.
+observe.validation.required.harbour=Harbour is not filleds.
+observe.validation.required.species=Species is not filled.
observe.validation.route.activityFinDeVeille.notAvailable=There is already an end watch activity on trip.
observe.validation.route.comment.tobig=Comment size can not exceed 1024 characters.
observe.validation.route.duplicated.date=There is already another route at this date.
@@ -841,9 +861,11 @@ observe.validation.targetDiscarded.required.weightCategory=Weight category must
observe.validation.targetDiscarded.uniqueKey=Tuple (species - category - reasonForDiscard - brought on deck) must be unique.
observe.validation.targetLength.bound.length=Length must be bound between %s and %s.
observe.validation.targetLength.bound.weight=Weight must be bound between %s and %s.
+observe.validation.targetLength.desactivated.lengthMeasureMethod=Selected length measure method is disabled.
observe.validation.targetLength.desactivated.sex=Selected sex is disabled.
observe.validation.targetLength.desactivated.sizeMeasureType=Selected size measure type is disabled.
observe.validation.targetLength.desactivated.species=Selected species is disabled.
+observe.validation.targetLength.desactivated.weightMeasureMethod=Selected weight measure method is disabled.
observe.validation.targetLength.positive.length=Must be a positive number.
observe.validation.targetLength.positive.weight=Must be a positive number.
observe.validation.targetLength.required.count=Count must be filled.
=====================================
validation/src/main/resources/i18n/validation_es_ES.properties
=====================================
@@ -526,6 +526,7 @@ observe.validation.catchLongline.desactivated.catchHealthness=El estado a la cap
observe.validation.catchLongline.desactivated.discardHealthness=El estado al descarte seleccionado está desactivado.
observe.validation.catchLongline.desactivated.hookPosition=La posición del avanzuelo seleccionada está desactivada.
observe.validation.catchLongline.desactivated.maturityStatus=La maturidad sexual seleccionada está desactivada.
+observe.validation.catchLongline.desactivated.onBoardProcessing=Selected On board processing is disabled.
observe.validation.catchLongline.desactivated.sex=El sexo seleccionado está desactivado.
observe.validation.catchLongline.desactivated.speciesCatch=La especie seleccionada está desactivada.
observe.validation.catchLongline.desactivated.stomacFullness=El estado del estomago seleccionado está desactivado.
@@ -538,12 +539,25 @@ observe.validation.country.invalid.iso2Code.uniqueKey=El código debe ser único
observe.validation.country.invalid.iso3Code.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado.
observe.validation.country.required.iso2Code=Código ISO2 no especificado
observe.validation.country.required.iso3Code=Código ISO3 no especificado.
+observe.validation.disabled.compagnies=Selected compagnies is disabled.
+observe.validation.disabled.conservation=Selected conservation is disabled.
+observe.validation.disabled.dataQuality=Selected data quality is disabled.
+observe.validation.disabled.dataSource=Selected data source is disabled.
+observe.validation.disabled.fpaZone=Selected fpa zone is disabled.
+observe.validation.disabled.harbour=Selected harbour is disabled.
+observe.validation.disabled.onBoardProcessing=Selected on board processing is disabled.
+observe.validation.disabled.person=Selected person is disabled.
+observe.validation.disabled.species=Selected species is disabled.
+observe.validation.disabled.vessel=Selected vessel is disabled.
+observe.validation.disabled.weightMeasureMethod=Selected weight measure method is disabled.
observe.validation.encounter.desactivated.encounterType=El tipo de encuentro está desactivado.
observe.validation.encounter.desactivated.species=La especie seleccionada está desactivada.
observe.validation.encounter.required.count=El número está vacío.
observe.validation.encounter.required.distance=La distancia está vacía.
observe.validation.encounter.required.encounterType=La selección de un tipo de encuentro está mandatorio.
observe.validation.encounter.required.species=La selección de una especie es mandatoria.
+observe.validation.error.desactivated.lengthMeasureMethod=Selected length measure method is disabled.
+observe.validation.error.desactivated.weightMeasureMethod=Selected weight measure method is disabled.
observe.validation.floatingObject.comment.tobig=La longitud del campo de comentarios está limitada a 1024 carácteres.
observe.validation.floatingObject.desactivated.objectOperation=Al menos una de las operaciones seleccionadas está desactivada.
observe.validation.floatingObject.invalid.parts=There is some errors in materials table. \#TODO
@@ -599,6 +613,7 @@ observe.validation.lengthWeightParameter.invalid.lengthWeightFormula=Relación d
observe.validation.lengthWeightParameter.invalid.uniqueKey=Tupla (especie/sexo/océano/sizeMeasureType/startDate) debe ser única, la tupla ya se ha usado. \#TODO
observe.validation.lengthWeightParameter.invalid.weightLengthFormula=Relación de talla introducida no es coherente.
observe.validation.lengthWeightParameter.null.ocean=No se ha seleccionado oceano.
+observe.validation.lengthWeightParameter.null.sex=Sex is not filled.
observe.validation.lengthWeightParameter.null.sizeMeasureType=Type de mensuration non renseigné. \#TODO
observe.validation.lengthWeightParameter.required.coefficients=Coeficientes deben ser especificados.
observe.validation.lengthWeightParameter.required.endDate=Fecha de fin de validez debe ser especificada.
@@ -697,6 +712,11 @@ observe.validation.referentiel.status.desactivated=El objeto está desactivado (
observe.validation.referentiel.status.required=El estatuto activo-inactivo es mandatorio.
observe.validation.referentiel.untranslated.label1=La etiqueta en inglés no se ha traducido.
observe.validation.referentiel.untranslated.label3=La etiqueta en espaÑol no se ha traducido.
+observe.validation.required.categoryMax=Category max is not filled.
+observe.validation.required.categoryMin=Category min is not filled.
+observe.validation.required.compagnies=Compagnies is not filled.
+observe.validation.required.harbour=Harbour is not filleds.
+observe.validation.required.species=Species is not filled.
observe.validation.route.activityFinDeVeille.notAvailable=Existe una actividad de fin de guardia en la ruta.
observe.validation.route.comment.tobig=La longitud del campo de comentarios está limitada a 1024 caracteres.
observe.validation.route.duplicated.date=Ya existe otra ruta en esa fecha.
@@ -843,9 +863,11 @@ observe.validation.targetDiscarded.required.weightCategory=Es obligatorio selecc
observe.validation.targetDiscarded.uniqueKey=El par (especie - categoria - causa del descarte - izado a bordo) debe ser única.
observe.validation.targetLength.bound.length=La talla para esta especie debe estar comprendida entre %1$s y %2$s.
observe.validation.targetLength.bound.weight=La peso para esta especie debe estar comprendida entre %1$s y %2$s.
+observe.validation.targetLength.desactivated.lengthMeasureMethod=Selected length measure method is disabled.
observe.validation.targetLength.desactivated.sex=El sexo está desactivado.
observe.validation.targetLength.desactivated.sizeMeasureType=Selected size mesure type is disabled. \#TODO
observe.validation.targetLength.desactivated.species=La especie seleccionada está desactivada.
+observe.validation.targetLength.desactivated.weightMeasureMethod=Selected weight measure method is disabled.
observe.validation.targetLength.positive.length=La talla debe ser un entero positivo.
observe.validation.targetLength.positive.weight=El peso debe ser un entero positivo.
observe.validation.targetLength.required.count=Es obligatoria especificar el número de grupo de talla.
=====================================
validation/src/main/resources/i18n/validation_fr_FR.properties
=====================================
@@ -524,6 +524,7 @@ observe.validation.catchLongline.desactivated.catchHealthness=L'état à la capt
observe.validation.catchLongline.desactivated.discardHealthness=L'état au rejet sélectionné est désactivé.
observe.validation.catchLongline.desactivated.hookPosition=La position de l'hameçon sélectionnée est désactivée.
observe.validation.catchLongline.desactivated.maturityStatus=La maturité sexuelle sélectionnée est désactivée.
+observe.validation.catchLongline.desactivated.onBoardProcessing=Le traitement à bord sélectionné est désactivé.
observe.validation.catchLongline.desactivated.sex=Le sexe sélectionné est désactivé.
observe.validation.catchLongline.desactivated.speciesCatch=L'espèce sélectionnée est désactivée.
observe.validation.catchLongline.desactivated.stomacFullness=L'état de l'estomac sélectionné est désactivé.
@@ -536,12 +537,25 @@ observe.validation.country.invalid.iso2Code.uniqueKey=Le code ISO2 n'est pas uni
observe.validation.country.invalid.iso3Code.uniqueKey=Le code ISO3 n'est pas unique
observe.validation.country.required.iso2Code=Code ISO2 non renseigné.
observe.validation.country.required.iso3Code=Code ISO3 non renseigné.
+observe.validation.disabled.compagnies=La source sélectionnée est désactivée.
+observe.validation.disabled.conservation=La conservation sélectionnée est désactivée.
+observe.validation.disabled.dataQuality=La qualité des données sélectionnée est désactivée.
+observe.validation.disabled.dataSource=La source de données sélectionnée est désactivée.
+observe.validation.disabled.fpaZone=La zone FPA sélectionnée est désactivée.
+observe.validation.disabled.harbour=Le port sélectionné est désactivé.
+observe.validation.disabled.onBoardProcessing=Le traitement à bord sélectionné est désactivé.
+observe.validation.disabled.person=La source de données (personne) sélectionnée est désactivée.
+observe.validation.disabled.species=L'espèce sélectionné est désactivé.
+observe.validation.disabled.vessel=Le navire sélectionné est désactivé.
+observe.validation.disabled.weightMeasureMethod=La méthode de mesure de poids sélectionné est désactivé.
observe.validation.encounter.desactivated.encounterType=Le type de rencontre est désactivé.
observe.validation.encounter.desactivated.species=L'espèce sélectionnée est désactivée.
observe.validation.encounter.required.count=Nombre non renseignée.
observe.validation.encounter.required.distance=Distance non renseignée.
observe.validation.encounter.required.encounterType=La sélection d'un type de rencontre est obligatoire.
observe.validation.encounter.required.species=La sélection d'une espèce est obligatoire.
+observe.validation.error.desactivated.lengthMeasureMethod=La méthode de mesure de taille sélectionnée est désactivée.
+observe.validation.error.desactivated.weightMeasureMethod=La méthode de meusre de poids sélectionnée est désactivée.
observe.validation.floatingObject.comment.tobig=La taille du commentaire est limitée à 1024 caractères.
observe.validation.floatingObject.desactivated.objectOperation=Au moins une des opérations sélectionnée est désactivée.
observe.validation.floatingObject.invalid.parts=Erreurs détectées sur le tableau des matériaux.
@@ -597,6 +611,7 @@ observe.validation.lengthWeightParameter.invalid.lengthWeightFormula=La relation
observe.validation.lengthWeightParameter.invalid.uniqueKey=Le tuple (espèce/sexe/océan/type de measure/date de début) doit être unique
observe.validation.lengthWeightParameter.invalid.weightLengthFormula=La relation taille saisie n'est pas cohérente.
observe.validation.lengthWeightParameter.null.ocean=Aucun océan sélectionné.
+observe.validation.lengthWeightParameter.null.sex=Aucun sexe sélectionné.
observe.validation.lengthWeightParameter.null.sizeMeasureType=Type de mensuration non renseigné.
observe.validation.lengthWeightParameter.required.coefficients=Les coefficients ne sont pas renseignés.
observe.validation.lengthWeightParameter.required.endDate=Date de fin de validité non renseignée.
@@ -695,6 +710,11 @@ observe.validation.referentiel.status.desactivated=L'objet est désactivé (il n
observe.validation.referentiel.status.required=Le statut actif-inactif est obligatoire.
observe.validation.referentiel.untranslated.label1=Le libellé anglais n'est pas traduit.
observe.validation.referentiel.untranslated.label3=Le libellé espagnol n'est pas traduit.
+observe.validation.required.categoryMax=La catégorie Max n'est pas renseignée.
+observe.validation.required.categoryMin=La catégorie Min n'est pas renseignée.
+observe.validation.required.compagnies=La compagnie n'est pas renseignée.
+observe.validation.required.harbour=Le port n'est pas renseigné.
+observe.validation.required.species=L'espèce n'est pas renseigné.
observe.validation.route.activityFinDeVeille.notAvailable=Il existe déjà une activité de fin de veille sur la route
observe.validation.route.comment.tobig=La taille du commentaire est limitée à 1024 caractères.
observe.validation.route.duplicated.date=Il existe déjà une autre route à cette date.
@@ -841,9 +861,11 @@ observe.validation.targetDiscarded.required.weightCategory=La sélection d'une c
observe.validation.targetDiscarded.uniqueKey=Le tuple (espèce - catégorie - raison rejet - monté sur le pont) doit être unique.
observe.validation.targetLength.bound.length=La longueur pour cette espèce doit être comprise entre %1$s et %2$s.
observe.validation.targetLength.bound.weight=Le poids individuel de l'échantillon doit être compris entre %1$s et %2$s.
+observe.validation.targetLength.desactivated.lengthMeasureMethod=La méthode de mesure de taille sélectionnée est désactivée.
observe.validation.targetLength.desactivated.sex=Le sexe sélectionné est désactivé.
observe.validation.targetLength.desactivated.sizeMeasureType=Le type de mesure sélectionné est désactivé.
observe.validation.targetLength.desactivated.species=L'espèce sélectionnée est désactivée.
+observe.validation.targetLength.desactivated.weightMeasureMethod=La méthode de mesure de poids sélectionnée est désactivée.
observe.validation.targetLength.positive.length=La longueur est un entier strictement positif.
observe.validation.targetLength.positive.weight=Le poids est un entier strictement positif.
observe.validation.targetLength.required.count=Le nombre effectif est obligatoire.
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/d395c74660ea822866afab099b…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/d395c74660ea822866afab099b…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] use last pom and snapshot of toolkit
by Tony CHEMIT 18 Sep '18
by Tony CHEMIT 18 Sep '18
18 Sep '18
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
d395c746 by Tony CHEMIT at 2018-09-18T07:09:43Z
use last pom and snapshot of toolkit
- - - - -
1 changed file:
- pom.xml
Changes:
=====================================
pom.xml
=====================================
@@ -26,7 +26,7 @@
<parent>
<groupId>io.ultreia.maven</groupId>
<artifactId>pom</artifactId>
- <version>2018.54</version>
+ <version>2018.55</version>
</parent>
<groupId>fr.ird.observe</groupId>
@@ -157,7 +157,7 @@
<!--<lib.version.java4all.eugene>3.0-alpha-22</lib.version.java4all.eugene>-->
<!--<lib.version.java4all.jaxx>3.0-alpha-35</lib.version.java4all.jaxx>-->
<!--<lib.version.nuiton.topia>3.4.2-SNAPSHOT</lib.version.nuiton.topia>-->
- <lib.version.java4all.topia>1.1.5-SNAPSHOT</lib.version.java4all.topia>
+ <!--<lib.version.java4all.topia>1.1.5-SNAPSHOT</lib.version.java4all.topia>-->
<lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>
<xworkVersion>2.3.35</xworkVersion>
<!--<lib.version.hibernate>5.2.10.Final</lib.version.hibernate>-->
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d395c74660ea822866afab099bb…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d395c74660ea822866afab099bb…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] use snapshot of topia extension to fix some data copies
by Tony CHEMIT 18 Sep '18
by Tony CHEMIT 18 Sep '18
18 Sep '18
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
acd48d40 by Tony CHEMIT at 2018-09-18T06:07:32Z
use snapshot of topia extension to fix some data copies
- - - - -
1 changed file:
- pom.xml
Changes:
=====================================
pom.xml
=====================================
@@ -157,7 +157,7 @@
<!--<lib.version.java4all.eugene>3.0-alpha-22</lib.version.java4all.eugene>-->
<!--<lib.version.java4all.jaxx>3.0-alpha-35</lib.version.java4all.jaxx>-->
<!--<lib.version.nuiton.topia>3.4.2-SNAPSHOT</lib.version.nuiton.topia>-->
- <!--<lib.version.java4all.topia>1.1.3</lib.version.java4all.topia>-->
+ <lib.version.java4all.topia>1.1.5-SNAPSHOT</lib.version.java4all.topia>
<lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>
<xworkVersion>2.3.35</xworkVersion>
<!--<lib.version.hibernate>5.2.10.Final</lib.version.hibernate>-->
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/acd48d40ace611128f3681bd81f…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/acd48d40ace611128f3681bd81f…
You're receiving this email because of your account on gitlab.com.
1
0
18 Sep '18
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
9db1191e by Tony CHEMIT at 2018-09-18T03:13:38Z
update changelog
- - - - -
5fc6822c by Tony CHEMIT at 2018-09-18T03:41:57Z
La synchro avancée du référentiel listes d'espèces provoque une exception - Closes #1054
- - - - -
2b190843 by Tony CHEMIT at 2018-09-18T03:49:01Z
Problème de timeout en RC18 en connexion serveur directe à Tomcat (pas de HTTPD) - See #1053
- - - - -
2affe04c by Tony CHEMIT at 2018-09-18T04:10:40Z
Suppression de lignes de référentiel : liste de ceux qui plantent avec erreurs spécifiques - Closes #1052
- - - - -
4f2a89cb by Tony CHEMIT at 2018-09-18T04:11:22Z
update pom
- - - - -
5d1bdbe0 by Tony CHEMIT at 2018-09-18T04:11:59Z
add more log when can not get Call.ParameterTree
- - - - -
f927feaf by Tony CHEMIT at 2018-09-18T04:12:21Z
[PS][LL] La synchro avancée de marées plante - Closes #1050
- - - - -
9dbdf820 by Tony CHEMIT at 2018-09-18T04:13:15Z
Problème de socket en RC18 en connexion serveur directe à Tomcat (pas de HTTPD) - Closes #1053
- - - - -
716da68e by Tony CHEMIT at 2018-09-18T04:15:33Z
use last toolkit to fix topia generation
- - - - -
7058994a by Tony CHEMIT at 2018-09-18T04:17:40Z
fix entity binder
- - - - -
3723f7dd by Tony CHEMIT at 2018-09-18T04:18:24Z
[LL] La suppression d'une marée en mode serveur provoque une exception - Closes #1049
- - - - -
26 changed files:
- + .mvn/gitlab-cache/milestones/647608-artifacts.json
- .mvn/gitlab-cache/milestones/647608-issues.json
- .mvn/gitlab-cache/milestones/647608.json
- CHANGELOG.md
- client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java
- client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageForDeleteUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageForDesactivateUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageForDisplayUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageUIHandlerSupport.java
- persistence/pom.xml
- persistence/src/main/java/fr/ird/observe/binder/data/seine/NonTargetCatchEntityReferenceBinder.java
- pom.xml
- server/src/main/filtered-resources/mapping
- server/src/main/java/fr/ird/observe/server/injector/ObserveDtoInjector.java
- services-client/src/main/java/fr/ird/observe/services/client/ObserveRequestBuilder.java
- + services-client/src/main/java/fr/ird/observe/services/client/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceClient.java
- + services-client/src/main/java/fr/ird/observe/services/client/referential/ReferentialServiceClient.java
- services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceLocal.java
- services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java
- services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java
- services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeService.java
- services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequest.java
- services/src/main/java/fr/ird/observe/services/service/data/NavigationService.java
- services/src/main/java/fr/ird/observe/services/service/data/TripManagementService.java
- services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java
- services/src/main/java/fr/ird/observe/services/service/sql/SqlScriptProducerService.java
Changes:
=====================================
.mvn/gitlab-cache/milestones/647608-artifacts.json
=====================================
@@ -0,0 +1,12 @@
+[
+ {
+ "name": "Application",
+ "filename": "observe-7.0-RC-20.zip",
+ "url": "https://ultreia.io/release/observe-7.0-RC-20.zip"
+ },
+ {
+ "name": "Serveur",
+ "filename": "observe-7.0-RC-20.war",
+ "url": "https://ultreia.io/release/observe-7.0-RC-20.war"
+ }
+]
\ No newline at end of file
=====================================
.mvn/gitlab-cache/milestones/647608-issues.json
=====================================
The diff for this file was not included because it is too large.
=====================================
.mvn/gitlab-cache/milestones/647608.json
=====================================
@@ -4,5 +4,8 @@
"projectId": 2722779,
"groupId": 0,
"title": "7.0-RC-20",
- "state": "active"
+ "description": "",
+ "dueDate": "Sep 18, 2018 2:00:00 AM",
+ "startDate": "Sep 17, 2018 2:00:00 AM",
+ "state": "closed"
}
\ No newline at end of file
=====================================
CHANGELOG.md
=====================================
@@ -1,6 +1,7 @@
# ObServe changelog
* Author [Tony Chemit](mailto:dev@tchemit.fr)
+ * Last generated at 2018-09-18 04:46.
* Last generated at 2018-09-16 22:22.
## Version [8.0-alpha-3](https://gitlab.com/ultreiaio/ird-observe/milestones/114)
@@ -68,6 +69,23 @@ Premier lot du contrat IRD-2018-01-V8
* [[Evolution 922]](https://gitlab.com/ultreiaio/ird-observe/issues/922) **Ajoute le référentiel observe_common.DataQuality sur les données existantes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
* [[Evolution 950]](https://gitlab.com/ultreiaio/ird-observe/issues/950) **Renommage de la classe seine.WeightCategory en seine.WeightCategorySeine** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
+## Version [7.0-RC-20](https://gitlab.com/ultreiaio/ird-observe/milestones/123)
+
+**Closed at 2018-09-18.**
+
+### Download
+* [Application (observe-7.0-RC-20.zip)](https://ultreia.io/release/observe-7.0-RC-20.zip)
+* [Serveur (observe-7.0-RC-20.war)](https://ultreia.io/release/observe-7.0-RC-20.war)
+
+### Issues
+ * [[Anomalie 1049]](https://gitlab.com/ultreiaio/ird-observe/issues/1049) **[LL] La suppression d'une marée en mode serveur provoque une exception** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+ * [[Anomalie 1050]](https://gitlab.com/ultreiaio/ird-observe/issues/1050) **[PS][LL] La synchro avancée de marées plante** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+ * [[Anomalie 1051]](https://gitlab.com/ultreiaio/ird-observe/issues/1051) **Suppression de lignes de référentiel : liste de ceux qui plantent avec erreur de type Dto** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+ * [[Anomalie 1052]](https://gitlab.com/ultreiaio/ird-observe/issues/1052) **Suppression de lignes de référentiel : liste de ceux qui plantent avec erreurs spécifiques** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+ * [[Anomalie 1053]](https://gitlab.com/ultreiaio/ird-observe/issues/1053) **Problème de socket en RC18 en connexion serveur directe à Tomcat (pas de HTTPD)** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+ * [[Anomalie 1054]](https://gitlab.com/ultreiaio/ird-observe/issues/1054) **La synchro avancée du référentiel listes d'espèces provoque une exception** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+ * [[Anomalie 1055]](https://gitlab.com/ultreiaio/ird-observe/issues/1055) **Suppression d'une référence "Equipement bateau" "Radio BLU" : erreur (RC20-SNAPSHOT)** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+
## Version [7.0-RC-19](https://gitlab.com/ultreiaio/ird-observe/milestones/122)
**Closed at 2018-09-16.**
@@ -144,12 +162,18 @@ Premier lot du contrat IRD-2018-01-V8
* [Serveur (observe-7.0-RC-15.war)](https://ultreia.io/release/observe-7.0-RC-15.war)
### Issues
- * [[Anomalie 942]](https://gitlab.com/ultreiaio/ird-observe/issues/942) **Plantage base en sortie de l'outil de traduction** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
- * [[Anomalie 943]](https://gitlab.com/ultreiaio/ird-observe/issues/943) **Trouver une solution aux problèmes de fiabilité d'H2** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
- * [[Anomalie 959]](https://gitlab.com/ultreiaio/ird-observe/issues/959) **[PS][UI] Problème d'UI lors de la création d'activités** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
- * [[Evolution 944]](https://gitlab.com/ultreiaio/ird-observe/issues/944) **Make configurable FOB Form observed system to auto-add to activity** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
- * [[Evolution 948]](https://gitlab.com/ultreiaio/ird-observe/issues/948) **Improve FOB Form (when creating)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
- * [[Evolution 949]](https://gitlab.com/ultreiaio/ird-observe/issues/949) **Optimisation des flux de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
+ * [[Anomalie 976]](https://gitlab.com/ultreiaio/ird-observe/issues/976) **Ecran de configuration du référentiel taille-taille : libellés** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+ * [[Anomalie 977]](https://gitlab.com/ultreiaio/ird-observe/issues/977) **Ecran de configuration du référentiel taille-taille : petit souci de validation** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+ * [[Anomalie 979]](https://gitlab.com/ultreiaio/ird-observe/issues/979) **Création de marée : focus forcé sur la carto** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+ * [[Anomalie 980]](https://gitlab.com/ultreiaio/ird-observe/issues/980) **Equipement bateau : première frappe inhibée** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+ * [[Anomalie 981]](https://gitlab.com/ultreiaio/ird-observe/issues/981) **Validation écran activité : erreur pas visible sur l'onglet caractéristiques** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+ * [[Anomalie 984]](https://gitlab.com/ultreiaio/ird-observe/issues/984) **Gestion référentiel taille-taille : message de validation douteux** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+ * [[Anomalie 986]](https://gitlab.com/ultreiaio/ird-observe/issues/986) **La conversion taille-taille ne fonctionne toujours pas** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+ * [[Evolution 885]](https://gitlab.com/ultreiaio/ird-observe/issues/885) **[LL][PS] Possibilité de classer les tableaux de captures/échantillons** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+ * [[Evolution 978]](https://gitlab.com/ultreiaio/ird-observe/issues/978) **Ecran de configuration du référentiel taille-taille : liste des relations existantes** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+ * [[Evolution 983]](https://gitlab.com/ultreiaio/ird-observe/issues/983) **[PS] Placement des champs sur échantillon faune accessoire** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+ * [[Evolution 985]](https://gitlab.com/ultreiaio/ird-observe/issues/985) **Gestion référentiel taille-taille : les enregistrements existants ne sont pas modifiables** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+ * [[Tâche 989]](https://gitlab.com/ultreiaio/ird-observe/issues/989) **Requêtes pour insertion préalable des systèmes observés 20, 21 et 22** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
## Version [7.0-RC-14](https://gitlab.com/ultreiaio/ird-observe/milestones/111)
=====================================
client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java
=====================================
@@ -36,6 +36,7 @@ import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper;
import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator;
import fr.ird.observe.dto.form.Form;
import fr.ird.observe.dto.form.FormDefinition;
+import fr.ird.observe.dto.reference.DtoReference;
import fr.ird.observe.dto.reference.ReferentialDtoReference;
import fr.ird.observe.dto.referential.I18nReferentialDto;
import fr.ird.observe.dto.referential.ProgramDto;
@@ -49,8 +50,8 @@ import fr.ird.observe.spi.DtoModelHelper;
import fr.ird.observe.spi.map.ImmutableSetDtoMap;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.nuiton.decorator.Decorator;
import org.nuiton.jaxx.runtime.swing.CardLayout2Ext;
import org.nuiton.jaxx.validator.swing.SwingValidatorUtil;
@@ -121,7 +122,7 @@ public class ContentReferenceUIHandler<D extends ReferentialDto, R extends Refer
}
private static <E extends ReferentialDto, R extends ReferentialDtoReference<E, R>> Pair<Boolean, R> showUsagesForDelete(E entity,
- ImmutableSetDtoMap<ReferentialDtoReference> usages,
+ ImmutableSetDtoMap<DtoReference> usages,
List<R> referenceList) {
DecoratorService service = ObserveSwingApplicationContext.get().getDecoratorService();
@@ -160,7 +161,7 @@ public class ContentReferenceUIHandler<D extends ReferentialDto, R extends Refer
}
private static <E extends ReferentialDto, R extends ReferentialDtoReference<E, R>> Pair<Boolean, R> showUsagesForDesactivated(E entity,
- ImmutableSetDtoMap<ReferentialDtoReference> usages,
+ ImmutableSetDtoMap<DtoReference> usages,
List<R> referenceList) {
DecoratorService service = ObserveSwingApplicationContext.get().getDecoratorService();
@@ -372,7 +373,7 @@ public class ContentReferenceUIHandler<D extends ReferentialDto, R extends Refer
}
// recherche des utilisation du bean dans la base
- ImmutableSetDtoMap<ReferentialDtoReference> usages = getReferentialService().findAllUsages(bean);
+ ImmutableSetDtoMap<DtoReference> usages = getReferentialService().findAllUsages(bean);
DecoratorService dService = getDecoratorService();
Decorator<D> decorator = dService.getDecoratorByType(getBeanType());
@@ -671,7 +672,7 @@ public class ContentReferenceUIHandler<D extends ReferentialDto, R extends Refer
log.debug("entity status was desactivated, looking for usage");
}
- ImmutableSetDtoMap<ReferentialDtoReference> usages = getReferentialService().findAllUsages(bean);
+ ImmutableSetDtoMap<DtoReference> usages = getReferentialService().findAllUsages(bean);
if (usages.isEmpty()) {
if (log.isInfoEnabled()) {
@@ -745,7 +746,7 @@ public class ContentReferenceUIHandler<D extends ReferentialDto, R extends Refer
}
// recherche des utilisation du bean dans la base
- ImmutableSetDtoMap<ReferentialDtoReference> usages = getReferentialService().findAllUsages(bean);
+ ImmutableSetDtoMap<DtoReference> usages = getReferentialService().findAllUsages(bean);
R replaceReference = null;
=====================================
client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageForDeleteUI.jaxx
=====================================
@@ -26,6 +26,7 @@ Interface graphique pour afficher la liste des usages d'une entitee donnee.
<import>
fr.ird.observe.spi.map.ImmutableSetDtoMap
+ fr.ird.observe.dto.reference.DtoReference
fr.ird.observe.dto.reference.ReferentialDtoReference
org.nuiton.jaxx.runtime.context.JAXXInitialContext
org.nuiton.jaxx.widgets.select.BeanFilterableComboBox
@@ -36,7 +37,7 @@ Interface graphique pour afficher la liste des usages d'une entitee donnee.
<script><![CDATA[
-public static <R extends ReferentialDtoReference> UsageForDeleteUI<R> build(String message, ImmutableSetDtoMap<ReferentialDtoReference> usages, List references) {
+public static <R extends ReferentialDtoReference> UsageForDeleteUI<R> build(String message, ImmutableSetDtoMap<? extends DtoReference> usages, List references) {
return new UsageForDeleteUI<>(new JAXXInitialContext().add(message).add(usages).add(references));
}
=====================================
client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageForDesactivateUI.jaxx
=====================================
@@ -24,6 +24,7 @@ Interface graphique pour afficher la liste des usages d'une entitee donnee.
<JPanel layout='{new BorderLayout()}' genericType="R extends ReferentialDtoReference">
<import>
+ fr.ird.observe.dto.reference.DtoReference
fr.ird.observe.dto.reference.ReferentialDtoReference
fr.ird.observe.spi.map.ImmutableSetDtoMap
@@ -36,7 +37,7 @@ Interface graphique pour afficher la liste des usages d'une entitee donnee.
<script><![CDATA[
-public static <R extends ReferentialDtoReference> UsageForDesactivateUI<R> build(String message, ImmutableSetDtoMap<ReferentialDtoReference> usages, List references) {
+public static <R extends ReferentialDtoReference> UsageForDesactivateUI<R> build(String message, ImmutableSetDtoMap<? extends DtoReference> usages, List references) {
return new UsageForDesactivateUI<>(new JAXXInitialContext().add(message).add(usages).add(references));
}
=====================================
client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageForDisplayUI.jaxx
=====================================
@@ -25,6 +25,7 @@ Interface graphique pour afficher la liste des usages d'une entitee donnee.
<import>
+ fr.ird.observe.dto.reference.DtoReference
fr.ird.observe.dto.reference.ReferentialDtoReference
fr.ird.observe.spi.map.ImmutableSetDtoMap
org.nuiton.jaxx.runtime.context.JAXXInitialContext
@@ -34,7 +35,7 @@ Interface graphique pour afficher la liste des usages d'une entitee donnee.
<script><![CDATA[
-public static <R extends ReferentialDtoReference> UsageForDisplayUI<R> build(String message, ImmutableSetDtoMap<ReferentialDtoReference> usages) {
+public static <R extends ReferentialDtoReference> UsageForDisplayUI<R> build(String message, ImmutableSetDtoMap<? extends DtoReference> usages) {
return new UsageForDisplayUI<>(new JAXXInitialContext().add(message).add(usages));
}
=====================================
client/src/main/java/fr/ird/observe/client/ui/content/ref/usage/UsageUIHandlerSupport.java
=====================================
@@ -24,9 +24,11 @@ package fr.ird.observe.client.ui.content.ref.usage;
import fr.ird.observe.client.ObserveSwingApplicationContext;
import fr.ird.observe.dto.IdDto;
+import fr.ird.observe.dto.data.DataDto;
import fr.ird.observe.dto.decoration.DecoratorService;
import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper;
import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator;
+import fr.ird.observe.dto.reference.DataDtoReference;
import fr.ird.observe.dto.reference.DtoReference;
import fr.ird.observe.dto.reference.ReferentialDtoReference;
import fr.ird.observe.dto.referential.ReferentialDto;
@@ -91,9 +93,12 @@ public abstract class UsageUIHandlerSupport<R extends ReferentialDtoReference, U
Set references = usages.get(dtoType);
String typeTitle = t(ObserveI18nDecoratorHelper.getTypeI18nKey(dtoType));
addReferentialReferenceUsages(dtoType, references, typeTitle);
-
}
-
+ for (Class<? extends DataDtoReference> dtoType : usages.dataReferenceTypes()) {
+ Set references = usages.get(dtoType);
+ String typeTitle = t(ObserveI18nDecoratorHelper.getTypeI18nKey(dtoType));
+ addDataReferenceUsages(dtoType, references, typeTitle);
+ }
}
BeanFilterableComboBox<R> comboBox = getReplace();
@@ -119,18 +124,18 @@ public abstract class UsageUIHandlerSupport<R extends ReferentialDtoReference, U
});
}
-// protected <D extends DataDto, R extends DataDtoReference<D, R>> void addDataReferenceUsages(Class<R> dtoType,
-// Set<R> references,
-// String typeTitle) {
-//
-// String typetitle = n("observe.common.Dto.label.usage.data.title");
-// typetitle = t(typetitle, typeTitle, references.size());
-//
-// Decorator<?> decorator = ObserveSwingApplicationContext.get().getDecoratorService().getDataReferenceDecorator(dtoType);
-// Objects.requireNonNull(decorator, "could not find decorator for type " + dtoType);
-//
-// buildUsagePanel(decorator, references, typetitle);
-// }
+ protected <D extends DataDto, R extends DataDtoReference<D, R>> void addDataReferenceUsages(Class<R> dtoType,
+ Set<R> references,
+ String typeTitle) {
+
+ String typetitle = n("observe.common.Dto.label.usage.data.title");
+ typetitle = t(typetitle, typeTitle, references.size());
+
+ Decorator<?> decorator = ObserveSwingApplicationContext.get().getDecoratorService().getDataReferenceDecorator(dtoType);
+ Objects.requireNonNull(decorator, "could not find decorator for type " + dtoType);
+
+ buildUsagePanel(decorator, references, typetitle);
+ }
protected <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>> void addReferentialReferenceUsages(Class<R> referenceType,
=====================================
persistence/pom.xml
=====================================
@@ -264,6 +264,7 @@
<input>friend:target/models:*.model</input>
</inputs>
<templates>
+ org.nuiton.topia.templates.TopiaEntityDaoTransformer,
org.nuiton.topia.templates.TopiaMetaTransformer,
org.nuiton.topia.templates.TopiaMetadataModelGenerator
</templates>
=====================================
persistence/src/main/java/fr/ird/observe/binder/data/seine/NonTargetCatchEntityReferenceBinder.java
=====================================
@@ -28,6 +28,8 @@ import fr.ird.observe.dto.data.seine.NonTargetCatchReference;
import fr.ird.observe.dto.referential.ReferentialLocale;
import fr.ird.observe.entities.seine.NonTargetCatch;
+import java.util.Optional;
+
/**
* Created on 24/11/15.
*
@@ -41,9 +43,8 @@ public class NonTargetCatchEntityReferenceBinder extends DataEntityReferenceBind
@Override
public NonTargetCatchReference toReference(ReferentialLocale referentialLocale, NonTargetCatch entity) {
-
return new NonTargetCatchReference(entity, entity.getSpecies().getScientificLabel(),
- entity.getSpeciesFate().getLabel(referentialLocale));
+ Optional.ofNullable(entity.getSpeciesFate()).map(e->e.getLabel(referentialLocale)).orElse(null));
}
}
=====================================
pom.xml
=====================================
@@ -26,7 +26,7 @@
<parent>
<groupId>io.ultreia.maven</groupId>
<artifactId>pom</artifactId>
- <version>2018.52</version>
+ <version>2018.54</version>
</parent>
<groupId>fr.ird.observe</groupId>
@@ -152,13 +152,13 @@
<maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
<buildDate>${maven.build.timestamp}</buildDate>
- <observeToolkitVersion>4.3</observeToolkitVersion>
+ <observeToolkitVersion>4.4-SNAPSHOT</observeToolkitVersion>
<!--<lib.version.java4all.topia>1.1.1</lib.version.java4all.topia>-->
<!--<lib.version.java4all.eugene>3.0-alpha-22</lib.version.java4all.eugene>-->
<!--<lib.version.java4all.jaxx>3.0-alpha-35</lib.version.java4all.jaxx>-->
<!--<lib.version.nuiton.topia>3.4.2-SNAPSHOT</lib.version.nuiton.topia>-->
+ <!--<lib.version.java4all.topia>1.1.3</lib.version.java4all.topia>-->
<lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>
- <lib.version.java4all.topia>1.1.3</lib.version.java4all.topia>
<xworkVersion>2.3.35</xworkVersion>
<!--<lib.version.hibernate>5.2.10.Final</lib.version.hibernate>-->
<!--can't use 1.4.197 (date has changed + blob also-->
=====================================
server/src/main/filtered-resources/mapping
=====================================
@@ -270,7 +270,7 @@ POST /api/v1/data/seine/TripSeineService/save
POST /api/v1/referential/ReferentialService/computeMissingReferential v1.referential.ReferentialServiceRestApi.computeMissingReferential
DELETE /api/v1/referential/ReferentialService/delete v1.referential.ReferentialServiceRestApi.delete
GET /api/v1/referential/ReferentialService/exists v1.referential.ReferentialServiceRestApi.exists
-GET /api/v1/referential/ReferentialService/findAllUsages v1.referential.ReferentialServiceRestApi.findAllUsages
+POST /api/v1/referential/ReferentialService/findAllUsages v1.referential.ReferentialServiceRestApi.findAllUsages
GET /api/v1/referential/ReferentialService/getReferenceSet v1.referential.ReferentialServiceRestApi.getReferenceSet
POST /api/v1/referential/ReferentialService/getReferentialIds v1.referential.ReferentialServiceRestApi.getReferentialIds
GET /api/v1/referential/ReferentialService/getReferentialReferenceSets v1.referential.ReferentialServiceRestApi.getReferentialReferenceSets
=====================================
server/src/main/java/fr/ird/observe/server/injector/ObserveDtoInjector.java
=====================================
@@ -27,8 +27,8 @@ import com.google.gson.JsonParseException;
import fr.ird.observe.dto.ObserveDto;
import io.ultreia.java4all.http.HRestClientService;
import org.apache.commons.beanutils.converters.AbstractConverter;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.debux.webmotion.server.call.Call;
import org.debux.webmotion.server.handler.ExecutorParametersInjectorHandler;
import org.debux.webmotion.server.mapping.Mapping;
@@ -58,7 +58,13 @@ public class ObserveDtoInjector extends AbstractConverter implements ExecutorPar
ObserveDto observeDto = null;
if (ObserveDto.class.isAssignableFrom(type)) {
- Call.ParameterTree parameterTree = call.getParameterTree().getObject().get(name);
+ Call.ParameterTree parameterTree;
+ try {
+ parameterTree = call.getParameterTree().getObject().get(name);
+ } catch (RuntimeException e) {
+ log.error(String.format("Could not get parameterTree for mapping: %s, call: %s - name: %s, type: %s", mapping, call, name, type), e);
+ throw e;
+ }
String gsonContent = ((String[]) parameterTree.getValue())[0];
=====================================
services-client/src/main/java/fr/ird/observe/services/client/ObserveRequestBuilder.java
=====================================
@@ -53,6 +53,7 @@ public class ObserveRequestBuilder extends HRequestBuilder {
super.checkBeforeBuild();
setTimeout(TimeUnit.MINUTES, serviceContext.getInitializer().getHttpTimeout());
+ setSocketTimeout(TimeUnit.MINUTES, serviceContext.getInitializer().getHttpTimeout());
if (serviceContext.withApplicationLocale()) {
addHeader(REQUEST_APPLICATION_LOCALE, serviceContext.getApplicationLocale().toString());
=====================================
services-client/src/main/java/fr/ird/observe/services/client/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceClient.java
=====================================
@@ -0,0 +1,43 @@
+package fr.ird.observe.services.client.actions.synchro.referential.diff;
+
+/*-
+ * #%L
+ * ObServe :: Services client implementation
+ * %%
+ * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+
+import com.google.common.collect.ImmutableSet;
+import fr.ird.observe.dto.referential.ReferentialDto;
+import org.apache.http.HttpStatus;
+
+import java.util.concurrent.TimeUnit;
+
+public class ReferentialSynchronizeDiffServiceClient extends GeneratedReferentialSynchronizeDiffServiceClient {
+
+ @Override
+ public <R extends ReferentialDto> ImmutableSet<R> getReferential(Class<R> referentialName, ImmutableSet<String> ids) {
+ return executeRequest(create("getReferential")
+ .addParameter("referentialName", referentialName)
+ .addParameter("ids", ids, String.class)
+ .addAuthToken()
+ .setTimeout(TimeUnit.MINUTES, 1)
+ .post(), HttpStatus.SC_OK).toImmutableSet(referentialName);
+ }
+
+}
\ No newline at end of file
=====================================
services-client/src/main/java/fr/ird/observe/services/client/referential/ReferentialServiceClient.java
=====================================
@@ -0,0 +1,44 @@
+package fr.ird.observe.services.client.referential;
+
+/*-
+ * #%L
+ * ObServe :: Services client implementation
+ * %%
+ * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/gpl-3.0.html>.
+ * #L%
+ */
+
+import fr.ird.observe.dto.reference.ReferentialDtoReference;
+import fr.ird.observe.dto.referential.ReferentialDto;
+import fr.ird.observe.spi.DtoModelHelper;
+import org.apache.http.HttpStatus;
+
+import java.util.concurrent.TimeUnit;
+
+public class ReferentialServiceClient extends GeneratedReferentialServiceClient {
+
+ @Override
+ public <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>> R loadReference(Class<D> type, String id) {
+ Class<R> rrClass = DtoModelHelper.fromReferentialDto(type).toReferenceType();
+ return executeRequest(create("loadReference")
+ .addParameter("type", type)
+ .addParameter("id", id)
+ .addAuthToken()
+ .setTimeout(TimeUnit.MINUTES, 1)
+ .get(), HttpStatus.SC_OK).toJson(rrClass);
+ }
+}
\ No newline at end of file
=====================================
services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceLocal.java
=====================================
@@ -56,13 +56,19 @@ public class ReferentialSynchronizeServiceLocal extends ObserveServiceLocal impl
public void executeSqlsRequests(ReferentialSynchronizeSqlsRequest request, ReferentialSynchronizeSqlsRequest oppositeSqlsRequest) {
long startTime = TimeLog.getTime();
-
+ byte[] deleteAssociationSqlCode = request.getDeleteAssociationSqlCode();
byte[] insertSqlCode = oppositeSqlsRequest.getInsertSqlCode();
+ byte[] insertAssociationSqlCode = oppositeSqlsRequest.getInsertAssociationSqlCode();
byte[] updateSqlCode = oppositeSqlsRequest.getUpdateSqlCode();
byte[] deleteSqlCode = request.getDeleteSqlCode();
byte[] desactivateSqlCode = request.getDesactivateSqlCode();
- getTopiaPersistenceContext().executeSqlScripts(insertSqlCode, updateSqlCode, desactivateSqlCode, deleteSqlCode);
+ getTopiaPersistenceContext().executeSqlScripts(deleteAssociationSqlCode,
+ insertSqlCode,
+ insertAssociationSqlCode,
+ updateSqlCode,
+ desactivateSqlCode,
+ deleteSqlCode);
timeLog.log(startTime, "executeSqlsRequests");
=====================================
services-local/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java
=====================================
@@ -10,12 +10,12 @@ package fr.ird.observe.services.local.service.referential;
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/gpl-3.0.html>.
@@ -25,11 +25,16 @@ package fr.ird.observe.services.local.service.referential;
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;
import fr.ird.observe.binder.referential.ReferentialEntityDtoBinderSupport;
import fr.ird.observe.binder.referential.ReferentialEntityReferenceBinderSupport;
import fr.ird.observe.dto.IdDto;
+import fr.ird.observe.dto.data.DataDto;
import fr.ird.observe.dto.form.Form;
import fr.ird.observe.dto.form.FormDefinition;
+import fr.ird.observe.dto.reference.DataDtoReference;
+import fr.ird.observe.dto.reference.DataDtoReferenceSet;
+import fr.ird.observe.dto.reference.DtoReference;
import fr.ird.observe.dto.reference.ReferentialDtoReference;
import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet;
import fr.ird.observe.dto.referential.ReferenceStatus;
@@ -39,6 +44,7 @@ import fr.ird.observe.dto.referential.SpeciesGroupDto;
import fr.ird.observe.dto.referential.seine.ObservedSystemReference;
import fr.ird.observe.dto.result.SaveResultDto;
import fr.ird.observe.entities.EntityMap;
+import fr.ird.observe.entities.ObserveDataEntity;
import fr.ird.observe.entities.longline.TripLongline;
import fr.ird.observe.entities.referentiel.ObserveReferentialEntity;
import fr.ird.observe.entities.referentiel.Species;
@@ -59,13 +65,14 @@ import fr.ird.observe.services.service.sql.SqlScriptProducerService;
import fr.ird.observe.spi.DbModelHelper;
import fr.ird.observe.spi.DtoModelClasses;
import fr.ird.observe.spi.DtoModelHelper;
+import fr.ird.observe.spi.context.DataEntityContext;
import fr.ird.observe.spi.context.ReferentialDtoEntityContext;
import fr.ird.observe.spi.context.ReferentialEntityContext;
import fr.ird.observe.spi.context.ReferentialReferenceEntityContext;
import fr.ird.observe.spi.map.ImmutableDtoMap;
import fr.ird.observe.spi.map.ImmutableSetDtoMap;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.nuiton.topia.persistence.TopiaDao;
import org.nuiton.topia.persistence.TopiaEntity;
import org.nuiton.topia.persistence.metadata.TopiaMetadataModel;
@@ -208,7 +215,7 @@ public class ReferentialServiceLocal extends ObserveServiceLocal implements Refe
}
@Override
- public <D extends ReferentialDto> ImmutableSetDtoMap<ReferentialDtoReference> findAllUsages(D bean) {
+ public <D extends ReferentialDto> ImmutableSetDtoMap<DtoReference> findAllUsages(D bean) {
ReferentialDtoEntityContext<D, ?, ?> spi = DbModelHelper.fromReferentialDto(bean);
Class<ObserveReferentialEntity> entityType = spi.toEntityType();
@@ -218,12 +225,14 @@ public class ReferentialServiceLocal extends ObserveServiceLocal implements Refe
TopiaDao<ObserveReferentialEntity> dao = getTopiaPersistenceContext().getDao(entityType);
EntityMap allUsages = new EntityMap(dao.findAllUsages(entity));
- ImmutableSetDtoMap.Builder<ReferentialDtoReference> result = ImmutableSetDtoMap.builder();
+ ImmutableSetDtoMap.Builder<DtoReference> result = ImmutableSetDtoMap.builder();
for (Class<? extends TopiaEntity> type : allUsages.keySet()) {
List<? extends TopiaEntity> entities = allUsages.get(type);
if (ObserveReferentialEntity.class.isAssignableFrom(type)) {
//noinspection unchecked
- findAllUsageReferential(DbModelHelper.fromReferentialEntity((Class) type), (List) entities, result);
+ addAllReferentialUsage(DbModelHelper.fromReferentialEntity((Class) type), (List) entities, result);
+ } else {
+ adddAllDataUsage(DbModelHelper.fromDataEntity((Class) type), (List) entities, result);
}
}
return result.build();
@@ -242,13 +251,20 @@ public class ReferentialServiceLocal extends ObserveServiceLocal implements Refe
return result;
}
- private <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>, E extends ObserveReferentialEntity> void findAllUsageReferential(ReferentialEntityContext<D, R, E> spi, List<E> entities, ImmutableSetDtoMap.Builder<ReferentialDtoReference> result) {
+ private <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>, E extends ObserveReferentialEntity> void addAllReferentialUsage(ReferentialEntityContext<D, R, E> spi, List<E> entities, ImmutableSetDtoMap.Builder<DtoReference> result) {
Class<R> referenceType = spi.toReferenceType();
ReferentialEntityReferenceBinderSupport<D, R, E> binder = spi.toEntityReferenceBinder();
ReferentialDtoReferenceSet<R> referenceSet = toReferentialReferenceSet(binder, entities, null);
result.put(referenceType, referenceSet.toSet());
}
+ private <D extends DataDto, R extends DataDtoReference<D, R>, E extends ObserveDataEntity> void adddAllDataUsage(DataEntityContext<D, R, E> spi, List<E> entities, ImmutableSetDtoMap.Builder<DtoReference> result) {
+ Class<R> referenceType = spi.toReferenceType();
+ DataEntityReferenceBinderSupport<D, R, E> binder = spi.toEntityReferenceBinder();
+ DataDtoReferenceSet<R> referenceSet = toDataReferenceSet(binder, entities);
+ result.put(referenceType, referenceSet.toSet());
+ }
+
@Override
public <D extends ReferentialDto> boolean exists(Class<D> type, String id) {
if (log.isTraceEnabled()) {
=====================================
services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java
=====================================
@@ -87,7 +87,7 @@ public interface UnidirectionalReferentialSynchronizeLocalService extends Observ
//tc-20160713 On ne met pas cette permission, car il s'agit d'appliquer un script sql, sans avoir besoin des droits applicatifs
// @WriteReferentialPermission
@Write
- @Post
+ @Post(useMultiPartForm = true)
void applySqlRequests(ImmutableSet<String> sqlRequests);
@ReadReferentialPermission
=====================================
services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeService.java
=====================================
@@ -40,7 +40,7 @@ public interface ReferentialSynchronizeService extends ObserveService {
// Note : sur cette méthode aucun droit métier à poser, les actions sont légitimes
@Write
- @Post
+ @Post(useMultiPartForm = true)
void executeSqlsRequests(ReferentialSynchronizeSqlsRequest localSqlsRequest, ReferentialSynchronizeSqlsRequest oppositeSqlsRequest);
}
=====================================
services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequest.java
=====================================
@@ -10,12 +10,12 @@ package fr.ird.observe.services.service.actions.synchro.referential.ng;
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/gpl-3.0.html>.
@@ -23,8 +23,8 @@ package fr.ird.observe.services.service.actions.synchro.referential.ng;
*/
import fr.ird.observe.dto.ObserveDto;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Created on 08/08/16.
@@ -37,18 +37,24 @@ public class ReferentialSynchronizeSqlsRequest implements ObserveDto {
/** Logger. */
private static final Logger log = LogManager.getLogger(ReferentialSynchronizeSqlsRequest.class);
+ private final byte[] insertAssociationSqlCode;
private final byte[] insertSqlCode;
private final byte[] updateSqlCode;
+ private final byte[] deleteAssociationSqlCode;
private final byte[] deleteSqlCode;
private final byte[] desactivateSqlCode;
private ReferentialSynchronizeSqlsRequest(String insertSqlCode,
+ String insertAssociationSqlCode,
String updateSqlCode,
String deleteSqlCode,
+ String deleteAssociationSqlCode,
String desactivateSqlCode) {
this.insertSqlCode = insertSqlCode.getBytes();
+ this.insertAssociationSqlCode = insertAssociationSqlCode.getBytes();
this.updateSqlCode = updateSqlCode.getBytes();
this.deleteSqlCode = deleteSqlCode.getBytes();
+ this.deleteAssociationSqlCode = deleteAssociationSqlCode.getBytes();
this.desactivateSqlCode = desactivateSqlCode.getBytes();
}
@@ -68,21 +74,33 @@ public class ReferentialSynchronizeSqlsRequest implements ObserveDto {
return deleteSqlCode;
}
+ public byte[] getInsertAssociationSqlCode() {
+ return insertAssociationSqlCode;
+ }
+
+ public byte[] getDeleteAssociationSqlCode() {
+ return deleteAssociationSqlCode;
+ }
+
public byte[] getDesactivateSqlCode() {
return desactivateSqlCode;
}
public static class Builder {
+ private final StringBuilder addAssociationTasksBuilder = new StringBuilder();
private final StringBuilder addTasksBuilder = new StringBuilder();
private final StringBuilder updateTasksBuilder = new StringBuilder();
private final StringBuilder deleteTasksBuilder = new StringBuilder();
+ private final StringBuilder deleteAssociationTasksBuilder = new StringBuilder();
private final StringBuilder desactivateTasksBuilder = new StringBuilder();
public ReferentialSynchronizeSqlsRequest build() {
return new ReferentialSynchronizeSqlsRequest(addTasksBuilder.toString(),
+ addAssociationTasksBuilder.toString(),
updateTasksBuilder.toString(),
deleteTasksBuilder.toString(),
+ deleteAssociationTasksBuilder.toString(),
desactivateTasksBuilder.toString());
}
@@ -90,7 +108,11 @@ public class ReferentialSynchronizeSqlsRequest implements ObserveDto {
if (log.isInfoEnabled()) {
log.info("Add add sql: " + sql);
}
- addTasksBuilder.append(sql);
+ if (sql.startsWith("$$_INSERT")) {
+ addAssociationTasksBuilder.append(sql.substring(3));
+ } else {
+ addTasksBuilder.append(sql);
+ }
return this;
}
@@ -107,7 +129,11 @@ public class ReferentialSynchronizeSqlsRequest implements ObserveDto {
if (log.isInfoEnabled()) {
log.info("Add delete sql: " + sql);
}
- deleteTasksBuilder.append(sql);
+ if (sql.startsWith("$$_DELETE")) {
+ deleteAssociationTasksBuilder.append(sql.substring(3));
+ } else {
+ deleteTasksBuilder.append(sql);
+ }
return this;
}
=====================================
services/src/main/java/fr/ird/observe/services/service/data/NavigationService.java
=====================================
@@ -35,7 +35,7 @@ import io.ultreia.java4all.http.spi.Get;
*/
public interface NavigationService extends ObserveService {
- @Get
+ @Get(useMultiPartForm = true)
NavigationResult getNavigation(NavigationRequest request);
@Get
=====================================
services/src/main/java/fr/ird/observe/services/service/data/TripManagementService.java
=====================================
@@ -10,12 +10,12 @@ package fr.ird.observe.services.service.data;
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/gpl-3.0.html>.
@@ -39,16 +39,16 @@ public interface TripManagementService extends ObserveService {
@ReadDataPermission
@ReadReferentialPermission
- @Post(timeOut = 120)
+ @Post(timeOut = 120, useMultiPartForm = true)
ExportTripResult exportTrip(ExportTripRequest exportRequest);
@WriteDataPermission
- @Post(timeOut = 120)
+ @Post(timeOut = 120, useMultiPartForm = true)
@Write
DeleteTripResult deleteTrip(DeleteTripRequest request);
@WriteDataPermission
- @Post(timeOut = 120)
+ @Post(timeOut = 120, useMultiPartForm = true)
@Write
ImportTripResult importTrip(ImportTripRequest request);
=====================================
services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java
=====================================
@@ -25,6 +25,7 @@ package fr.ird.observe.services.service.referential;
import com.google.common.collect.ImmutableSet;
import fr.ird.observe.dto.IdDto;
import fr.ird.observe.dto.form.Form;
+import fr.ird.observe.dto.reference.DtoReference;
import fr.ird.observe.dto.reference.ReferentialDtoReference;
import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet;
import fr.ird.observe.dto.referential.ReferentialDto;
@@ -32,7 +33,6 @@ import fr.ird.observe.dto.referential.SpeciesDto;
import fr.ird.observe.dto.referential.SpeciesGroupDto;
import fr.ird.observe.dto.referential.seine.ObservedSystemReference;
import fr.ird.observe.dto.result.SaveResultDto;
-import org.nuiton.topia.persistence.script.TopiaSqlScript;
import fr.ird.observe.services.service.ObserveService;
import fr.ird.observe.services.spi.ReadDataPermission;
import fr.ird.observe.services.spi.ReadReferentialPermission;
@@ -44,6 +44,7 @@ import io.ultreia.java4all.http.spi.Delete;
import io.ultreia.java4all.http.spi.Get;
import io.ultreia.java4all.http.spi.Nullable;
import io.ultreia.java4all.http.spi.Post;
+import org.nuiton.topia.persistence.script.TopiaSqlScript;
import java.util.Date;
import java.util.List;
@@ -106,10 +107,10 @@ public interface ReferentialService extends ObserveService {
@Write
<E extends ReferentialDto> void replaceReference(Class<E> beanType, String idToReplace, String replaceId);
- @Get
+ @Post(useMultiPartForm = true)
@ReadReferentialPermission
@ReadDataPermission
- <R extends ReferentialDto> ImmutableSetDtoMap<ReferentialDtoReference> findAllUsages(R bean);
+ <R extends ReferentialDto> ImmutableSetDtoMap<DtoReference> findAllUsages(R bean);
@Get
@ReadReferentialPermission
@@ -123,12 +124,12 @@ public interface ReferentialService extends ObserveService {
@ReadReferentialPermission
@ReadDataPermission
- @Post
+ @Post(useMultiPartForm = true)
MissingReferentialResult computeMissingReferential(MissingReferentialRequest request);
@ReadReferentialPermission
@WriteDataPermission
- @Post
+ @Post(useMultiPartForm = true)
@Write
void insertMissingReferential(TopiaSqlScript sqlContent);
=====================================
services/src/main/java/fr/ird/observe/services/service/sql/SqlScriptProducerService.java
=====================================
@@ -22,9 +22,9 @@ package fr.ird.observe.services.service.sql;
* #L%
*/
-import org.nuiton.topia.persistence.script.TopiaSqlScript;
import fr.ird.observe.services.service.ObserveService;
import io.ultreia.java4all.http.spi.Get;
+import org.nuiton.topia.persistence.script.TopiaSqlScript;
/**
* Created on 31/12/15.
@@ -33,9 +33,9 @@ import io.ultreia.java4all.http.spi.Get;
*/
public interface SqlScriptProducerService extends ObserveService {
- @Get
+ @Get(useMultiPartForm = true)
TopiaSqlScript produceAddSqlScript(AddSqlScriptProducerRequest request);
- @Get
+ @Get(useMultiPartForm = true)
TopiaSqlScript produceDeleteSqlScript(DeleteSqlScriptProducerRequest request);
}
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/698d4026322bef0fdce6c34612…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/698d4026322bef0fdce6c34612…
You're receiving this email because of your account on gitlab.com.
1
0