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
- 7199 discussions
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
789e7d90 by Tony Chemit at 2021-02-04T11:01:18+01:00
Add fixtures
- - - - -
7eb0507f by Tony Chemit at 2021-02-04T11:01:18+01:00
Extract local test module
- - - - -
2ff6a061 by Tony Chemit at 2021-02-04T11:01:18+01:00
Extract client test module
- - - - -
cb9c10c9 by Tony Chemit at 2021-02-04T11:01:18+01:00
Avoid collision in tests directories
- - - - -
5687ce94 by Tony Chemit at 2021-02-04T11:01:18+01:00
update http lib (with new test generator API)
- - - - -
6c2ab4f5 by Tony Chemit at 2021-02-04T11:01:18+01:00
Fix Rest client tests (evil internal states in class test rule).
- - - - -
ea7adbc0 by Tony Chemit at 2021-02-04T11:01:18+01:00
update http lib (with new test generator API)
- - - - -
e18fb4b4 by Tony Chemit at 2021-02-04T11:01:18+01:00
Add basic test for all data services \o/ - just need now to fill the fixture ids (and find a way to generate missing data between db versions...)
- - - - -
172a115b by Tony Chemit at 2021-02-04T11:09:52+01:00
Add fixtures
- - - - -
06e8e11a by Tony Chemit at 2021-02-06T01:59:32+01:00
Review Fixtures ids
- - - - -
99bf4d9b by Tony Chemit at 2021-02-06T01:59:32+01:00
Add fixtures
- - - - -
1bda8e6f by Tony Chemit at 2021-02-06T01:59:32+01:00
Add more logs in tests
- - - - -
2744acdd by Tony Chemit at 2021-02-06T01:59:32+01:00
Problème de persistence de trois relations - See #1776
- - - - -
0e0c5444 by Tony Chemit at 2021-02-06T01:59:32+01:00
Comment local impl tests (need to make them works again) - See #795
- - - - -
960729f9 by Tony Chemit at 2021-02-06T02:43:46+01:00
update pom
- - - - -
10 changed files:
- client/runner/src/test/java/fr/ird/observe/client/ObserveTextGeneratorTest.java
- models/persistence/definition/src/main/models/Observe/persistence/attribute/unique.properties
- models/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/observation/ActivityImpl.java
- models/persistence/java/src/test/java/fr/ird/observe/entities/spi/AssociationsTest.java
- models/persistence/java/src/test/java/fr/ird/observe/entities/spi/DeleteTest.java
- models/persistence/java/src/test/java/fr/ird/observe/entities/spi/EntitySqlDescriptorTest.java
- models/persistence/java/src/test/java/fr/ird/observe/entities/spi/ReplicateTest.java
- models/persistence/java/src/test/java/fr/ird/observe/entities/spi/TablesTest.java
- models/persistence/migration/pom.xml
- models/persistence/migration/src/main/resources/db/migration/8.0/observe_finalize-schema-H2.sql
The diff was not included because it is too large.
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ce46b4777b3d1f4a7a67dc42…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ce46b4777b3d1f4a7a67dc42…
You're receiving this email because of your account on gitlab.com.
1
0
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
527ef8cd by Tony Chemit at 2021-02-02T15:26:40+01:00
Add fixtures
- - - - -
cd4c04fb by Tony Chemit at 2021-02-03T09:02:23+01:00
Extract local test module
- - - - -
ce46b477 by Tony Chemit at 2021-02-03T09:02:31+01:00
Extract client test module
- - - - -
30 changed files:
- pom.xml
- services/api-test/pom.xml
- services/api-test/src/main/java/fr/ird/observe/services/ObserveServiceFixtures.java → services/api-test/src/main/java/fr/ird/observe/services/service/ObserveServiceFixtures.java
- services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/observation/SetCatchServiceFixtures.java
- services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/observation/SetDetailCompositionServiceFixtures.java
- services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/observation/SetTdrServiceFixtures.java
- services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/common/TripServiceFixtures.java
- services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/observation/DiscardedTargetSampleServiceFixtures.java
- services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/observation/FloatingObjectServiceFixtures.java
- services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/observation/KeptTargetSampleServiceFixtures.java
- services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/observation/NonTargetSampleServiceFixtures.java
- services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/observation/RouteServiceFixtures.java
- services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/observation/SetNonTargetCatchReleaseServiceFixtures.java
- services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/observation/SetServiceFixtures.java
- + services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/DataSourceService.properties
- + services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/DataSourceServiceFixtures.properties
- + services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/LastUpdateDateService.properties
- + services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/LastUpdateDateServiceFixtures.properties
- + services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/PingService.properties
- + services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/PingServiceFixtures.properties
- + services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/ReferenceService.properties
- + services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/ReferenceServiceFixtures.properties
- + services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/actions/report/ReportService.properties
- + services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/actions/report/ReportServiceFixtures.properties
- + services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.properties
- + services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceFixtures.properties
- + services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeService.properties
- + services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceFixtures.properties
- + services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/actions/validate/ValidateService.properties
- + services/api-test/src/main/resources/fixtures/fr/ird/observe/services/service/actions/validate/ValidateServiceFixtures.properties
The diff was not included because it is too large.
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/22e143a63a9a4ccfaf45adda…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/22e143a63a9a4ccfaf45adda…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] Use last http plugin (with test generators) - Closes #795
by Tony CHEMIT 01 Feb '21
by Tony CHEMIT 01 Feb '21
01 Feb '21
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
22e143a6 by Tony Chemit at 2021-02-01T17:35:09+01:00
Use last http plugin (with test generators) - Closes #795
- - - - -
2 changed files:
- pom.xml
- services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/common/TripServiceFixtures.java
Changes:
=====================================
pom.xml
=====================================
@@ -152,7 +152,7 @@
<!--can't use 1.4.197 (date has changed + blob also)-->
<lib.version.h2>1.4.196</lib.version.h2>
<lib.version.nuiton.utils>3.0</lib.version.nuiton.utils>
- <lib.version.java4all.http>1.0.26-SNAPSHOT</lib.version.java4all.http>
+ <lib.version.java4all.http>1.0.26</lib.version.java4all.http>
<!--lib.version.java4all.topia>1.40</lib.version.java4all.topia-->
<!-- <lib.version.java4all.eugene>3.0-alpha-38</lib.version.java4all.eugene>-->
=====================================
services/api-test/src/main/java/fr/ird/observe/services/service/data/ps/common/TripServiceFixtures.java
=====================================
@@ -84,8 +84,9 @@ public class TripServiceFixtures extends GeneratedTripServiceFixtures {
@Override
public void loadDto(TripService service) {
- //TODO
- }
+ TripDto dto = service.loadDto(ObserveFixtures.TRIP_SEINE_ID_1);
+ Assert.assertNotNull(dto);
+ Assert.assertEquals(ObserveFixtures.TRIP_SEINE_ID_1, dto.getId()); }
@Override
public void loadForm(TripService service) {
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/22e143a63a9a4ccfaf45adda0…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/22e143a63a9a4ccfaf45adda0…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] 4 commits: Adapt client impl tests - See #795
by Tony CHEMIT 01 Feb '21
by Tony CHEMIT 01 Feb '21
01 Feb '21
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
de6ec7c7 by Tony Chemit at 2021-02-01T15:59:58+01:00
Adapt client impl tests - See #795
- - - - -
6c07a8ea by Tony Chemit at 2021-02-01T16:01:28+01:00
Generate client impl tests - See #795
- - - - -
c294fa90 by Tony Chemit at 2021-02-01T16:49:47+01:00
POC on on service - See #795
- - - - -
f7db5507 by Tony Chemit at 2021-02-01T17:29:37+01:00
Replace nuiton-utils by java-util
- - - - -
30 changed files:
- client/configuration/pom.xml
- client/configuration/src/main/java/fr/ird/observe/client/ObserveClientResourceManager.java
- client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java
- client/core/pom.xml
- client/core/src/main/java/fr/ird/observe/client/datasource/h2/backup/LocalDatabaseBackupTaskSupport.java
- client/datasource/actions/pom.xml
- client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/AdminTabUIActionSupport.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/RunObserveListener.java
- client/datasource/editor/ll/pom.xml
- client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SampleUIModelStates.java
- client/datasource/editor/ps/pom.xml
- client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/RouteCloseCallback.java
- client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIModelStates.java
- client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetUIHandler.java
- models/dto/java/src/main/java/fr/ird/observe/dto/data/ActivityAware.java
- models/dto/java/src/main/java/fr/ird/observe/dto/data/ll/common/TripDto.java
- models/dto/java/src/main/java/fr/ird/observe/dto/data/ll/logbook/ActivityDto.java
- models/dto/java/src/main/java/fr/ird/observe/dto/data/ll/logbook/SampleDto.java
- models/dto/java/src/main/java/fr/ird/observe/dto/data/ll/observation/ActivityDto.java
- models/dto/java/src/main/java/fr/ird/observe/dto/data/ps/common/TripDto.java
- models/dto/java/src/main/java/fr/ird/observe/dto/data/ps/consolidate/dcp/SimplifiedObjectTypeSpecializedRules.java
- models/dto/java/src/main/java/fr/ird/observe/dto/data/ps/observation/ActivityStubDto.java
- models/dto/java/src/main/java/fr/ird/observe/dto/data/ps/observation/RouteDto.java
- models/dto/java/src/main/java/fr/ird/observe/dto/data/ps/observation/SetDto.java
- models/dto/java/src/main/java/fr/ird/observe/dto/data/ps/observation/TargetLengthDto.java
- models/persistence/java/pom.xml
- models/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripImpl.java
- models/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripImpl.java
- models/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripTopiaDao.java
- models/persistence/java/src/test/java/fr/ird/observe/entities/referential/common/LengthWeightParametersTest.java
The diff was not included because it is too large.
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3c1cf0ec2340ec10d3d7e202…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3c1cf0ec2340ec10d3d7e202…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] 3 commits: Introduce services-api-test module (with generated service test api) - See #795
by Tony CHEMIT 01 Feb '21
by Tony CHEMIT 01 Feb '21
01 Feb '21
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
dd7be294 by Tony Chemit at 2021-02-01T12:31:22+01:00
Introduce services-api-test module (with generated service test api) - See #795
- - - - -
9542e35f by Tony Chemit at 2021-02-01T13:35:22+01:00
Adapt local impl tests - See #795
- - - - -
3c1cf0ec by Tony Chemit at 2021-02-01T13:39:46+01:00
Generate local impl tests - See #795
- - - - -
30 changed files:
- services/api-test/pom.xml
- + services/api-test/src/main/java/fr/ird/observe/services/ObserveServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/DataSourceServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/LastUpdateDateServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/PingServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/ReferenceServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/actions/report/ReportServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/data/DataFileServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/data/NavigationServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/data/TripManagementServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/ActivityPairingServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/common/TripGearUseFeaturesServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/common/TripServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/landing/LandingServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/logbook/ActivitySampleServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/logbook/ActivityServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/logbook/SampleServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/logbook/SetCatchServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/logbook/SetGlobalCompositionServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/logbook/SetServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/observation/ActivityEncounterServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/observation/ActivitySensorUsedServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/observation/ActivityServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/observation/BranchlineServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/observation/SetCatchServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/observation/SetDetailCompositionServiceFixtures.java
- + services/api-test/src/main/java/fr/ird/observe/services/service/data/ll/observation/SetGlobalCompositionServiceFixtures.java
The diff was not included because it is too large.
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a6b34bfe52f2f35b7901dfa4…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a6b34bfe52f2f35b7901dfa4…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] 2 commits: Generate local impl tests - See #795
by Tony CHEMIT 01 Feb '21
by Tony CHEMIT 01 Feb '21
01 Feb '21
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
deafdbe8 by Tony Chemit at 2021-02-01T11:38:50+01:00
Generate local impl tests - See #795
- - - - -
a6b34bfe by Tony Chemit at 2021-02-01T11:38:50+01:00
Generate client impl tests - See #795
- - - - -
30 changed files:
- services/client-impl/pom.xml
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/LastUpdateDateServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/ReferenceServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/actions/report/ReportServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/DataFileServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/NavigationServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/TripManagementServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/ActivityPairingServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/common/TripGearUseFeaturesServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/common/TripServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/landing/LandingServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/logbook/ActivitySampleServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/logbook/ActivityServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/logbook/SampleServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/logbook/SetCatchServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/logbook/SetGlobalCompositionServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/logbook/SetServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/observation/ActivityEncounterServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/observation/ActivitySensorUsedServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/observation/ActivityServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/observation/BranchlineServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/observation/SetCatchServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/observation/SetDetailCompositionServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/observation/SetGlobalCompositionServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/observation/SetServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/observation/SetTdrServiceClientTest.java
- services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ps/common/TripServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ps/observation/ActivityServiceClientTest.java
The diff was not included because it is too large.
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/852a7a496a9403865136f60d…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/852a7a496a9403865136f60d…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] 3 commits: Introduce services-api-test module (with generated service test api) - See #795
by Tony CHEMIT 01 Feb '21
by Tony CHEMIT 01 Feb '21
01 Feb '21
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
f91f14b9 by Tony Chemit at 2021-02-01T11:27:42+01:00
Introduce services-api-test module (with generated service test api) - See #795
- - - - -
2a4071b0 by Tony Chemit at 2021-02-01T11:28:11+01:00
Generate local impl tests - See #795
- - - - -
852a7a49 by Tony Chemit at 2021-02-01T11:28:18+01:00
Generate client impl tests - See #795
- - - - -
30 changed files:
- pom.xml
- + services/api-test/.mvn/pom.gitflow.develop
- + services/api-test/.mvn/pom.gitflow.master
- + services/api-test/.mvn/pom.organizationId
- + services/api-test/.mvn/pom.projectId
- + services/api-test/.mvn/pom.stageId
- + services/api-test/LICENSE.txt
- + services/api-test/README.md
- + services/api-test/pom.xml
- + services/api-test/src/license/THIRD-PARTY.properties
- services/client-impl/pom.xml
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/LastUpdateDateServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/ReferenceServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/actions/report/ReportServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/DataFileServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/NavigationServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/TripManagementServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/ActivityPairingServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/common/TripGearUseFeaturesServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/common/TripServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/landing/LandingServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/logbook/ActivitySampleServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/logbook/ActivityServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/logbook/SampleServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/logbook/SetCatchServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/logbook/SetGlobalCompositionServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/logbook/SetServiceClientTest.java
- + services/client-impl/src/test/java/fr/ird/observe/services/client/service/data/ll/observation/ActivityEncounterServiceClientTest.java
The diff was not included because it is too large.
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f3523feb98d5fb7dfeef4dc2…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f3523feb98d5fb7dfeef4dc2…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] 2 commits: Rename FloatingObjectService method to avoid method name collision (used for api-test to come)
by Tony CHEMIT 31 Jan '21
by Tony CHEMIT 31 Jan '21
31 Jan '21
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
359637ac by Tony Chemit at 2021-01-31T14:02:16+01:00
Rename FloatingObjectService method to avoid method name collision (used for api-test to come)
- - - - -
f3523feb by Tony Chemit at 2021-01-31T14:04:06+01:00
Introduce services-api-test module (with generated service test api)
- - - - -
15 changed files:
- client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUIModel.java
- pom.xml
- server/core/src/main/filtered-resources/mapping
- + services/api-test/.mvn/pom.gitflow.develop
- + services/api-test/.mvn/pom.gitflow.master
- + services/api-test/.mvn/pom.organizationId
- + services/api-test/.mvn/pom.projectId
- + services/api-test/.mvn/pom.stageId
- + services/api-test/LICENSE.txt
- + services/api-test/README.md
- + services/api-test/pom.xml
- + services/api-test/src/license/THIRD-PARTY.properties
- services/api/src/main/java/fr/ird/observe/services/service/data/ps/observation/FloatingObjectService.java
- services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/FloatingObjectServiceLocalSupport.java
- services/pom.xml
Changes:
=====================================
client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUIModel.java
=====================================
@@ -107,7 +107,7 @@ public class FloatingObjectUIModel extends GeneratedFloatingObjectUIModel implem
@Override
public Form<FloatingObjectDto> preCreateForm(ObserveServicesProvider servicesProvider, String parentId) {
- return servicesProvider.getPsObservationFloatingObjectService().preCreate(parentId, getStates().getReference().orElse(null));
+ return servicesProvider.getPsObservationFloatingObjectService().preCreate2(parentId, getStates().getReference().orElse(null));
}
private FloatingObjectPreset chooseFloatingObjectPreset() {
=====================================
pom.xml
=====================================
@@ -152,6 +152,7 @@
<!--can't use 1.4.197 (date has changed + blob also)-->
<lib.version.h2>1.4.196</lib.version.h2>
<lib.version.nuiton.utils>3.0</lib.version.nuiton.utils>
+ <lib.version.java4all.http>1.0.26-SNAPSHOT</lib.version.java4all.http>
<!--lib.version.java4all.topia>1.40</lib.version.java4all.topia-->
<!-- <lib.version.java4all.eugene>3.0-alpha-38</lib.version.java4all.eugene>-->
@@ -162,7 +163,6 @@
<!--<lib.version.java4all.config>1.0.8-SNAPSHOT</lib.version.java4all.config>-->
<!--<lib.version.nuiton.topia>3.4.2-SNAPSHOT</lib.version.nuiton.topia>-->
<!-- <lib.version.java4all.java-bean>0.1.4-SNAPSHOT</lib.version.java4all.java-bean>-->
- <!-- <lib.version.java4all.http>1.0.25</lib.version.java4all.http>-->
<!-- license header configuration -->
<license.licenseName>gpl_v3</license.licenseName>
=====================================
server/core/src/main/filtered-resources/mapping
=====================================
@@ -246,7 +246,7 @@ GET /api/v1/data/ps/observation/FloatingObjectService/loadDto
GET /api/v1/data/ps/observation/FloatingObjectService/loadForm v1.data.ps.observation.FloatingObjectServiceRestApi.loadForm
GET /api/v1/data/ps/observation/FloatingObjectService/loadReferenceToRead v1.data.ps.observation.FloatingObjectServiceRestApi.loadReferenceToRead
GET /api/v1/data/ps/observation/FloatingObjectService/preCreate v1.data.ps.observation.FloatingObjectServiceRestApi.preCreate
-GET /api/v1/data/ps/observation/FloatingObjectService/preCreate v1.data.ps.observation.FloatingObjectServiceRestApi.preCreate
+GET /api/v1/data/ps/observation/FloatingObjectService/preCreate2 v1.data.ps.observation.FloatingObjectServiceRestApi.preCreate2
POST /api/v1/data/ps/observation/FloatingObjectService/save v1.data.ps.observation.FloatingObjectServiceRestApi.save
GET /api/v1/data/ps/observation/KeptTargetSampleService/loadForm v1.data.ps.observation.KeptTargetSampleServiceRestApi.loadForm
POST /api/v1/data/ps/observation/KeptTargetSampleService/save v1.data.ps.observation.KeptTargetSampleServiceRestApi.save
=====================================
services/api-test/.mvn/pom.gitflow.develop
=====================================
@@ -0,0 +1 @@
+develop
\ No newline at end of file
=====================================
services/api-test/.mvn/pom.gitflow.master
=====================================
@@ -0,0 +1 @@
+master
\ No newline at end of file
=====================================
services/api-test/.mvn/pom.organizationId
=====================================
@@ -0,0 +1 @@
+ultreiaio
\ No newline at end of file
=====================================
services/api-test/.mvn/pom.projectId
=====================================
@@ -0,0 +1 @@
+ird-observe
\ No newline at end of file
=====================================
services/api-test/.mvn/pom.stageId
=====================================
@@ -0,0 +1 @@
+frirdobserve
\ No newline at end of file
=====================================
services/api-test/LICENSE.txt
=====================================
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
=====================================
services/api-test/README.md
=====================================
=====================================
services/api-test/pom.xml
=====================================
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>fr.ird.observe</groupId>
+ <artifactId>services</artifactId>
+ <version>8.0.5-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>services-api-test</artifactId>
+
+ <name>ObServe Services :: API Test</name>
+ <description>ObServe services API test module</description>
+
+ <properties>
+ <http.service.package.prefix>fr.ird.observe.services.service.data</http.service.package.prefix>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>services-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>fr.ird.observe</groupId>
+ <artifactId>toolkit-service</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>io.ultreia.java4all.http</groupId>
+ <artifactId>http-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-generate-api-test</id>
+ <goals>
+ <goal>generate-api-test</goal>
+ </goals>
+ <configuration>
+ <packageName>fr.ird.observe.services</packageName>
+ <serviceType>fr.ird.observe.services.service.ObserveService</serviceType>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>fr.ird.observe</groupId>
+ <artifactId>toolkit-service</artifactId>
+ <version>${toolkit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>fr.ird.observe</groupId>
+ <artifactId>toolkit-validation</artifactId>
+ <version>${toolkit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>models-dto-java</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>services-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+</project>
=====================================
services/api-test/src/license/THIRD-PARTY.properties
=====================================
@@ -0,0 +1,39 @@
+# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
+#-------------------------------------------------------------------------------
+# Already used licenses in project :
+# - Apache 2.0
+# - Apache License 2.0
+# - Apache License, version 2.0
+# - BSD 3-clause New License
+# - BSD License
+# - CDDL 1.1
+# - CDDL+GPL License
+# - CDDL/GPLv2+CE
+# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+# - Common Development and Distribution License
+# - Dual license consisting of the CDDL v1.1 and GPL v2
+# - Eclipse Distribution License v. 1.0
+# - Eclipse Public License 1.0
+# - Eclipse Public License v1.0
+# - GNU General Public License, Version 2 with the Classpath Exception
+# - GNU Library General Public License v2.1 or later
+# - GPL2 w/ CPE
+# - General Public License (GPL)
+# - Indiana University Extreme! Lab Software License, version 1.1.1
+# - Lesser General Public License (LGPL)
+# - Lesser General Public License (LGPL) v 3.0
+# - Lesser General Public License (LPGL)
+# - Lesser General Public License (LPGL) v 2.1
+# - MIT License
+# - MPL 1.1
+# - New BSD License
+# - The Apache Software License, Version 2.0
+# - The MIT License
+# - The PostgreSQL License
+#-------------------------------------------------------------------------------
+# Please fill the missing licenses for dependencies :
+#
+#
+#Wed Apr 10 14:49:43 CEST 2019
+commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0
+commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0
=====================================
services/api/src/main/java/fr/ird/observe/services/service/data/ps/observation/FloatingObjectService.java
=====================================
@@ -48,6 +48,6 @@ public interface FloatingObjectService extends GeneratedFloatingObjectService {
@Get
@MethodCredential(Permission.WRITE_DATA)
- Form<FloatingObjectDto> preCreate(String activityId, @Nullable FloatingObjectPreset floatingObjectPreset);
+ Form<FloatingObjectDto> preCreate2(String activityId, @Nullable FloatingObjectPreset floatingObjectPreset);
}
=====================================
services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/FloatingObjectServiceLocalSupport.java
=====================================
@@ -93,7 +93,7 @@ class FloatingObjectServiceLocalSupport extends EditableDataServiceLocalSupport<
}
@Override
- public Form<FloatingObjectDto> preCreate(String activityId, FloatingObjectPreset floatingObjectPreset) {
+ public Form<FloatingObjectDto> preCreate2(String activityId, FloatingObjectPreset floatingObjectPreset) {
Date now = now();
FloatingObject entity = newEntity();
if (floatingObjectPreset != null) {
=====================================
services/pom.xml
=====================================
@@ -36,6 +36,7 @@
<modules>
<module>api</module>
+ <module>api-test</module>
<module>provider</module>
<module>validation-spi</module>
<module>validation</module>
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b970af5366eede35bb48a3de…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b970af5366eede35bb48a3de…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] Sélection multiple de marées - Closes #1747
by Tony CHEMIT 31 Jan '21
by Tony CHEMIT 31 Jan '21
31 Jan '21
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
b970af53 by Tony Chemit at 2021-01-31T12:11:45+01:00
Sélection multiple de marées - Closes #1747
- - - - -
2 changed files:
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/SelectionTree.java
- client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/actions/SelectUnselect.java
Changes:
=====================================
client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/SelectionTree.java
=====================================
@@ -43,7 +43,7 @@ public class SelectionTree extends JXTree {
setCellRenderer(new SelectionTreeCellRenderer());
setRootVisible(false);
setRowHeight(30);
- getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
+ getSelectionModel().setSelectionMode(TreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION);
setMinimumSize(UIHelper.newMinDimension());
setToggleClickCount(100);
}
=====================================
client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/selection/actions/SelectUnselect.java
=====================================
@@ -32,6 +32,7 @@ import org.apache.logging.log4j.Logger;
import javax.swing.ActionMap;
import javax.swing.InputMap;
import javax.swing.KeyStroke;
+import javax.swing.tree.TreePath;
import java.awt.event.ActionEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
@@ -104,13 +105,16 @@ public class SelectUnselect extends SelectionTreePaneActionSupport {
}
protected void selectUnSelect(SelectionTree tree) {
- Object selectedRow = tree.getLastSelectedPathComponent();
- if (selectedRow == null) {
- return;
- }
+ TreePath[] selectionPath = tree.getSelectionPaths();
- SelectionTreeNodeSupport<?> node = (SelectionTreeNodeSupport<?>) selectedRow;
- tree.getTreeModel().setValueAt(node, !node.isSelected());
+ for (TreePath treePath : selectionPath) {
+ Object selectedRow = treePath.getLastPathComponent();
+ if (selectedRow == null) {
+ return;
+ }
+ SelectionTreeNodeSupport<?> node = (SelectionTreeNodeSupport<?>) selectedRow;
+ tree.getTreeModel().setValueAt(node, !node.isSelected());
+ }
}
public void setExcludeKeyStrokes(KeyStroke... keyStrokes) {
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b970af5366eede35bb48a3de3…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b970af5366eede35bb48a3de3…
You're receiving this email because of your account on gitlab.com.
1
0
[Git][ultreiaio/ird-observe][develop] Replace nuiton-validator by java4all validation
by Tony CHEMIT 31 Jan '21
by Tony CHEMIT 31 Jan '21
31 Jan '21
Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
7126cd18 by Tony Chemit at 2021-01-31T11:22:09+01:00
Replace nuiton-validator by java4all validation
Use next toolkit
- - - - -
27 changed files:
- client/core/pom.xml
- client/datasource/actions/pom.xml
- client/datasource/editor/api/pom.xml
- client/datasource/editor/common/pom.xml
- client/datasource/editor/ll/pom.xml
- client/datasource/editor/ps/pom.xml
- client/runner/pom.xml
- pom.xml
- services/client-impl/pom.xml
- services/local-impl/pom.xml
- services/validation-spi/pom.xml
- services/validation-spi/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java
- services/validation-spi/src/main/java/fr/ird/observe/validation/validators/ActivityEndOfSearchingExistsDtoValidator.java
- services/validation-spi/src/main/java/fr/ird/observe/validation/validators/ActivitySeineObservedSystemValidator.java
- services/validation-spi/src/main/java/fr/ird/observe/validation/validators/ActivitySimpleSpeedDtoValidator.java
- services/validation-spi/src/main/java/fr/ird/observe/validation/validators/ActivitySpeedDtoValidator.java
- services/validation-spi/src/main/java/fr/ird/observe/validation/validators/NonTargetCatchObservedSystemValidator.java
- services/validation-spi/src/main/java/fr/ird/observe/validation/validators/ObserveLengthFormulaCollectionUniqueKeyDtoValidator.java
- services/validation-spi/src/main/java/fr/ird/observe/validation/validators/OpenableDtoFieldValidator.java
- services/validation-spi/src/main/java/fr/ird/observe/validation/validators/SampleLonglineLogbookSpeciesDtoValidator.java
- services/validation-spi/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueHomeIdDtoValidator.java
- services/validation-spi/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueNumberDtoValidator.java
- services/validation-spi/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueHomeIdDtoValidator.java
- services/validation-spi/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueNumberDtoValidator.java
- services/validation-spi/src/main/java/fr/ird/observe/validation/validators/TripVesselDtoValidator.java
- services/validation/pom.xml
- services/validation/src/main/resources/validators.xml
Changes:
=====================================
client/core/pom.xml
=====================================
@@ -54,12 +54,6 @@
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
- <!-- <dependency>-->
- <!-- <groupId>${project.groupId}</groupId>-->
- <!-- <artifactId>models-persistence-java</artifactId>-->
- <!-- <version>${project.version}</version>-->
- <!-- <scope>runtime</scope>-->
- <!-- </dependency>-->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>services-api</artifactId>
@@ -114,6 +108,11 @@
<dependency>
<groupId>fr.ird.observe</groupId>
<artifactId>toolkit-validation</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.ultreia.java4all</groupId>
+ <artifactId>validation-api</artifactId>
</dependency>
<dependency>
=====================================
client/datasource/actions/pom.xml
=====================================
@@ -88,11 +88,16 @@
</dependency>
<dependency>
<groupId>fr.ird.observe</groupId>
- <artifactId>toolkit-validation</artifactId>
+ <artifactId>toolkit-service</artifactId>
</dependency>
<dependency>
<groupId>fr.ird.observe</groupId>
- <artifactId>toolkit-service</artifactId>
+ <artifactId>toolkit-validation</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.ultreia.java4all</groupId>
+ <artifactId>validation-api</artifactId>
</dependency>
<dependency>
<groupId>io.ultreia.java4all.topia</groupId>
=====================================
client/datasource/editor/api/pom.xml
=====================================
@@ -93,6 +93,11 @@
<dependency>
<groupId>fr.ird.observe</groupId>
<artifactId>toolkit-validation</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.ultreia.java4all</groupId>
+ <artifactId>validation-api</artifactId>
</dependency>
<dependency>
=====================================
client/datasource/editor/common/pom.xml
=====================================
@@ -86,6 +86,11 @@
<dependency>
<groupId>fr.ird.observe</groupId>
<artifactId>toolkit-validation</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.ultreia.java4all</groupId>
+ <artifactId>validation-api</artifactId>
</dependency>
<dependency>
=====================================
client/datasource/editor/ll/pom.xml
=====================================
@@ -108,11 +108,16 @@
</dependency>
<dependency>
<groupId>fr.ird.observe</groupId>
- <artifactId>toolkit-validation</artifactId>
+ <artifactId>toolkit-service</artifactId>
</dependency>
<dependency>
<groupId>fr.ird.observe</groupId>
- <artifactId>toolkit-service</artifactId>
+ <artifactId>toolkit-validation</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.ultreia.java4all</groupId>
+ <artifactId>validation-api</artifactId>
</dependency>
<dependency>
<groupId>io.ultreia.java4all</groupId>
=====================================
client/datasource/editor/ps/pom.xml
=====================================
@@ -112,13 +112,17 @@
</dependency>
<dependency>
<groupId>fr.ird.observe</groupId>
- <artifactId>toolkit-validation</artifactId>
+ <artifactId>toolkit-service</artifactId>
</dependency>
<dependency>
<groupId>fr.ird.observe</groupId>
- <artifactId>toolkit-service</artifactId>
+ <artifactId>toolkit-validation</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.ultreia.java4all</groupId>
+ <artifactId>validation-api</artifactId>
</dependency>
-
<dependency>
<groupId>io.ultreia.java4all</groupId>
<artifactId>java-util</artifactId>
=====================================
client/runner/pom.xml
=====================================
@@ -131,11 +131,16 @@
</dependency>
<dependency>
<groupId>fr.ird.observe</groupId>
- <artifactId>toolkit-validation</artifactId>
+ <artifactId>toolkit-service</artifactId>
</dependency>
<dependency>
<groupId>fr.ird.observe</groupId>
- <artifactId>toolkit-service</artifactId>
+ <artifactId>toolkit-validation</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.ultreia.java4all</groupId>
+ <artifactId>validation-api</artifactId>
</dependency>
<dependency>
<groupId>io.ultreia.java4all.topia</groupId>
=====================================
pom.xml
=====================================
@@ -24,7 +24,7 @@
<parent>
<groupId>io.ultreia.maven</groupId>
<artifactId>pom</artifactId>
- <version>2021.4</version>
+ <version>2021.6</version>
</parent>
<groupId>fr.ird.observe</groupId>
@@ -146,10 +146,9 @@
<maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
<buildDate>${maven.build.timestamp}</buildDate>
- <toolkit.version>5.0.0</toolkit.version>
+ <toolkit.version>5.0.1-SNAPSHOT</toolkit.version>
<lib.version.ognl>3.1.28</lib.version.ognl>
- <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>
<!--can't use 1.4.197 (date has changed + blob also)-->
<lib.version.h2>1.4.196</lib.version.h2>
<lib.version.nuiton.utils>3.0</lib.version.nuiton.utils>
@@ -232,25 +231,6 @@
<groupId>fr.ird.observe</groupId>
<artifactId>toolkit-validation</artifactId>
<version>${toolkit.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.nuiton</groupId>
- <artifactId>nuiton-validator</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>fr.ird.observe</groupId>
- <artifactId>toolkit-validation</artifactId>
- <version>${toolkit.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.nuiton</groupId>
- <artifactId>nuiton-validator</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -264,51 +244,6 @@
<version>${toolkit.version}</version>
</dependency>
- <dependency>
- <groupId>io.ultreia.java4all.jaxx</groupId>
- <artifactId>jaxx-validator</artifactId>
- <version>${lib.version.java4all.jaxx}</version>
- <exclusions>
- <exclusion>
- <groupId>org.nuiton</groupId>
- <artifactId>nuiton-validator</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>io.ultreia.java4all.jaxx</groupId>
- <artifactId>jaxx-widgets-gis</artifactId>
- <version>${lib.version.java4all.jaxx}</version>
- <exclusions>
- <exclusion>
- <groupId>org.nuiton</groupId>
- <artifactId>nuiton-validator</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>io.ultreia.java4all.jaxx</groupId>
- <artifactId>jaxx-widgets-temperature</artifactId>
- <version>${lib.version.java4all.jaxx}</version>
- <exclusions>
- <exclusion>
- <groupId>org.nuiton</groupId>
- <artifactId>nuiton-validator</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>io.ultreia.java4all.jaxx</groupId>
- <artifactId>jaxx-widgets-datetime</artifactId>
- <version>${lib.version.java4all.jaxx}</version>
- <exclusions>
- <exclusion>
- <groupId>org.nuiton</groupId>
- <artifactId>nuiton-validator</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<dependency>
<groupId>org.nuiton.topia</groupId>
<artifactId>topia-persistence</artifactId>
=====================================
services/client-impl/pom.xml
=====================================
@@ -49,6 +49,11 @@
<artifactId>services-validation-spi</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.ultreia.java4all</groupId>
+ <artifactId>validation-api</artifactId>
+ </dependency>
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>test</artifactId>
=====================================
services/local-impl/pom.xml
=====================================
@@ -184,6 +184,11 @@
<artifactId>xwork-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.ultreia.java4all</groupId>
+ <artifactId>validation-api</artifactId>
+ </dependency>
+
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
=====================================
services/validation-spi/pom.xml
=====================================
@@ -97,7 +97,14 @@
<groupId>org.apache.struts.xwork</groupId>
<artifactId>xwork-core</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>io.ultreia.java4all</groupId>
+ <artifactId>validation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.ultreia.java4all.jaxx</groupId>
+ <artifactId>jaxx-validator</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
=====================================
services/validation-spi/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java
=====================================
@@ -27,13 +27,14 @@ import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport;
import fr.ird.observe.dto.referential.common.SpeciesDto;
import fr.ird.observe.dto.referential.common.SpeciesReference;
import io.ultreia.java4all.lang.Numbers;
+import org.nuiton.jaxx.validator.ValidatorUtil;
import java.util.Objects;
/**
* <!-- START SNIPPET: javadoc -->
- * Ce validateur verifie qu'une espece respece bien les tailles ou
- * les poids définis par les bornes de l'espece :
+ * Ce validateur vérifie qu'une espèce est bien les tailles ou
+ * les poids définis par les bornes de l'espèce :
* <ul>
* <li>minLength</li>
* <li>maxLength</li>
@@ -41,8 +42,8 @@ import java.util.Objects;
* <li>maxWeight</li>
* </ul>
* <p>
- * Lorsqu'il s'agit d'une espece faune, si aucune borne n'est trouvée, alors
- * on se base sur les bornes définis dans son groupe d'espece (si il est défini).
+ * Lorsqu'il s'agit d'une espèce faune, si aucune borne n'est trouvée, alors
+ * on se base sur les bornes définis dans son groupe d'espèce (si il est défini).
* <p>
* Le paramètre {@link #ratio} permet de spécifier une marge à appliquer sur
* les bornes, il s'agit d'un pourcentage décimal.
=====================================
services/validation-spi/src/main/java/fr/ird/observe/validation/validators/ActivityEndOfSearchingExistsDtoValidator.java
=====================================
@@ -31,7 +31,7 @@ import org.apache.logging.log4j.Logger;
/**
* <!-- START SNIPPET: javadoc --> VesselActivityFieldValidator vérifie que
- * l'activity vessel d'une activité est cohérente. <!-- END SNIPPET: javadoc
+ * l'activité vessel d'une activité est cohérente. <!-- END SNIPPET: javadoc
* -->
* <p>
* <p>
@@ -95,7 +95,7 @@ public class ActivityEndOfSearchingExistsDtoValidator extends FieldValidatorSupp
public void validate(Object object) throws ValidationException {
if (required == null) {
- throw new ValidationException("le parametre required est obligatoire");
+ throw new ValidationException("le paramètre required est obligatoire");
}
if (object == null) {
@@ -106,8 +106,8 @@ public class ActivityEndOfSearchingExistsDtoValidator extends FieldValidatorSupp
if (object instanceof RouteDto) {
- // on verifie qu'il existe bien une activity de fin de veille
- // parmi les activitys de la route
+ // on vérifie qu'il existe bien une activity de fin de veille
+ // parmi les activités de la route
RouteDto route = (RouteDto) object;
@@ -117,17 +117,17 @@ public class ActivityEndOfSearchingExistsDtoValidator extends FieldValidatorSupp
if (object instanceof ActivityDto) {
- // on verifie qu'il n'existe pas d'activity de fin de veille
+ // on vérifie qu'il n'existe pas d'activité de fin de veille
ActivityDto activitySeine = (ActivityDto) object;
if (!activitySeine.isActivityEndOfSearching()) {
- // rien a valider (on est pas sur une activity de fin de veille
+ // rien a valider (on est pas sur une activité de fin de veille
return;
}
- // l'activity est une activite de fin de veille
+ // l'activité est une activité de fin de veille
// on doit vérifier qu'il n'existe pas déjà une autre activité de
// fin de veille
@@ -144,7 +144,7 @@ public class ActivityEndOfSearchingExistsDtoValidator extends FieldValidatorSupp
private void checkAgainstRequired(RouteDto route, Object object) {
- log.debug(String.format("check [required : %s?] activity fin de veille sur la route %s:%ssur %d activity(s).",
+ log.debug(String.format("check [required : %s?] activity fin de veille sur la route %s:%s on %d activity(s).",
required, route.getId(), route.getDate(), route.getActivitySize()));
boolean detected = route.isActivityFindDeVeilleFound();
=====================================
services/validation-spi/src/main/java/fr/ird/observe/validation/validators/ActivitySeineObservedSystemValidator.java
=====================================
@@ -32,6 +32,7 @@ import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator;
import fr.ird.observe.dto.referential.common.SpeciesReference;
import fr.ird.observe.dto.referential.ps.observation.ObservedSystemReference;
import fr.ird.observe.dto.validation.SeineBycatchObservedSystemConfig;
+import org.nuiton.jaxx.validator.ValidatorUtil;
import java.util.Collection;
import java.util.LinkedHashSet;
@@ -62,7 +63,7 @@ public class ActivitySeineObservedSystemValidator extends FieldValidatorSupport
ActivityDto activitySeineDto = (ActivityDto) object;
if (!activitySeineDto.getNonTargetCatchSpecies().isEmpty()) {
- List<ObservedSystemReference> observedSystemReferences = (List<ObservedSystemReference>) getFieldValue("psObservationObservedSystems", object);
+ @SuppressWarnings("unchecked") List<ObservedSystemReference> observedSystemReferences = (List<ObservedSystemReference>) getFieldValue("psObservationObservedSystems", object);
ImmutableMap<String, ObservedSystemReference> map = Maps.uniqueIndex(observedSystemReferences, ObservedSystemReference::getId);
Collection<ObservedSystemReference> observedSystems = activitySeineDto.getObservedSystem();
SeineBycatchObservedSystemConfig seineBycatchObservedSystemConfig = (SeineBycatchObservedSystemConfig) getFieldValue("seineBycatchObservedSystemConfig", object);
=====================================
services/validation-spi/src/main/java/fr/ird/observe/validation/validators/ActivitySimpleSpeedDtoValidator.java
=====================================
@@ -31,6 +31,7 @@ import fr.ird.observe.dto.data.ps.observation.RouteDto;
import fr.ird.observe.dto.decoration.DecoratorService;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.nuiton.jaxx.validator.ValidatorUtil;
import java.util.Comparator;
import java.util.LinkedList;
@@ -87,7 +88,7 @@ public class ActivitySimpleSpeedDtoValidator extends FieldValidatorSupport {
* Construit un point à partir de l'entité donnée.
*
* @param route la route qui contient le jour
- * @param activity l'activite qui contient l'heure et la position géographique
+ * @param activity l'activité qui contient l'heure et la position géographique
* @return le nouveau point instancié
* @since 3.8
*/
@@ -99,7 +100,7 @@ public class ActivitySimpleSpeedDtoValidator extends FieldValidatorSupport {
* Construit un point à partir de l'entité donnée.
*
* @param route la route qui contient le jour
- * @param activity l'activite qui contient l'heure et la position géographique
+ * @param activity l'activité qui contient l'heure et la position géographique
* @return le nouveau point instancié
* @since 3.8
*/
=====================================
services/validation-spi/src/main/java/fr/ird/observe/validation/validators/ActivitySpeedDtoValidator.java
=====================================
@@ -30,6 +30,7 @@ import fr.ird.observe.dto.data.ps.observation.RouteDto;
import fr.ird.observe.dto.decoration.DecoratorService;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import org.nuiton.jaxx.validator.ValidatorUtil;
import org.nuiton.validator.xwork2.field.CollectionFieldExpressionValidator;
import static fr.ird.observe.validation.validators.ActivitySimpleSpeedDtoValidator.newPoint;
=====================================
services/validation-spi/src/main/java/fr/ird/observe/validation/validators/NonTargetCatchObservedSystemValidator.java
=====================================
@@ -32,6 +32,7 @@ import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator;
import fr.ird.observe.dto.referential.common.SpeciesReference;
import fr.ird.observe.dto.referential.ps.observation.ObservedSystemReference;
import fr.ird.observe.dto.validation.SeineBycatchObservedSystemConfig;
+import org.nuiton.jaxx.validator.ValidatorUtil;
import java.util.Collection;
import java.util.LinkedHashSet;
=====================================
services/validation-spi/src/main/java/fr/ird/observe/validation/validators/ObserveLengthFormulaCollectionUniqueKeyDtoValidator.java
=====================================
@@ -110,7 +110,7 @@ public class ObserveLengthFormulaCollectionUniqueKeyDtoValidator extends NuitonF
boolean answer = true;
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
Function<Object, WithStartEndDate> decoratorService = (Function) getFieldValue("referentialReferenceFunction", object);
WithStartEndDate referentialDtoReference = decoratorService.apply(object);
@@ -195,6 +195,7 @@ public class ObserveLengthFormulaCollectionUniqueKeyDtoValidator extends NuitonF
* property
* @throws ValidationException if any pb to retreave the collection
*/
+ @SuppressWarnings({"unchecked", "rawtypes"})
Collection<? super WithStartEndDate> getCollection(Object object) throws ValidationException {
String fieldName = getCollectionFieldName();
=====================================
services/validation-spi/src/main/java/fr/ird/observe/validation/validators/OpenableDtoFieldValidator.java
=====================================
@@ -34,8 +34,8 @@ import org.nuiton.decorator.Decorator;
import java.util.Collection;
/**
- * <!-- START SNIPPET: javadoc --> OpenableFieldValidator verifie qu'un
- * objet ou qu'une collection d'objet cloturable est bien
+ * <!-- START SNIPPET: javadoc --> OpenableFieldValidator vérifie qu'un
+ * objet ou qu'une collection d'objet éditable est bien
* fermée.
* <p>
* <!-- END SNIPPET: javadoc -->
@@ -74,6 +74,7 @@ public class OpenableDtoFieldValidator extends FieldValidatorSupport {
private String openValueAsString;
+ @SuppressWarnings("unused")
public String getOpenValueAsString() {
return openValueAsString;
}
@@ -99,12 +100,11 @@ public class OpenableDtoFieldValidator extends FieldValidatorSupport {
for (Object o : (Collection<?>) value) {
dataValue = (DataDto) o;
String id = dataValue.getId();
-
- result = (boolean) stack.findValue("!openDataManager.isOpen(\"" + dataValue.getId() + "\")");
+ result = (boolean) stack.findValue("!openDataManager.isOpen(\"" + id + "\")");
if (!result) {
// on objet ouvert a été trouvé
- // on peut arréter le parcours
+ // on peut arrêter le parcours
break;
}
}
@@ -133,7 +133,7 @@ public class OpenableDtoFieldValidator extends FieldValidatorSupport {
log.debug("decorator message " + openValueAsString);
}
try {
- // on a decouvert au moins un objet non fermé
+ // on a découvert au moins un objet non fermé
addFieldError(fieldName, dataValue);
} finally {
openValueAsString = null;
=====================================
services/validation-spi/src/main/java/fr/ird/observe/validation/validators/SampleLonglineLogbookSpeciesDtoValidator.java
=====================================
@@ -30,6 +30,7 @@ import fr.ird.observe.dto.data.ll.logbook.SamplePartDto;
import fr.ird.observe.dto.decoration.DecoratorService;
import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator;
import fr.ird.observe.dto.referential.common.SpeciesReference;
+import org.nuiton.jaxx.validator.ValidatorUtil;
import java.util.Collection;
import java.util.LinkedHashSet;
=====================================
services/validation-spi/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueHomeIdDtoValidator.java
=====================================
@@ -28,6 +28,7 @@ import fr.ird.observe.dto.data.ll.logbook.SetDto;
import fr.ird.observe.dto.data.ll.logbook.SetStubDto;
import fr.ird.observe.dto.decoration.DecoratorService;
import fr.ird.observe.dto.decoration.decorators.DataReferenceDecorator;
+import org.nuiton.jaxx.validator.ValidatorUtil;
import java.util.Objects;
import java.util.Optional;
=====================================
services/validation-spi/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueNumberDtoValidator.java
=====================================
@@ -28,6 +28,7 @@ import fr.ird.observe.dto.data.ll.logbook.SetDto;
import fr.ird.observe.dto.data.ll.logbook.SetStubDto;
import fr.ird.observe.dto.decoration.DecoratorService;
import fr.ird.observe.dto.decoration.decorators.DataReferenceDecorator;
+import org.nuiton.jaxx.validator.ValidatorUtil;
import java.util.Objects;
import java.util.Optional;
=====================================
services/validation-spi/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueHomeIdDtoValidator.java
=====================================
@@ -28,6 +28,7 @@ import fr.ird.observe.dto.data.ll.observation.SetDto;
import fr.ird.observe.dto.data.ll.observation.SetStubDto;
import fr.ird.observe.dto.decoration.DecoratorService;
import fr.ird.observe.dto.decoration.decorators.DataReferenceDecorator;
+import org.nuiton.jaxx.validator.ValidatorUtil;
import java.util.Objects;
import java.util.Optional;
=====================================
services/validation-spi/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueNumberDtoValidator.java
=====================================
@@ -28,6 +28,7 @@ import fr.ird.observe.dto.data.ll.observation.SetDto;
import fr.ird.observe.dto.data.ll.observation.SetStubDto;
import fr.ird.observe.dto.decoration.DecoratorService;
import fr.ird.observe.dto.decoration.decorators.DataReferenceDecorator;
+import org.nuiton.jaxx.validator.ValidatorUtil;
import java.util.Objects;
import java.util.Optional;
=====================================
services/validation-spi/src/main/java/fr/ird/observe/validation/validators/TripVesselDtoValidator.java
=====================================
@@ -70,7 +70,7 @@ public class TripVesselDtoValidator extends FieldValidatorSupport {
Date startDate = (Date) getFieldValue("startDate", object);
Date endDate = (Date) getFieldValue("endDate", object);
String id = (String) getFieldValue("id", object);
- if (id==null) {
+ if (id == null) {
// object not persisted, no ide, can't do the math
return;
}
@@ -79,7 +79,7 @@ public class TripVesselDtoValidator extends FieldValidatorSupport {
private void validate(Object object, String id, VesselReference vessel, Date startDate, Date endDate) throws ValidationException {
- TripAwareService tripService = (TripAwareService) Objects.requireNonNull(getFieldValue(serviceName, object), "Can't find " + serviceName);
+ TripAwareService<?> tripService = (TripAwareService<?>) Objects.requireNonNull(getFieldValue(serviceName, object), "Can't find " + serviceName);
Set<? extends TripAware> matchingTrips = tripService.getMatchingTripsVesselWithinDateRange(id,
vessel.getId(),
startDate,
=====================================
services/validation/pom.xml
=====================================
@@ -96,9 +96,13 @@
</dependency>
<dependency>
- <groupId>fr.ird.observe</groupId>
- <artifactId>toolkit-validation</artifactId>
- <classifier>tests</classifier>
+ <groupId>io.ultreia.java4all</groupId>
+ <artifactId>validation-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>io.ultreia.java4all</groupId>
+ <artifactId>validation-test</artifactId>
</dependency>
<dependency>
@@ -154,6 +158,17 @@
<artifactId>javassist</artifactId>
<version>${lib.version.javassist}</version>
</dependency>
+ <dependency>
+ <groupId>io.ultreia.java4all.jaxx</groupId>
+ <artifactId>jaxx-widgets-gis</artifactId>
+ <version>${lib.version.java4all.jaxx}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.ultreia.java4all.jaxx</groupId>
+ <artifactId>jaxx-widgets-temperature</artifactId>
+ <version>${lib.version.java4all.jaxx}</version>
+ </dependency>
+
</dependencies>
</plugin>
=====================================
services/validation/src/main/resources/validators.xml
=====================================
@@ -70,11 +70,11 @@
<validator name="checkDisabledReferentialOnWarningScope" class="fr.ird.observe.validation.validators.CheckDisabledReferentialOnWarningScopeFieldValidation"/>
<validator name="checkDisabledReferentialOnErrorScope" class="fr.ird.observe.validation.validators.CheckDisabledReferentialOnErrorScopeFieldValidation"/>
- <validator name="temperatureBound" class="fr.ird.observe.validation.validators.TemperatureBoundFieldValidator"/>
+ <validator name="temperatureBound" class="org.nuiton.jaxx.widgets.temperature.validators.TemperatureBoundFieldValidator"/>
<validator name="quadrantDto" class="fr.ird.observe.validation.validators.QuadrantFieldDtoValidator"/>
- <validator name="coordinateLatitudeDto" class="fr.ird.observe.validation.validators.CoordinateLatitudeDtoFieldValidator"/>
- <validator name="coordinateLongitudeDto" class="fr.ird.observe.validation.validators.CoordinateLongitudeDtoFieldValidator"/>
+ <validator name="coordinateLatitudeDto" class="org.nuiton.jaxx.widgets.gis.validators.CoordinateLatitudeDtoFieldValidator"/>
+ <validator name="coordinateLongitudeDto" class="org.nuiton.jaxx.widgets.gis.validators.CoordinateLongitudeDtoFieldValidator"/>
<!-- ObServe validators -->
<validator name="collectionUniqueKeyDto" class="fr.ird.observe.validation.validators.CollectionUniqueKeyDtoValidator"/>
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7126cd181020e239de8ca1d03…
--
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7126cd181020e239de8ca1d03…
You're receiving this email because of your account on gitlab.com.
1
0