This is an automated email from the git hooks/post-receive script. New commit to branch feature/7463-2 in repository observe. See http://git.codelutin.com/observe.git commit 90792e4035e6ac500d697bf233dbb101c10a5837 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Sep 4 08:12:45 2015 +0200 Ajout de la configuration de sécurité sur les méthodes de service + renommage d'une classe dans l'opération de validation --- .../services/service/ReferentialService.java | 11 +++++++++- .../consolidate/ConsolidateDataService.java | 4 ++++ .../service/actions/report/ReportService.java | 8 ++++++++ ...ResultForDto.java => ValidateResultForDto.java} | 4 ++-- .../actions/validate/ValidateResultForDtoType.java | 10 ++++----- .../service/actions/validate/ValidateService.java | 5 +++++ .../longline/ActivityLongLineEncouterService.java | 5 +++++ .../ActivityLongLineSensorUsedService.java | 5 +++++ .../service/longline/ActivityLonglineService.java | 8 ++++++++ .../longline/GearUseFeaturesLonglineService.java | 8 ++++++++ .../service/longline/SetLonglineCatchService.java | 5 +++++ .../SetLonglineDetailCompositionService.java | 5 +++++ .../SetLonglineGlobalCompositionService.java | 5 +++++ .../service/longline/SetLonglineService.java | 7 +++++++ .../services/service/longline/TdrService.java | 5 +++++ .../service/longline/TripLonglineService.java | 8 ++++++++ .../seine/ActivitySeineObservedSystemService.java | 5 +++++ .../service/seine/ActivitySeineService.java | 8 ++++++++ .../service/seine/FloatingObjectService.java | 8 ++++++++ .../service/seine/GearUseFeaturesSeineService.java | 8 ++++++++ .../service/seine/NonTargetCatchService.java | 5 +++++ .../service/seine/NonTargetSampleService.java | 6 ++++++ .../seine/ObjectObservedSpeciesService.java | 5 +++++ .../service/seine/ObjectSchoolEstimateService.java | 5 +++++ .../services/service/seine/RouteService.java | 8 ++++++++ .../service/seine/SchoolEstimateService.java | 5 +++++ .../services/service/seine/SetSeineService.java | 7 +++++++ .../services/service/seine/TargetCatchService.java | 5 +++++ .../service/seine/TargetSampleService.java | 6 ++++++ .../seine/TransmittingBuoyOperationService.java | 5 +++++ .../services/service/seine/TripSeineService.java | 8 ++++++++ .../observe/services/spi/ReadDataPermission.java | 19 +++++++++++++++++ .../services/spi/ReadReferentialPermission.java | 19 +++++++++++++++++ .../observe/services/spi/WriteDataPermission.java | 19 +++++++++++++++++ .../services/spi/WriteReferentialPermission.java | 19 +++++++++++++++++ .../actions/validate/ValidateServiceTopia.java | 6 +++--- .../actions/validate/ValidateServiceTopiaTest.java | 24 +++++++++++----------- 37 files changed, 280 insertions(+), 23 deletions(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java index 6aaf414..f33f58c 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java @@ -1,10 +1,12 @@ package fr.ird.observe.services.service; import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.spi.ReadReferentialPermission; import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.WriteReferentialPermission; import java.util.Collection; @@ -15,20 +17,27 @@ import java.util.Collection; */ public interface ReferentialService extends ObserveService { + @ReadReferentialPermission <R extends ReferentialDto> ReferenceSetDto<R> getReferentialReferenceSet(Class<R> type); + @ReadReferentialPermission <R extends ReferentialDto> FormDto<R> loadToRead(Class<R> type, String id) throws DataNotFoundException; + @WriteReferentialPermission <R extends ReferentialDto> FormDto<R> loadToEdit(Class<R> type, String id) throws DataNotFoundException; + @WriteReferentialPermission <R extends ReferentialDto> FormDto<R> preCreate(Class<R> type); + @WriteReferentialPermission @Write <R extends ReferentialDto> String save(FormDto<R> form); + @WriteReferentialPermission @Write <R extends ReferentialDto> void delete(Class<R> type, String id) throws DataNotFoundException; + @WriteReferentialPermission @Write <R extends ReferentialDto> void delete(Class<R> type, Collection<String> ids) throws DataNotFoundException; diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataService.java index 55c75f7..861ba27 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateDataService.java @@ -2,6 +2,8 @@ package fr.ird.observe.services.service.actions.consolidate; import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.ObserveService; +import fr.ird.observe.services.spi.ReadDataPermission; +import fr.ird.observe.services.spi.WriteDataPermission; /** * Le service pour effectuer les consolidations de données, i.e @@ -20,6 +22,8 @@ public interface ConsolidateDataService extends ObserveService{ * @param consolidateTripSeineDataRequest la demande de consolidation * @return le résultat de la consolidation de données pour chaque marée qui a été modifée. */ + @ReadDataPermission + @WriteDataPermission ImmutableSet<ConsolidateTripSeineDataResult> consolidateTripSeines(ConsolidateTripSeineDataRequest consolidateTripSeineDataRequest); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportService.java index e184862..ac8ebeb 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportService.java @@ -3,6 +3,8 @@ package fr.ird.observe.services.service.actions.report; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.service.actions.report.model.DataMatrix; import fr.ird.observe.services.service.actions.report.model.Report; +import fr.ird.observe.services.spi.ReadDataPermission; +import fr.ird.observe.services.spi.ReadReferentialPermission; import java.util.List; import java.util.Map; @@ -12,9 +14,15 @@ import java.util.Map; */ public interface ReportService extends ObserveService { + @ReadDataPermission + @ReadReferentialPermission Report populateVariables(Report report, String tripId); + @ReadDataPermission + @ReadReferentialPermission DataMatrix executeReport(Report report, String tripId); + @ReadDataPermission + @ReadReferentialPermission <R> List<R> executeRequest(String request, Map<String, Object> params); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationResultForDto.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDto.java similarity index 82% rename from observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationResultForDto.java rename to observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDto.java index d7c105c..1d5b3b0 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationResultForDto.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDto.java @@ -12,13 +12,13 @@ import fr.ird.observe.services.dto.ReferenceDto; * * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -public class ValidationResultForDto<D extends IdDto> { +public class ValidateResultForDto<D extends IdDto> { protected final ReferenceDto<D> dto; protected final ImmutableSet<ValidationMessage> messages; - public ValidationResultForDto(ReferenceDto<D> dto, ImmutableSet<ValidationMessage> messages) { + public ValidateResultForDto(ReferenceDto<D> dto, ImmutableSet<ValidationMessage> messages) { this.dto = dto; this.messages = messages; } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java index 9b2b08a..4347099 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java @@ -15,14 +15,14 @@ public class ValidateResultForDtoType<D extends IdDto> { /** * Les messages regroupés pour chaque dto. */ - protected final ImmutableSet<ValidationResultForDto<D>> validationResultForDto; + protected final ImmutableSet<ValidateResultForDto<D>> validateResultForDto; - public ValidateResultForDtoType(ImmutableSet<ValidationResultForDto<D>> validationResultForDto) { - this.validationResultForDto = validationResultForDto; + public ValidateResultForDtoType(ImmutableSet<ValidateResultForDto<D>> validateResultForDto) { + this.validateResultForDto = validateResultForDto; } - public ImmutableSet<ValidationResultForDto<D>> getValidationResultForDto() { - return validationResultForDto; + public ImmutableSet<ValidateResultForDto<D>> getValidateResultForDto() { + return validateResultForDto; } } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateService.java index 8901341..1cceca5 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateService.java @@ -3,6 +3,8 @@ package fr.ird.observe.services.service.actions.validate; import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.spi.NoDataAccess; +import fr.ird.observe.services.spi.ReadDataPermission; +import fr.ird.observe.services.spi.ReadReferentialPermission; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -18,8 +20,11 @@ public interface ValidateService extends ObserveService { @NoDataAccess ImmutableSet<String> getAvailableContextNames(); + @ReadReferentialPermission ValidateReferentialsResult validate(ValidateReferentialsRequest request); + @ReadDataPermission + @ReadReferentialPermission ValidateDataResult validate(ValidateDataRequest request); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterService.java index ce76712..722bc1b 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterService.java @@ -3,17 +3,22 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; +import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.WriteDataPermission; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface ActivityLongLineEncouterService extends ObserveService { + @ReadDataPermission FormDto<ActivityLonglineEncouterDto> loadToRead(String activityLonglineId); + @WriteDataPermission FormDto<ActivityLonglineEncouterDto> loadToEdit(String activityLonglineId); + @WriteDataPermission @Write String save(FormDto<ActivityLonglineEncouterDto> form); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java index c7f5388..d370554 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedService.java @@ -3,17 +3,22 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; +import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.WriteDataPermission; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface ActivityLongLineSensorUsedService extends ObserveService { + @ReadDataPermission FormDto<ActivityLonglineSensorUsedDto> loadToRead(String activityLonglineId); + @WriteDataPermission FormDto<ActivityLonglineSensorUsedDto> loadToEdit(String activityLonglineId); + @WriteDataPermission @Write String save(FormDto<ActivityLonglineSensorUsedDto> form); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java index 63d3cfd..486153e 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java @@ -4,7 +4,9 @@ import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; +import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.WriteDataPermission; import java.util.List; @@ -13,17 +15,23 @@ import java.util.List; */ public interface ActivityLonglineService extends ObserveService { + @ReadDataPermission List<ActivityLonglineStubDto> getActivityLonglineStubByRoute(String tripLonglineId); + @ReadDataPermission FormDto<ActivityLonglineDto> loadToRead(String activityLonglineId); + @WriteDataPermission FormDto<ActivityLonglineDto> loadToEdit(String activityLonglineId); + @WriteDataPermission FormDto<ActivityLonglineDto> preCreate(String tripLonglineId); @Write + @WriteDataPermission String save(String tripLonglineId, FormDto<ActivityLonglineDto> form); @Write + @WriteDataPermission void delete(String tripLonglineId, String activityLonglineId); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/GearUseFeaturesLonglineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/GearUseFeaturesLonglineService.java index d7a344f..e3e6bb9 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/GearUseFeaturesLonglineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/GearUseFeaturesLonglineService.java @@ -3,7 +3,9 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; +import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.WriteDataPermission; import java.util.List; @@ -12,18 +14,24 @@ import java.util.List; */ public interface GearUseFeaturesLonglineService extends ObserveService { + @ReadDataPermission List<GearUseFeaturesLonglineDto> getGearUseFeaturesLonglineByTripLongline(String tripLonglineId); + @ReadDataPermission FormDto<GearUseFeaturesLonglineDto> loadToRead(String gearUseFeaturesLonglineId); + @WriteDataPermission FormDto<GearUseFeaturesLonglineDto> loadToEdit(String gearUseFeaturesLonglineId); + @WriteDataPermission FormDto<GearUseFeaturesLonglineDto> preCreate(); @Write + @WriteDataPermission String save(String tripLonglineId, FormDto<GearUseFeaturesLonglineDto> form); @Write + @WriteDataPermission void delete(String tripLonglineId, String gearUseFeaturesLonglineId); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchService.java index aacc36b..9788054 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchService.java @@ -3,18 +3,23 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; +import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.WriteDataPermission; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface SetLonglineCatchService extends ObserveService { + @ReadDataPermission FormDto<SetLonglineCatchDto> loadToRead(String setLonglineId); + @WriteDataPermission FormDto<SetLonglineCatchDto> loadToEdit(String setLonglineId); @Write + @WriteDataPermission String save(FormDto<SetLonglineCatchDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionService.java index 8f35d2f..266dc42 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionService.java @@ -3,18 +3,23 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; +import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.WriteDataPermission; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface SetLonglineDetailCompositionService extends ObserveService { + @ReadDataPermission FormDto<SetLonglineDetailCompositionDto> loadToRead(String setLonglineId); + @WriteDataPermission FormDto<SetLonglineDetailCompositionDto> loadToEdit(String setLonglineId); @Write + @WriteDataPermission String save(FormDto<SetLonglineDetailCompositionDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java index 758e07e..6d21dc3 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionService.java @@ -3,18 +3,23 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; +import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.WriteDataPermission; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface SetLonglineGlobalCompositionService extends ObserveService { + @ReadDataPermission FormDto<SetLonglineGlobalCompositionDto> loadToRead(String setLonglineId); + @WriteDataPermission FormDto<SetLonglineGlobalCompositionDto> loadToEdit(String setLonglineId); @Write + @WriteDataPermission String save(FormDto<SetLonglineGlobalCompositionDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java index 8f37657..ba67ee9 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java @@ -3,23 +3,30 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.WriteDataPermission; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface SetLonglineService extends ObserveService { + @ReadDataPermission FormDto<SetLonglineDto> loadToRead(String setLonglineId); + @WriteDataPermission FormDto<SetLonglineDto> loadToEdit(String setLonglineId); + @WriteDataPermission FormDto<SetLonglineDto> preCreate(String activityLonglineId); + @WriteDataPermission @Write String save(String activityLonglineId, FormDto<SetLonglineDto> form); @Write + @WriteDataPermission void delete(String activityLonglineId, String setLonglineId); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TdrService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TdrService.java index 780e026..340b4f2 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TdrService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TdrService.java @@ -3,18 +3,23 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; +import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.WriteDataPermission; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface TdrService extends ObserveService { + @ReadDataPermission FormDto<SetLonglineTdrDto> loadToRead(String setLonglineId); + @WriteDataPermission FormDto<SetLonglineTdrDto> loadToEdit(String setLonglineId); @Write + @WriteDataPermission String save(FormDto<SetLonglineTdrDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java index 109e812..2ad90f8 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java @@ -4,7 +4,9 @@ import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineStubDto; +import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.WriteDataPermission; import java.util.List; @@ -13,18 +15,24 @@ import java.util.List; */ public interface TripLonglineService extends ObserveService { + @ReadDataPermission List<TripLonglineStubDto> getTripLonglineStubByProgram(String programId); + @ReadDataPermission FormDto<TripLonglineDto> loadToRead(String tripLonglineId); + @WriteDataPermission FormDto<TripLonglineDto> loadToEdit(String tripLonglineId); + @WriteDataPermission FormDto<TripLonglineDto> preCreate(String programId); @Write + @WriteDataPermission String save(FormDto<TripLonglineDto> form); @Write + @WriteDataPermission void delete(String tripLonglineId); } \ No newline at end of file diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java index 20c4b33..16b1e49 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.java @@ -3,18 +3,23 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; +import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.WriteDataPermission; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface ActivitySeineObservedSystemService extends ObserveService { + @ReadDataPermission FormDto<ActivitySeineObservedSystemDto> loadToRead(String activitySeineId); + @WriteDataPermission FormDto<ActivitySeineObservedSystemDto> loadToEdit(String activitySeineId); @Write + @WriteDataPermission String save(FormDto<ActivitySeineObservedSystemDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java index e21d073..d29d88c 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java @@ -4,7 +4,9 @@ import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; +import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.WriteDataPermission; import java.util.List; @@ -13,17 +15,23 @@ import java.util.List; */ public interface ActivitySeineService extends ObserveService { + @ReadDataPermission List<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId); + @ReadDataPermission FormDto<ActivitySeineDto> loadToRead(String activitySeineId); + @WriteDataPermission FormDto<ActivitySeineDto> loadToEdit(String activitySeineId); + @WriteDataPermission FormDto<ActivitySeineDto> preCreate(String routeId); @Write + @WriteDataPermission String save(String routeId, FormDto<ActivitySeineDto> form); @Write + @WriteDataPermission void delete(String routeId, String activitySeineId); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java index b37364a..ab63ca5 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java @@ -4,7 +4,9 @@ import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.FloatingObjectStubDto; +import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.WriteDataPermission; import java.util.List; @@ -13,18 +15,24 @@ import java.util.List; */ public interface FloatingObjectService extends ObserveService { + @ReadDataPermission List<FloatingObjectStubDto> getFloatingObjectStubByActivitySeine(String activitySeineId); + @ReadDataPermission FormDto<FloatingObjectDto> loadToRead(String floatingObjectId); + @WriteDataPermission FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId); + @WriteDataPermission FormDto<FloatingObjectDto> preCreate(String activitySeineId); @Write + @WriteDataPermission String save(String activitySeineId, FormDto<FloatingObjectDto> form); @Write + @WriteDataPermission void delete(String activitySeineId, String floatingObjectId); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/GearUseFeaturesSeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/GearUseFeaturesSeineService.java index e104df7..2f3a599 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/GearUseFeaturesSeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/GearUseFeaturesSeineService.java @@ -3,7 +3,9 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; +import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.WriteDataPermission; import java.util.List; @@ -12,18 +14,24 @@ import java.util.List; */ public interface GearUseFeaturesSeineService extends ObserveService { + @ReadDataPermission List<GearUseFeaturesSeineDto> getGearUseFeaturesSeineByTripSeine(String tripSeineId); + @ReadDataPermission FormDto<GearUseFeaturesSeineDto> loadToRead(String gearUseFeaturesSeineId); + @WriteDataPermission FormDto<GearUseFeaturesSeineDto> loadToEdit(String gearUseFeaturesSeineId); + @WriteDataPermission FormDto<GearUseFeaturesSeineDto> preCreate(); @Write + @WriteDataPermission String save(String tripSeineId, FormDto<GearUseFeaturesSeineDto> form); @Write + @WriteDataPermission void delete(String tripSeineId, String gearUseFeaturesSeineId); diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java index d6f943c..116fa1c 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchService.java @@ -3,17 +3,22 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; +import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.WriteDataPermission; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface NonTargetCatchService extends ObserveService { + @ReadDataPermission FormDto<SetSeineNonTargetCatchDto> loadToRead(String setSeineId); + @WriteDataPermission FormDto<SetSeineNonTargetCatchDto> loadToEdit(String setSeineId); @Write + @WriteDataPermission String save(FormDto<SetSeineNonTargetCatchDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java index 664e759..2fdb72a 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleService.java @@ -3,20 +3,26 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.NonTargetSampleDto; +import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.WriteDataPermission; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface NonTargetSampleService extends ObserveService { + @ReadDataPermission boolean canUseNonTargetSample(String setSeineId); + @ReadDataPermission FormDto<NonTargetSampleDto> loadToRead(String setSeineId); + @WriteDataPermission FormDto<NonTargetSampleDto> loadToEdit(String setSeineId); @Write + @WriteDataPermission String save(String setSeineId, FormDto<NonTargetSampleDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java index 45fb2e4..0a8aed5 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesService.java @@ -3,18 +3,23 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; +import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.WriteDataPermission; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface ObjectObservedSpeciesService extends ObserveService { + @ReadDataPermission FormDto<FloatingObjectObservedSpeciesDto> loadToRead(String floatingObjectId); + @WriteDataPermission FormDto<FloatingObjectObservedSpeciesDto> loadToEdit(String floatingObjectId); @Write + @WriteDataPermission String save(FormDto<FloatingObjectObservedSpeciesDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java index 4845c4b..145716d 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateService.java @@ -3,17 +3,22 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; +import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.WriteDataPermission; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface ObjectSchoolEstimateService extends ObserveService { + @ReadDataPermission FormDto<FloatingObjectSchoolEstimateDto> loadToRead(String floatingObjectId); + @WriteDataPermission FormDto<FloatingObjectSchoolEstimateDto> loadToEdit(String floatingObjectId); @Write + @WriteDataPermission String save(FormDto<FloatingObjectSchoolEstimateDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java index 9a80e93..0ce1a77 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java @@ -4,7 +4,9 @@ import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.RouteStubDto; +import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.WriteDataPermission; import java.util.List; @@ -13,18 +15,24 @@ import java.util.List; */ public interface RouteService extends ObserveService { + @ReadDataPermission List<RouteStubDto> getRouteByTripSeine(String tripSeineId); + @ReadDataPermission FormDto<RouteDto> loadToRead(String routeId); + @WriteDataPermission FormDto<RouteDto> loadToEdit(String routeId); + @WriteDataPermission FormDto<RouteDto> preCreate(String tripSeineId); @Write + @WriteDataPermission String save(String tripSeineId, FormDto<RouteDto> form); @Write + @WriteDataPermission void delete(String tripSeineId, String routeId); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateService.java index 3a9bebf..8641d23 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateService.java @@ -3,18 +3,23 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; +import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.WriteDataPermission; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface SchoolEstimateService extends ObserveService { + @ReadDataPermission FormDto<SetSeineSchoolEstimateDto> loadToRead(String setSeineId); + @WriteDataPermission FormDto<SetSeineSchoolEstimateDto> loadToEdit(String setSeineId); @Write + @WriteDataPermission String save(FormDto<SetSeineSchoolEstimateDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java index 7b22313..628d950 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java @@ -3,23 +3,30 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.WriteDataPermission; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface SetSeineService extends ObserveService { + @ReadDataPermission FormDto<SetSeineDto> loadToRead(String setSeineId); + @WriteDataPermission FormDto<SetSeineDto> loadToEdit(String setSeineId); + @WriteDataPermission FormDto<SetSeineDto> preCreate(String routeId, String activitySeineId); @Write + @WriteDataPermission String save(String activitySeineId, FormDto<SetSeineDto> form); @Write + @WriteDataPermission void delete(String activitySeineId, String setSeineId); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java index 5dffbfe..5bcc92f 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetCatchService.java @@ -3,17 +3,22 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; +import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.WriteDataPermission; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface TargetCatchService extends ObserveService { + @ReadDataPermission FormDto<SetSeineTargetCatchDto> loadToRead(String setSeineId); + @WriteDataPermission FormDto<SetSeineTargetCatchDto> loadToEdit(String setSeineId); @Write + @WriteDataPermission String save(FormDto<SetSeineTargetCatchDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java index 9163606..a6d7157 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TargetSampleService.java @@ -3,20 +3,26 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.TargetSampleDto; +import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.WriteDataPermission; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface TargetSampleService extends ObserveService { + @ReadDataPermission boolean canUseTargetSample(String setSeineId, boolean discarded); + @ReadDataPermission FormDto<TargetSampleDto> loadToRead(String setSeineId, boolean discarded); + @WriteDataPermission FormDto<TargetSampleDto> loadToEdit(String setSeineId, boolean discarded); @Write + @WriteDataPermission String save(String setSeineId, FormDto<TargetSampleDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java index 3839627..f12399a 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationService.java @@ -3,18 +3,23 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; +import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.WriteDataPermission; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public interface TransmittingBuoyOperationService extends ObserveService { + @ReadDataPermission FormDto<FloatingObjectTransmittingBuoyDto> loadToRead(String floatingObjectId); + @WriteDataPermission FormDto<FloatingObjectTransmittingBuoyDto> loadToEdit(String floatingObjectId); @Write + @WriteDataPermission String save(FormDto<FloatingObjectTransmittingBuoyDto> form); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java index 7de268c..ac71130 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java @@ -4,7 +4,9 @@ import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineStubDto; +import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.Write; +import fr.ird.observe.services.spi.WriteDataPermission; import java.util.List; @@ -13,18 +15,24 @@ import java.util.List; */ public interface TripSeineService extends ObserveService { + @ReadDataPermission List<TripSeineStubDto> getTripSeineByProgram(String programId); + @ReadDataPermission FormDto<TripSeineDto> loadToRead(String tripSeineId); + @WriteDataPermission FormDto<TripSeineDto> loadToEdit(String tripSeineId); + @WriteDataPermission FormDto<TripSeineDto> preCreate(String programId); @Write + @WriteDataPermission String save(FormDto<TripSeineDto> form); @Write + @WriteDataPermission void delete(String tripSeineId); } \ No newline at end of file diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/spi/ReadDataPermission.java b/observe-services-api/src/main/java/fr/ird/observe/services/spi/ReadDataPermission.java new file mode 100644 index 0000000..33e87cc --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/spi/ReadDataPermission.java @@ -0,0 +1,19 @@ +package fr.ird.observe.services.spi; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Pour qualifier un accès en lecture sur les données. + * + * Created on 04/09/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +public @interface ReadDataPermission { + +} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/spi/ReadReferentialPermission.java b/observe-services-api/src/main/java/fr/ird/observe/services/spi/ReadReferentialPermission.java new file mode 100644 index 0000000..127204d --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/spi/ReadReferentialPermission.java @@ -0,0 +1,19 @@ +package fr.ird.observe.services.spi; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Pour qualifier un accès en lecture sur le référentiel. + * + * Created on 04/09/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +public @interface ReadReferentialPermission { + +} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/spi/WriteDataPermission.java b/observe-services-api/src/main/java/fr/ird/observe/services/spi/WriteDataPermission.java new file mode 100644 index 0000000..1449ffb --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/spi/WriteDataPermission.java @@ -0,0 +1,19 @@ +package fr.ird.observe.services.spi; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Pour qualifier un accès en écriture sur les données. + * + * Created on 04/09/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +public @interface WriteDataPermission { + +} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/spi/WriteReferentialPermission.java b/observe-services-api/src/main/java/fr/ird/observe/services/spi/WriteReferentialPermission.java new file mode 100644 index 0000000..2a6eb41 --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/spi/WriteReferentialPermission.java @@ -0,0 +1,19 @@ +package fr.ird.observe.services.spi; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Pour qualifier un accès en écriture sur le référentiel. + * + * Created on 04/09/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +public @interface WriteReferentialPermission { + +} diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopia.java index cc8354b..291b363 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopia.java @@ -113,7 +113,7 @@ public class ValidateServiceTopia extends ObserveServiceTopia implements Validat Class<D> dtoType, ValidationMessageDetector detector) { - ImmutableSet.Builder<ValidationResultForDto<D>> validateResultForDtoMapBuilder = new ImmutableSet.Builder<>(); + ImmutableSet.Builder<ValidateResultForDto<D>> validateResultForDtoMapBuilder = new ImmutableSet.Builder<>(); Map<TopiaEntity, Collection<ValidationMessage>> detectedMessages = detector.getDetectedMessages(entityType); for (Map.Entry<TopiaEntity, Collection<ValidationMessage>> entry : detectedMessages.entrySet()) { @@ -121,8 +121,8 @@ public class ValidateServiceTopia extends ObserveServiceTopia implements Validat TopiaEntity entity = entry.getKey(); ReferenceDto<D> referenceDto = entityToReferenceDto(dtoType, entity); Collection<ValidationMessage> validationMessages = entry.getValue(); - ValidationResultForDto<D> validationResultForDto = new ValidationResultForDto<>(referenceDto, ImmutableSet.copyOf(validationMessages)); - validateResultForDtoMapBuilder.add(validationResultForDto); + ValidateResultForDto<D> validateResultForDto = new ValidateResultForDto<>(referenceDto, ImmutableSet.copyOf(validationMessages)); + validateResultForDtoMapBuilder.add(validateResultForDto); } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java index 6702b8d..c74505c 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java @@ -180,12 +180,12 @@ public class ValidateServiceTopiaTest extends AbstractServiceTopiaTest { ValidateResultForDtoType<D> validateResultForDtoType = resultByType.get(dtoType); Assert.assertNotNull(validateResultForDtoType); - ImmutableSet<ValidationResultForDto<D>> validationResultForDtos = validateResultForDtoType.getValidationResultForDto(); - Assert.assertNotNull(validationResultForDtos); - Assert.assertEquals(expectedCount, validationResultForDtos.size()); - for (ValidationResultForDto<D> validationResultForDto : validationResultForDtos) { - Assert.assertNotNull(validationResultForDto.getMessages()); - Assert.assertFalse(validationResultForDto.getMessages().isEmpty()); + ImmutableSet<ValidateResultForDto<D>> validateResultForDtos = validateResultForDtoType.getValidateResultForDto(); + Assert.assertNotNull(validateResultForDtos); + Assert.assertEquals(expectedCount, validateResultForDtos.size()); + for (ValidateResultForDto<D> validateResultForDto : validateResultForDtos) { + Assert.assertNotNull(validateResultForDto.getMessages()); + Assert.assertFalse(validateResultForDto.getMessages().isEmpty()); } } @@ -194,12 +194,12 @@ public class ValidateServiceTopiaTest extends AbstractServiceTopiaTest { ValidateResultForDtoType<D> validateResultForDtoType = resultByType.get(dtoType); Assert.assertNotNull(validateResultForDtoType); - ImmutableSet<ValidationResultForDto<D>> validationResultForDtos = validateResultForDtoType.getValidationResultForDto(); - Assert.assertNotNull(validationResultForDtos); - Assert.assertEquals(expectedCount, validationResultForDtos.size()); - for (ValidationResultForDto<D> validationResultForDto : validationResultForDtos) { - Assert.assertNotNull(validationResultForDto.getMessages()); - Assert.assertFalse(validationResultForDto.getMessages().isEmpty()); + ImmutableSet<ValidateResultForDto<D>> validateResultForDtos = validateResultForDtoType.getValidateResultForDto(); + Assert.assertNotNull(validateResultForDtos); + Assert.assertEquals(expectedCount, validateResultForDtos.size()); + for (ValidateResultForDto<D> validateResultForDto : validateResultForDtos) { + Assert.assertNotNull(validateResultForDto.getMessages()); + Assert.assertFalse(validateResultForDto.getMessages().isEmpty()); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.