Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bab39d40 by Tony Chemit at 2020-12-31T09:48:48+01:00 La dernière SNAPSHOT 8.0.3 semble instable - closes #1718 - - - - - e9fc2489 by Tony Chemit at 2020-12-31T09:48:48+01:00 Remontée des messages d'erreur serveur vers le client - closes #1637 - - - - - 8debafba by Tony Chemit at 2020-12-31T09:48:48+01:00 fix trip vessel validator on create mode - - - - - 6 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/api/DataSourceReferenceProvider.java - pom.xml - server/core/src/main/filtered-resources/mapping - services/local-impl/src/main/java/fr/ird/observe/services/local/service/ReferenceServiceLocalSupport.java - services/validation-spi/src/main/java/fr/ird/observe/validation/validators/TripVesselDtoValidator.java - toolkit/service/src/main/java/fr/ird/observe/services/service/ReferenceService.java Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/api/DataSourceReferenceProvider.java ===================================== @@ -101,11 +101,11 @@ public class DataSourceReferenceProvider { } public final <R extends DataDtoReference> DataDtoReferenceSet<R> getDataReferences(Class<R> referenceType) { - return dataSource.getReferenceService().loadData(referenceType); + return dataSource.getReferenceService().loadAllData(referenceType); } public final <R extends ReferentialDtoReference> ReferentialDtoReferenceSet<R> getReferentialReferences(Class<R> referenceType) { - return dataSource.getReferenceService().loadReferential(referenceType); + return dataSource.getReferenceService().loadAllReferential(referenceType); } public <R extends ReferentialDtoReference> R loadOrCreateReferentialReference(Class<R> referenceType, String id) { ===================================== pom.xml ===================================== @@ -162,7 +162,7 @@ <!--<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.2</lib.version.java4all.java-bean>--> -<!-- <lib.version.java4all.http>1.0.24</lib.version.java4all.http>--> + <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 ===================================== @@ -69,12 +69,12 @@ POST /api/v1/LastUpdateDateService/updateDataLastUpdateDates POST /api/v1/LastUpdateDateService/updateReferentialLastUpdateDates v1.LastUpdateDateServiceRestApi.updateReferentialLastUpdateDates GET /api/v1/PingService/getModelVersion v1.PingServiceRestApi.getModelVersion GET /api/v1/PingService/getServerVersion v1.PingServiceRestApi.getServerVersion -GET /api/v1/ReferenceService/loadData v1.ReferenceServiceRestApi.loadData +GET /api/v1/ReferenceService/loadAllData v1.ReferenceServiceRestApi.loadAllData +GET /api/v1/ReferenceService/loadAllReferential v1.ReferenceServiceRestApi.loadAllReferential GET /api/v1/ReferenceService/loadData v1.ReferenceServiceRestApi.loadData GET /api/v1/ReferenceService/loadOrCreateData v1.ReferenceServiceRestApi.loadOrCreateData GET /api/v1/ReferenceService/loadOrCreateReferential v1.ReferenceServiceRestApi.loadOrCreateReferential GET /api/v1/ReferenceService/loadReferential v1.ReferenceServiceRestApi.loadReferential -GET /api/v1/ReferenceService/loadReferential v1.ReferenceServiceRestApi.loadReferential POST /api/v1/actions/report/ReportService/executeReport v1.actions.report.ReportServiceRestApi.executeReport POST /api/v1/actions/report/ReportService/populateVariables v1.actions.report.ReportServiceRestApi.populateVariables POST /api/v1/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService/applySqlRequests v1.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalServiceRestApi.applySqlRequests ===================================== services/local-impl/src/main/java/fr/ird/observe/services/local/service/ReferenceServiceLocalSupport.java ===================================== @@ -57,13 +57,12 @@ class ReferenceServiceLocalSupport extends ObserveServiceLocal implements Refere } @Override - public <R extends DataDtoReference> DataDtoReferenceSet<R> loadData(Class<R> type) { - + public <R extends DataDtoReference> DataDtoReferenceSet<R> loadAllData(Class<R> type) { return loadData0(type); } @Override - public <R extends ReferentialDtoReference> ReferentialDtoReferenceSet<R> loadReferential(Class<R> type) { + public <R extends ReferentialDtoReference> ReferentialDtoReferenceSet<R> loadAllReferential(Class<R> type) { return loadReferential0(type); } ===================================== services/validation-spi/src/main/java/fr/ird/observe/validation/validators/TripVesselDtoValidator.java ===================================== @@ -70,6 +70,10 @@ 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) { + // object not persisted, no ide, can't do the math + return; + } validate(object, id, vessel, startDate, endDate); } @@ -80,7 +84,6 @@ public class TripVesselDtoValidator extends FieldValidatorSupport { vessel.getId(), startDate, endDate); - if (matchingTrips.size() > 0) { addFieldError(getFieldName(), object); } ===================================== toolkit/service/src/main/java/fr/ird/observe/services/service/ReferenceService.java ===================================== @@ -49,7 +49,7 @@ public interface ReferenceService extends ObserveService { @Get @MethodCredential(Permission.READ_DATA) - <R extends DataDtoReference> DataDtoReferenceSet<R> loadData(Class<R> type); + <R extends DataDtoReference> DataDtoReferenceSet<R> loadAllData(Class<R> type); @Get @MethodCredential(Permission.READ_REFERENTIAL) @@ -61,6 +61,6 @@ public interface ReferenceService extends ObserveService { @Get @MethodCredential(Permission.READ_REFERENTIAL) - <R extends ReferentialDtoReference> ReferentialDtoReferenceSet<R> loadReferential(Class<R> type); + <R extends ReferentialDtoReference> ReferentialDtoReferenceSet<R> loadAllReferential(Class<R> type); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/462cfa41a16f96b86cceb02f1... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/462cfa41a16f96b86cceb02f1... You're receiving this email because of your account on gitlab.com.