This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit ab3f53b24fbf61a25c66518441c25a721975319b Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Nov 9 10:44:48 2015 +0100 Ne plus utiliser la méthode DataSourceService#getObserveDto + renommage des noms de paramètres --- .../fr/ird/observe/db/ObserveSwingDataSource.java | 12 -- .../ird/observe/validation/ValidationContext.java | 127 ++++++++++++++++++--- .../controller/v1/DataSourceServiceController.java | 6 - .../ActivityLonglineServiceController.java | 9 +- .../v1/longline/SetLonglineServiceController.java | 9 +- .../v1/longline/TripLonglineServiceController.java | 5 + .../v1/seine/ActivitySeineServiceController.java | 5 + .../v1/seine/FloatingObjectServiceController.java | 9 +- .../v1/seine/RouteServiceController.java | 9 +- .../v1/seine/SetSeineServiceController.java | 9 +- .../v1/seine/TripSeineServiceController.java | 5 + .../services/service/DataSourceService.java | 7 -- .../service/longline/ActivityLonglineService.java | 5 +- .../service/longline/SetLonglineService.java | 5 +- .../service/longline/TripLonglineService.java | 5 +- .../service/seine/ActivitySeineService.java | 3 + .../service/seine/FloatingObjectService.java | 5 +- .../services/service/seine/RouteService.java | 5 +- .../services/service/seine/SetSeineService.java | 5 +- .../services/service/seine/TripSeineService.java | 3 + .../ird/observe/services/ObserveServiceTopia.java | 42 ++++--- .../services/service/DataSourceServiceTopia.java | 14 --- .../longline/ActivityLonglineServiceTopia.java | 15 ++- .../service/longline/SetLonglineServiceTopia.java | 5 + .../service/longline/TripLonglineServiceTopia.java | 16 ++- .../service/seine/ActivitySeineServiceTopia.java | 16 ++- .../service/seine/FloatingObjectServiceTopia.java | 5 + .../services/service/seine/RouteServiceTopia.java | 5 + .../service/seine/SetSeineServiceTopia.java | 5 + .../service/seine/TargetSampleServiceTopia.java | 6 +- .../service/seine/TripSeineServiceTopia.java | 7 ++ 31 files changed, 278 insertions(+), 106 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java b/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java index bb15113..74cc523 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java @@ -18,7 +18,6 @@ import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; -import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.dto.ObserveDbUserDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; @@ -194,17 +193,6 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements dataSourceService.applySecurity(getConfiguration(), users); } - - public <D extends IdDto> D getObserveDto(Class<D> dtoType, String id) { - Preconditions.checkState(isOpen(), "Connection is not open"); - - DataSourceService dataSourceService = newService(DataSourceService.class); - - D result = dataSourceService.getObserveDto(dtoType, id); - - return result; - } - public void migrateData(ObserveDataSourceInformation dataSourceInformation, Version targetVersion) throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { Preconditions.checkState(!isOpen(), "Connection is open"); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationContext.java index 8d42c4b..e34e5b9 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/validation/ValidationContext.java @@ -33,6 +33,14 @@ import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.service.longline.ActivityLonglineService; +import fr.ird.observe.services.service.longline.SetLonglineService; +import fr.ird.observe.services.service.longline.TripLonglineService; +import fr.ird.observe.services.service.seine.ActivitySeineService; +import fr.ird.observe.services.service.seine.FloatingObjectService; +import fr.ird.observe.services.service.seine.RouteService; +import fr.ird.observe.services.service.seine.SetSeineService; +import fr.ird.observe.services.service.seine.TripSeineService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -53,6 +61,86 @@ public class ValidationContext { public static final String VALIDATION_TRANSACTION_NAME = "validation"; + private static final DtoSupplier<TripSeineDto> TRIP_SEINE_DTO_SUPPLIER = new DtoSupplier<TripSeineDto>() { + + @Override + public TripSeineDto get(ObserveSwingDataSource dataSource, String id) { + TripSeineService service = dataSource.newService(TripSeineService.class); + TripSeineDto dto = service.loadDto(id); + return dto; + } + }; + + private static final DtoSupplier<RouteDto> ROUTE_DTO_SUPPLIER = new DtoSupplier<RouteDto>() { + + @Override + public RouteDto get(ObserveSwingDataSource dataSource, String id) { + RouteService service = dataSource.newService(RouteService.class); + RouteDto dto = service.loadDto(id); + return dto; + } + }; + + private static final DtoSupplier<ActivitySeineDto> ACTIVITY_SEINE_DTO_SUPPLIER = new DtoSupplier<ActivitySeineDto>() { + + @Override + public ActivitySeineDto get(ObserveSwingDataSource dataSource, String id) { + ActivitySeineService service = dataSource.newService(ActivitySeineService.class); + ActivitySeineDto dto = service.loadDto(id); + return dto; + } + }; + + private static final DtoSupplier<TripLonglineDto> TRIP_LONGLINE_DTO_SUPPLIER = new DtoSupplier<TripLonglineDto>() { + + @Override + public TripLonglineDto get(ObserveSwingDataSource dataSource, String id) { + TripLonglineService service = dataSource.newService(TripLonglineService.class); + TripLonglineDto dto = service.loadDto(id); + return dto; + } + }; + + private static final DtoSupplier<ActivityLonglineDto> ACTIVITY_LONGLINE_DTO_SUPPLIER = new DtoSupplier<ActivityLonglineDto>() { + + @Override + public ActivityLonglineDto get(ObserveSwingDataSource dataSource, String id) { + ActivityLonglineService service = dataSource.newService(ActivityLonglineService.class); + ActivityLonglineDto dto = service.loadDto(id); + return dto; + } + }; + + private static final DtoSupplier<SetSeineDto> SET_SEINE_DTO_SUPPLIER = new DtoSupplier<SetSeineDto>() { + + @Override + public SetSeineDto get(ObserveSwingDataSource dataSource, String id) { + SetSeineService service = dataSource.newService(SetSeineService.class); + SetSeineDto dto = service.loadDto(id); + return dto; + } + }; + + private static final DtoSupplier<SetLonglineDto> SET_LONGLINE_DTO_SUPPLIER = new DtoSupplier<SetLonglineDto>() { + + @Override + public SetLonglineDto get(ObserveSwingDataSource dataSource, String id) { + SetLonglineService service = dataSource.newService(SetLonglineService.class); + SetLonglineDto dto = service.loadDto(id); + return dto; + } + }; + + private static final DtoSupplier<FloatingObjectDto> FLOATING_OBJECT_DTO_SUPPLIER = new DtoSupplier<FloatingObjectDto>() { + + @Override + public FloatingObjectDto get(ObserveSwingDataSource dataSource, String id) { + FloatingObjectService service = dataSource.newService(FloatingObjectService.class); + FloatingObjectDto dto = service.loadDto(id); + return dto; + } + }; + protected DataContext dataContext; protected Map<String, Object> cache; @@ -61,7 +149,7 @@ public class ValidationContext { public Map<String, Object> getCache() { if (cache == null) { - cache = new TreeMap<String, Object>(); + cache = new TreeMap<>(); } return cache; } @@ -71,10 +159,6 @@ public class ValidationContext { referentielList = null; } - public ObserveSwingDataSource getDataSource() { - return ObserveSwingApplicationContext.get().getDataSource(); - } - public void close() { dataContext = null; } @@ -101,7 +185,7 @@ public class ValidationContext { String tripSeineId = dataContext.getSelectedTripSeineId(); TripSeineDto result = null; if (tripSeineId != null) { - result = getDto(TripSeineDto.class, tripSeineId); + result = getDto(TRIP_SEINE_DTO_SUPPLIER, tripSeineId); } return result; } @@ -110,7 +194,7 @@ public class ValidationContext { String tripLonglineId = dataContext.getSelectedTripLonglineId(); TripLonglineDto result = null; if (tripLonglineId != null) { - result = getDto(TripLonglineDto.class, tripLonglineId); + result = getDto(TRIP_LONGLINE_DTO_SUPPLIER, tripLonglineId); } return result; } @@ -119,7 +203,7 @@ public class ValidationContext { String routeId = dataContext.getSelectedRouteId(); RouteDto result = null; if (routeId != null) { - result = getDto(RouteDto.class, routeId); + result = getDto(ROUTE_DTO_SUPPLIER, routeId); } return result; } @@ -128,7 +212,7 @@ public class ValidationContext { String activitySeineId = dataContext.getSelectedActivitySeineId(); ActivitySeineDto result = null; if (activitySeineId != null) { - result = getDto(ActivitySeineDto.class, activitySeineId); + result = getDto(ACTIVITY_SEINE_DTO_SUPPLIER, activitySeineId); } return result; } @@ -137,7 +221,7 @@ public class ValidationContext { String activityLonglineId = dataContext.getSelectedActivityLonglineId(); ActivityLonglineDto result = null; if (activityLonglineId != null) { - result = getDto(ActivityLonglineDto.class, activityLonglineId); + result = getDto(ACTIVITY_LONGLINE_DTO_SUPPLIER, activityLonglineId); } return result; } @@ -146,7 +230,7 @@ public class ValidationContext { String setSeineId = dataContext.getSelectedSetSeineId(); SetSeineDto result = null; if (setSeineId != null) { - result = getDto(SetSeineDto.class, setSeineId); + result = getDto(SET_SEINE_DTO_SUPPLIER, setSeineId); } return result; } @@ -155,7 +239,7 @@ public class ValidationContext { String setLonglineId = dataContext.getSelectedSetLonglineId(); SetLonglineDto result = null; if (setLonglineId != null) { - result = getDto(SetLonglineDto.class, setLonglineId); + result = getDto(SET_LONGLINE_DTO_SUPPLIER, setLonglineId); } return result; } @@ -164,7 +248,7 @@ public class ValidationContext { String floatingObjectId = dataContext.getSelectedFloatingObjectId(); FloatingObjectDto result = null; if (floatingObjectId != null) { - result = getDto(FloatingObjectDto.class, floatingObjectId); + result = getDto(FLOATING_OBJECT_DTO_SUPPLIER, floatingObjectId); } return result; } @@ -180,8 +264,7 @@ public class ValidationContext { this.referentielList = referentielList; } - public <D extends IdDto> D getDto(Class<D> dtoType, String id) { - + protected <D extends IdDto> D getDto(DtoSupplier<D> dtoSupplier, String id) { Object o = getCache().get(id); if (o != null) { if (log.isDebugEnabled()) { @@ -191,7 +274,7 @@ public class ValidationContext { return (D) o; } - D result = getDataSource().getObserveDto(dtoType, id); + D result = dtoSupplier.get(id); if (result != null) { if (log.isInfoEnabled()) { @@ -203,4 +286,16 @@ public class ValidationContext { return result; } + + protected static abstract class DtoSupplier<D extends IdDto> { + + public final D get(String id) { + ObserveSwingDataSource dataSource = ObserveSwingApplicationContext.get().getDataSource(); + D dto = get(dataSource, id); + return dto; + } + + public abstract D get(ObserveSwingDataSource dataSource, String id); + + } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java index 2f8b2ca..0cae570 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java @@ -34,7 +34,6 @@ import fr.ird.observe.services.configuration.ObserveDataSourceConnectionRest; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; -import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ImportDataDto; import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.dto.ObserveDbUserDto; @@ -130,11 +129,6 @@ public class DataSourceServiceController extends ObserveServiceControllerSupport } @Override - public <D extends IdDto> D getObserveDto(Class<D> dtoType, String id) { - return getAuthenticatedService().getObserveDto(dtoType, id); - } - - @Override public void migrateData(ObserveDataSourceConfiguration dataSourceConfiguration) { ObserveDataSourceConfiguration dataSourceConfigurationTopia = getTopiaDataSourceConfiguration(dataSourceConfiguration); getAnonymousService(dataSourceConfigurationTopia).migrateData(dataSourceConfiguration); diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java index 92702da..09ef623 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java @@ -60,6 +60,11 @@ public class ActivityLonglineServiceController extends ObserveAuthenticatedServi } @Override + public ActivityLonglineDto loadDto(String activityLonglineId) { + return service.loadDto(activityLonglineId); + } + + @Override public FormDto<ActivityLonglineDto> loadToEdit(String activityLonglineId) { return service.loadToEdit(activityLonglineId); } @@ -70,8 +75,8 @@ public class ActivityLonglineServiceController extends ObserveAuthenticatedServi } @Override - public TripChildSaveResultDto save(String tripLonglineId, ActivityLonglineDto bean) { - return service.save(tripLonglineId, bean); + public TripChildSaveResultDto save(String tripLonglineId, ActivityLonglineDto dto) { + return service.save(tripLonglineId, dto); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java index 3dc91d1..0045c68 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java @@ -44,8 +44,13 @@ public class SetLonglineServiceController extends ObserveAuthenticatedServiceCon } @Override - public ReferenceDto<SetLonglineDto> loadReferenceToRead(String id) { - return service.loadReferenceToRead(id); + public ReferenceDto<SetLonglineDto> loadReferenceToRead(String setLonglineId) { + return service.loadReferenceToRead(setLonglineId); + } + + @Override + public SetLonglineDto loadDto(String setLonglineId) { + return service.loadDto(setLonglineId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java index ac7bfa6..14f0152 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java @@ -51,6 +51,11 @@ public class TripLonglineServiceController extends ObserveAuthenticatedServiceCo } @Override + public TripLonglineDto loadDto(String tripLonglineId) { + return service.loadDto(tripLonglineId); + } + + @Override public int getTripLonglinePositionInProgram(String programId, String tripLonglineId) { return service.getTripLonglinePositionInProgram(programId, tripLonglineId); } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java index a9a0160..f3c2b56 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java @@ -60,6 +60,11 @@ public class ActivitySeineServiceController extends ObserveAuthenticatedServiceC } @Override + public ActivitySeineDto loadDto(String activitySeineId) { + return service.loadDto(activitySeineId); + } + + @Override public FormDto<ActivitySeineDto> loadToEdit(String activitySeineId) { return service.loadToEdit(activitySeineId); } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java index 39929f8..faaeb71 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java @@ -49,8 +49,13 @@ public class FloatingObjectServiceController extends ObserveAuthenticatedService } @Override - public ReferenceDto<FloatingObjectDto> loadReferenceToRead(String id) { - return service.loadReferenceToRead(id); + public ReferenceDto<FloatingObjectDto> loadReferenceToRead(String floatingObjectId) { + return service.loadReferenceToRead(floatingObjectId); + } + + @Override + public FloatingObjectDto loadDto(String floatingObjectId) { + return service.loadDto(floatingObjectId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java index f1e917a..d293f45 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java @@ -55,8 +55,13 @@ public class RouteServiceController extends ObserveAuthenticatedServiceControlle } @Override - public ReferenceDto<RouteDto> loadReferenceToRead(String id) { - return service.loadReferenceToRead(id); + public ReferenceDto<RouteDto> loadReferenceToRead(String routeId) { + return service.loadReferenceToRead(routeId); + } + + @Override + public RouteDto loadDto(String routeId) { + return service.loadDto(routeId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java index e0ea4d8..4ece2e0 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java @@ -43,8 +43,13 @@ public class SetSeineServiceController extends ObserveAuthenticatedServiceContro } @Override - public ReferenceDto<SetSeineDto> loadReferenceToRead(String id) { - return service.loadReferenceToRead(id); + public ReferenceDto<SetSeineDto> loadReferenceToRead(String setSeineId) { + return service.loadReferenceToRead(setSeineId); + } + + @Override + public SetSeineDto loadDto(String setSeineId) { + return service.loadDto(setSeineId); } @Override diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java index f92c748..2e33819 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java @@ -56,6 +56,11 @@ public class TripSeineServiceController extends ObserveAuthenticatedServiceContr } @Override + public TripSeineDto loadDto(String tripSeineId) { + return service.loadDto(tripSeineId); + } + + @Override public TripMapDto getTripSeineMap(String tripSeineId) { return service.getTripSeineMap(tripSeineId); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/DataSourceService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/DataSourceService.java index 5da03c1..acfa481 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/DataSourceService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/DataSourceService.java @@ -28,14 +28,11 @@ import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; -import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ImportDataDto; import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.dto.ObserveDbUserDto; import fr.ird.observe.services.spi.NoDataAccess; import fr.ird.observe.services.spi.PostRequest; -import fr.ird.observe.services.spi.ReadDataPermission; -import fr.ird.observe.services.spi.ReadReferentialPermission; import fr.ird.observe.services.spi.Write; import fr.ird.observe.services.spi.WriteDataPermission; @@ -70,10 +67,6 @@ public interface DataSourceService extends ObserveService { void destroy(); - @ReadDataPermission - @ReadReferentialPermission - <D extends IdDto> D getObserveDto(Class<D> dtoType, String id); - @WriteDataPermission @Write @PostRequest 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 683bc15..a41d822 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 @@ -51,6 +51,9 @@ public interface ActivityLonglineService extends ObserveService { @ReadDataPermission ReferenceDto<ActivityLonglineDto> loadReferenceToRead(String activityLonglineId); + @ReadDataPermission + ActivityLonglineDto loadDto(String activityLonglineId); + @WriteDataPermission FormDto<ActivityLonglineDto> loadToEdit(String activityLonglineId); @@ -60,7 +63,7 @@ public interface ActivityLonglineService extends ObserveService { @Write @WriteDataPermission @PostRequest - TripChildSaveResultDto save(String tripLonglineId, ActivityLonglineDto bean); + TripChildSaveResultDto save(String tripLonglineId, ActivityLonglineDto dto); @Write @WriteDataPermission 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 f64e5d3..f79c983 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 @@ -42,7 +42,10 @@ public interface SetLonglineService extends ObserveService { FormDto<SetLonglineDto> loadToRead(String setLonglineId); @ReadDataPermission - ReferenceDto<SetLonglineDto> loadReferenceToRead(String id); + ReferenceDto<SetLonglineDto> loadReferenceToRead(String setLonglineId); + + @ReadDataPermission + SetLonglineDto loadDto(String setLonglineId); @WriteDataPermission FormDto<SetLonglineDto> loadToEdit(String setLonglineId); 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 c5209d3..2bcee1d 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 @@ -47,6 +47,9 @@ public interface TripLonglineService extends ObserveService { ReferenceSetDto<TripLonglineDto> getTripLonglineByProgram(String programId); @ReadDataPermission + TripLonglineDto loadDto(String tripLonglineId); + + @ReadDataPermission int getTripLonglinePositionInProgram(String programId, String tripLonglineId); @ReadDataPermission @@ -56,7 +59,7 @@ public interface TripLonglineService extends ObserveService { FormDto<TripLonglineDto> loadToRead(String tripLonglineId); @ReadDataPermission - ReferenceDto<TripLonglineDto> loadReferenceToRead(String id); + ReferenceDto<TripLonglineDto> loadReferenceToRead(String tripLonglineId); @WriteDataPermission FormDto<TripLonglineDto> loadToEdit(String tripLonglineId); 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 95bdf94..12fa516 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 @@ -51,6 +51,9 @@ public interface ActivitySeineService extends ObserveService { @ReadDataPermission ReferenceDto<ActivitySeineDto> loadReferenceToRead(String activitySeineId); + @ReadDataPermission + ActivitySeineDto loadDto(String activitySeineId); + @WriteDataPermission FormDto<ActivitySeineDto> loadToEdit(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 a01ddf2..e41aa1d 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 @@ -45,7 +45,10 @@ public interface FloatingObjectService extends ObserveService { FormDto<FloatingObjectDto> loadToRead(String floatingObjectId); @ReadDataPermission - ReferenceDto<FloatingObjectDto> loadReferenceToRead(String id); + ReferenceDto<FloatingObjectDto> loadReferenceToRead(String floatingObjectId); + + @ReadDataPermission + FloatingObjectDto loadDto(String floatingObjectId); @WriteDataPermission FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId); 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 dbf9c25..01c8ffb 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 @@ -49,7 +49,10 @@ public interface RouteService extends ObserveService { FormDto<RouteDto> loadToRead(String routeId); @ReadDataPermission - ReferenceDto<RouteDto> loadReferenceToRead(String id); + ReferenceDto<RouteDto> loadReferenceToRead(String routeId); + + @ReadDataPermission + RouteDto loadDto(String routeId); @WriteDataPermission FormDto<RouteDto> loadToEdit(String routeId); 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 4d50fef..c6a4ed1 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 @@ -41,7 +41,10 @@ public interface SetSeineService extends ObserveService { FormDto<SetSeineDto> loadToRead(String setSeineId); @ReadDataPermission - ReferenceDto<SetSeineDto> loadReferenceToRead(String id); + ReferenceDto<SetSeineDto> loadReferenceToRead(String setSeineId); + + @ReadDataPermission + SetSeineDto loadDto(String setSeineId); @WriteDataPermission FormDto<SetSeineDto> loadToEdit(String setSeineId); 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 ae26efa..8b54504 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 @@ -49,6 +49,9 @@ public interface TripSeineService extends ObserveService { int getTripSeinePositionInProgram(String programId, String tripSeineId); @ReadDataPermission + TripSeineDto loadDto(String tripSeineId); + + @ReadDataPermission TripMapDto getTripSeineMap(String tripSeineId); @ReadDataPermission diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java index 76e7b56..e3916d3 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java @@ -370,13 +370,13 @@ public abstract class ObserveServiceTopia implements ObserveService { Class<TopiaEntity> entityChildType = getEntityType(childDtoType); EntitiesExtractor<TopiaEntity> entitiesExtractor = entityFilterFactory.newEntitiesSet(entityParentType, - entityChildType, - propertyName); + entityChildType, + propertyName); ReferenceSetDto referenceSet = getReferenceSet(childDtoType, propertyName, entityChildType, - entitiesExtractor, + entitiesExtractor, dataContext); labels.add(referenceSet); @@ -488,8 +488,8 @@ public abstract class ObserveServiceTopia implements ObserveService { ReferenceDto<NonTargetCatchDto> referenceDto = ReferenceDtos.newReferenceDto(NonTargetCatchDto.class, - Lists.newArrayList(NonTargetCatchDto.PROPERTY_SPECIES, - NonTargetCatchDto.PROPERTY_SPECIES_FATE)); + Lists.newArrayList(NonTargetCatchDto.PROPERTY_SPECIES, + NonTargetCatchDto.PROPERTY_SPECIES_FATE)); referenceDto.setId(entity.getTopiaId()); referenceDto.setPropertyValue(NonTargetCatchDto.PROPERTY_SPECIES, entity.getSpecies().getScientificLabel()); @@ -504,7 +504,7 @@ public abstract class ObserveServiceTopia implements ObserveService { ReferenceDto<FloatingObjectDto> referenceDto = ReferenceDtos.newReferenceDto(FloatingObjectDto.class, - Lists.newArrayList(FloatingObjectDto.PROPERTY_OBJECT_TYPE)); + Lists.newArrayList(FloatingObjectDto.PROPERTY_OBJECT_TYPE)); referenceDto.setId(entity.getTopiaId()); referenceDto.setPropertyValue(FloatingObjectDto.PROPERTY_OBJECT_TYPE, referenceLocale.getLabel(entity.getObjectType())); @@ -518,9 +518,9 @@ public abstract class ObserveServiceTopia implements ObserveService { ReferenceDto<SchoolEstimateDto> referenceDto = ReferenceDtos.newReferenceDto(SchoolEstimateDto.class, - Lists.newArrayList(SchoolEstimateDto.PROPERTY_SPECIES, - SchoolEstimateDto.PROPERTY_MEAN_WEIGHT, - SchoolEstimateDto.PROPERTY_TOTAL_WEIGHT)); + Lists.newArrayList(SchoolEstimateDto.PROPERTY_SPECIES, + SchoolEstimateDto.PROPERTY_MEAN_WEIGHT, + SchoolEstimateDto.PROPERTY_TOTAL_WEIGHT)); referenceDto.setId(entity.getTopiaId()); referenceDto.setPropertyValue(SchoolEstimateDto.PROPERTY_SPECIES, referenceLocale.getLabel(entity.getSpecies())); @@ -540,9 +540,9 @@ public abstract class ObserveServiceTopia implements ObserveService { ReferenceDto<TargetLengthDto> referenceDto = ReferenceDtos.newReferenceDto(TargetLengthDto.class, - Lists.newArrayList(TargetLengthDto.PROPERTY_SPECIES, - TargetLengthDto.PROPERTY_LENGTH, - TargetLengthDto.PROPERTY_COUNT)); + Lists.newArrayList(TargetLengthDto.PROPERTY_SPECIES, + TargetLengthDto.PROPERTY_LENGTH, + TargetLengthDto.PROPERTY_COUNT)); referenceDto.setId(entity.getTopiaId()); referenceDto.setPropertyValue(TargetLengthDto.PROPERTY_SPECIES, referenceLocale.getLabel(entity.getSpecies())); @@ -620,9 +620,9 @@ public abstract class ObserveServiceTopia implements ObserveService { ReferenceLocale referenceLocale = getReferenceLocale(); ReferenceDto<ActivitySeineDto> referenceDto = ReferenceDtos.newReferenceDto(ActivitySeineDto.class, - Lists.newArrayList(ActivitySeineDto.PROPERTY_TIME, - ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, - ActivitySeineDto.PROPERTY_SET_SEINE)); + Lists.newArrayList(ActivitySeineDto.PROPERTY_TIME, + ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, + ActivitySeineDto.PROPERTY_SET_SEINE)); referenceDto.setId(entity.getTopiaId()); referenceDto.setPropertyValue(ActivitySeineDto.PROPERTY_TIME, entity.getTime()); referenceDto.setPropertyValue(ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, referenceLocale.getLabel(entity.getVesselActivitySeine())); @@ -638,8 +638,8 @@ public abstract class ObserveServiceTopia implements ObserveService { ReferenceLocale referenceLocale = getReferenceLocale(); ReferenceDto<EncounterDto> referenceDto = ReferenceDtos.newReferenceDto(EncounterDto.class, - Lists.newArrayList(EncounterDto.PROPERTY_ENCOUNTER_TYPE, - EncounterDto.PROPERTY_SPECIES)); + Lists.newArrayList(EncounterDto.PROPERTY_ENCOUNTER_TYPE, + EncounterDto.PROPERTY_SPECIES)); referenceDto.setId(entity.getTopiaId()); referenceDto.setPropertyValue(EncounterDto.PROPERTY_ENCOUNTER_TYPE, referenceLocale.getLabel(entity.getEncounterType())); referenceDto.setPropertyValue(EncounterDto.PROPERTY_SPECIES, referenceLocale.getLabel(entity.getSpecies())); @@ -838,6 +838,14 @@ public abstract class ObserveServiceTopia implements ObserveService { } } + protected <D extends IdDto, E extends TopiaEntity> D loadEntityToDto(Class<D> dtoType, String id) { + + Class<E> entityType = getEntityType(dtoType); + E entity = loadEntity(dtoType, entityType, id); + D dto = entityToDto(dtoType, entityType, entity); + return dto; + + } protected <E extends TopiaEntity> boolean existsEntity(Class<E> entityType, String id) { ObserveTopiaPersistenceContext persistenceContext = serviceContext.getTopiaPersistenceContext(); TopiaDao<E> dao = persistenceContext.getDao(entityType); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java index dbdc4d5..9e45824 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java @@ -42,13 +42,11 @@ import fr.ird.observe.services.configuration.ObserveDataSourceConnectionTopia; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; -import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ImportDataDto; import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.dto.ObserveDbUserDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.jdbc.JdbcHelper; import org.nuiton.util.version.Version; @@ -353,18 +351,6 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS } @Override - public <D extends IdDto> D getObserveDto(Class<D> dtoType, String id) { - - Class<TopiaEntity> entityType = getEntityType(dtoType); - - TopiaEntity entity = loadEntity(dtoType, entityType, id); - - D observeDto = entityToDto(dtoType, entityType, entity); - - return observeDto; - } - - @Override public void migrateData(ObserveDataSourceConfiguration dataSourceConfiguration) { ObserveTopiaApplicationContext topiaApplicationContext = ObserveTopiaApplicationContextFactory.getOrCreateTopiaApplicationContext((ObserveDataSourceConfigurationTopiaSupport) dataSourceConfiguration); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java index 3e96ac0..c401b7c 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java @@ -65,7 +65,7 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements for (ActivityLongline activityLongline : allStubByTripId) { - ReferenceDto<ActivityLonglineDto> stub = entityToReferenceDto(ActivityLonglineDto.class, activityLongline); + ReferenceDto<ActivityLonglineDto> stub = entityToReferenceDto(activityLongline); stubs.add(stub); } @@ -116,6 +116,11 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements } @Override + public ActivityLonglineDto loadDto(String activityLonglineId) { + return loadEntityToDto(ActivityLonglineDto.class, activityLonglineId); + } + + @Override public FormDto<ActivityLonglineDto> loadToEdit(String activityLonglineId) { ActivityLongline activityLongline = loadEntity(ActivityLonglineDto.class, ActivityLongline.class, activityLonglineId); @@ -174,20 +179,20 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements } @Override - public TripChildSaveResultDto save(String tripLonglineId, ActivityLonglineDto activityLonglineDto) { + public TripChildSaveResultDto save(String tripLonglineId, ActivityLonglineDto dto) { TripChildSaveResultDto result = new TripChildSaveResultDto(); TripLongline tripLongline = loadEntity(TripLonglineDto.class, TripLongline.class, tripLonglineId); - ActivityLongline activityLongline = dtoToEntity(ActivityLonglineDto.class, ActivityLongline.class, activityLonglineDto); + ActivityLongline activityLongline = dtoToEntity(ActivityLonglineDto.class, ActivityLongline.class, dto); activityLongline = saveEntity(ActivityLongline.class, activityLongline); result.setId(activityLongline.getTopiaId()); result.setLastUpdate(activityLongline.getLastUpdate()); - if (activityLonglineDto.isNotPersisted()) { + if (dto.isNotPersisted()) { tripLongline.addActivityLongline(activityLongline); @@ -211,7 +216,7 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements ActivityLongline activityLongline = loadEntity(ActivityLonglineDto.class, ActivityLongline.class, activityLonglineId); - if (! tripLongline.containsActivityLongline(activityLongline)) { + if (!tripLongline.containsActivityLongline(activityLongline)) { throw new DataNotFoundException(ActivityLonglineDto.class, activityLonglineId); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java index 0335193..1e5cdb3 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java @@ -63,6 +63,11 @@ public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetL } @Override + public SetLonglineDto loadDto(String setLonglineId) { + return loadEntityToDto(SetLonglineDto.class, setLonglineId); + } + + @Override public FormDto<SetLonglineDto> loadToEdit(String setLonglineId) { SetLongline setLongline = loadEntity(SetLonglineDto.class, SetLongline.class, setLonglineId); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java index 6cdca19..a1576ab 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java @@ -78,9 +78,10 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri return stubReferences; } + @Override public ReferenceSetDto<TripLonglineDto> getTripLonglineByProgram(String programId) { - + ReferenceLocale referenceLocale = getReferenceLocale(); List<TripLongline> tripLonglines = getDao().findAllStubByProgramId(programId, referenceLocale); @@ -103,6 +104,11 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri } @Override + public TripLonglineDto loadDto(String tripLonglineId) { + return loadEntityToDto(TripLonglineDto.class, tripLonglineId); + } + + @Override public int getTripLonglinePositionInProgram(String programId, String tripLonglineId) { int position = getDao().findPositionByProgramId(programId, tripLonglineId); @@ -126,7 +132,7 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri @Override public FormDto<TripLonglineDto> loadToRead(String tripLonglineId) { - + TripLongline tripLongline = loadEntity(TripLonglineDto.class, TripLongline.class, tripLonglineId); FormDto<TripLonglineDto> form = entityToReadFormDto(TripLonglineDto.class, TripLongline.class, tripLongline); @@ -146,7 +152,7 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri @Override public FormDto<TripLonglineDto> loadToEdit(String tripLonglineId) { - + TripLongline tripLongline = loadEntity(TripLonglineDto.class, TripLongline.class, tripLonglineId); FormDto<TripLonglineDto> form = entityToEditFormDto(TripLonglineDto.class, TripLongline.class, tripLongline); @@ -163,7 +169,7 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri @Override public FormDto<TripLonglineDto> preCreate(String programId) { - + TripLongline tripLongline = newEntity(TripLongline.class); Program program = loadEntity(ProgramDto.class, Program.class, programId); @@ -183,7 +189,7 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri @Override public SaveResultDto save(TripLonglineDto dto) { - + TripLongline tripLongline = dtoToEntity(TripLonglineDto.class, TripLongline.class, dto); tripLongline = saveEntity(TripLongline.class, tripLongline); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java index e262c85..e3d438e 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java @@ -69,11 +69,12 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac for (ActivitySeine activitySeine : allStubByTripId) { ReferenceDto<ActivitySeineDto> stub = ReferenceDtos.newReferenceDto(ActivitySeineDto.class, - Lists.newArrayList(ActivitySeineDto.PROPERTY_TIME, - ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, - ActivitySeineDto.PROPERTY_SET_SEINE)); + true, + Lists.newArrayList(ActivitySeineDto.PROPERTY_TIME, + ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, + ActivitySeineDto.PROPERTY_SET_SEINE)); stub.setId(activitySeine.getTopiaId()); - stub.setPropertyValue(ActivitySeineDto.PROPERTY_TIME, activitySeine.getTime()); + stub.setPropertyValue(ActivitySeineDto.PROPERTY_TIME, new Date(activitySeine.getTime().getTime())); stub.setPropertyValue(ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE, referenceLocale.getLabel(activitySeine.getVesselActivitySeine())); if (activitySeine.getSetSeine() != null) { stub.setPropertyValue(ActivitySeineDto.PROPERTY_SET_SEINE, entityToReferenceDto(SetSeineDto.class, activitySeine.getSetSeine())); @@ -122,6 +123,11 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac } @Override + public ActivitySeineDto loadDto(String activitySeineId) { + return loadEntityToDto(ActivitySeineDto.class, activitySeineId); + } + + @Override public FormDto<ActivitySeineDto> loadToEdit(String activitySeineId) { ActivitySeine activitySeine = loadEntity(ActivitySeineDto.class, ActivitySeine.class, activitySeineId); @@ -215,7 +221,7 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac ActivitySeine activitySeine = loadEntity(ActivitySeineDto.class, ActivitySeine.class, activitySeineId); - if (! route.containsActivitySeine(activitySeine)) { + if (!route.containsActivitySeine(activitySeine)) { throw new DataNotFoundException(ActivitySeineDto.class, activitySeineId); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java index 02243d5..8b13f17 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java @@ -94,6 +94,11 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F } @Override + public FloatingObjectDto loadDto(String floatingObjectId) { + return loadEntityToDto(FloatingObjectDto.class, floatingObjectId); + } + + @Override public FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId) { FloatingObject floatingObject = loadEntity(FloatingObjectDto.class, FloatingObject.class, floatingObjectId); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java index 9985d38..5d2586f 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java @@ -138,6 +138,11 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi } @Override + public RouteDto loadDto(String routeId) { + return loadEntityToDto(RouteDto.class, routeId); + } + + @Override public FormDto<RouteDto> loadToEdit(String routeId) { Route route = loadEntity(RouteDto.class, Route.class, routeId); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java index 4b1a163..630aa11 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java @@ -63,6 +63,11 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein } @Override + public SetSeineDto loadDto(String setSeineId) { + return loadEntityToDto(SetSeineDto.class, setSeineId); + } + + @Override public FormDto<SetSeineDto> loadToEdit(String setSeineId) { SetSeine setSeine = loadEntity(SetSeineDto.class, SetSeine.class, setSeineId); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java index 83d6cb3..727d4e9 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java @@ -39,6 +39,7 @@ import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.TargetLengthDto; import fr.ird.observe.services.dto.seine.TargetSampleDto; +import org.apache.commons.lang3.BooleanUtils; import java.util.Collection; import java.util.LinkedHashSet; @@ -109,9 +110,8 @@ public class TargetSampleServiceTopia extends ObserveServiceTopia implements Tar // si echantillon rejeté : on ne conserve que les espèces rejectées montées sur le pont // sinon les espèce cible - if (discarded && targetCatch.isDiscarded() && targetCatch.getBroughtOnDeck() - || - !discarded && !targetCatch.isDiscarded()) { + if ( discarded && targetCatch.isDiscarded() && BooleanUtils.isTrue(targetCatch.getBroughtOnDeck()) + || !discarded && !targetCatch.isDiscarded()) { speciesSet.add(targetCatch.getWeightCategory().getSpecies()); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java index e4dbe6f..7a82317 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java @@ -106,6 +106,13 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe } @Override + public TripSeineDto loadDto(String tripSeineId) { + + TripSeineDto dto= loadEntityToDto(TripSeineDto.class, tripSeineId); + return dto; + } + + @Override public TripMapDto getTripSeineMap(String tripSeineId) { LinkedHashSet<TripMapPointDto> points = getDao().extractTripMapActivityPoints(tripSeineId); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.