branch feature/7463 updated (f7490c6 -> c579af1)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7463 in repository observe. See http://git.codelutin.com/observe.git discards f7490c6 controleur pour seine pour le serveur web (refs #7463) discards 073aaaf premier controleur pour le serveur web (refs #7463) adds c3a48f1 mise en place du service de validation (refs #7493) adds c97b146 ajout du test du service de validation (refs #7493) adds 9ff038a Ajout de propertyChange listener sur les entités (See #7493) adds 6c724df Implantation du service de validation (See #7493) adds 73d72d0 Debut d'intégration des validateurs d'entités (See #7493) adds fdaf365 Fix validation test (See #7493) adds e3c79cb recupération des différents types de dto adds ac1f0ff Renommage de certains objets Simplificiation du détecteur de messages (on n'utilise plus les références sur entités) See #7493 adds 70d655b Tout sur develop (mais il reste encore à gerer les traductions des messages) See #7493 Merge branch 'feature/7493' into develop adds 4a0089a implantation du service de generation des rapport + test (refs #7498) adds a43149f implantation du service de generation des rapport + test (refs #7498) adds 9f49fbf implantation du service de generation des rapport + test (refs #7498) adds dd58708 Merge sur develop (termine #7498) adds 0fcf540 Renommage services de consolidation adds 88e7990 Ajout d'un adapter Gson pour les Class adds 3ba643f Ajout de méthodes de création des différentes datasources new 6cf362b premier controleur pour le serveur web (refs #7463) new c579af1 controleur pour seine pour le serveur web (refs #7463) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (f7490c6) \ N -- N -- N refs/heads/feature/7463 (c579af1) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c579af126d7bb0ae06ba37f8449e87e1389e54de Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Sep 3 16:40:30 2015 +0200 controleur pour seine pour le serveur web (refs #7463) commit 6cf362b76f2d25baaf2648f3ed8201104f3d5c2f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Sep 3 16:18:08 2015 +0200 premier controleur pour le serveur web (refs #7463) Summary of changes: .../ObserveWebSecurityApplicationContext.java | 2 + .../fr/ird/observe/AbstractObserveTopiaDao.java | 18 + .../ird/observe/entities/seine/ActivitySeines.java | 160 ++++ .../src/main/xmi/observe-common.properties | 1 + .../src/main/xmi/observe-longline.properties | 1 + .../src/main/xmi/observe-seine.properties | 1 + observe-services-api/pom.xml | 29 +- .../src/main/filters/observe-reports.properties | 8 +- ...ataService.java => ConsolidateDataService.java} | 2 +- .../service/actions}/report/ReportBuilder.java | 17 +- .../service/actions/report/ReportService.java | 20 + .../service/actions}/report/model/DataMatrix.java | 2 +- .../service/actions}/report/model/Report.java | 15 +- .../actions}/report/model/ReportOperation.java | 20 +- .../actions}/report/model/ReportRequest.java | 63 +- .../actions}/report/model/ReportVariable.java | 27 +- .../report/model/operations/ExecuteRequests.java | 45 +- .../report/model/operations/GroupByLength.java | 20 +- .../report/model/operations/SumColumn.java | 25 +- .../report/model/operations/SumIntColumn.java | 25 +- .../report/model/operations/SumIntRow.java | 25 +- .../actions}/report/model/operations/SumRow.java | 25 +- .../actions/validate/ValidateDataRequest.java | 54 ++ .../actions/validate/ValidateDataResult.java | 32 + .../validate/ValidateReferentialsRequest.java | 55 ++ .../validate/ValidateReferentialsResult.java | 32 + .../actions/validate/ValidateResultForDtoType.java | 28 + .../service/actions/validate/ValidateService.java | 25 + .../actions/validate/ValidationMessage.java | 45 + .../actions/validate/ValidationResultForDto.java | 34 + ...es.service.actions.report.model.ReportOperation | 6 + .../service/actions/report/ReportBuilderTest.java | 130 +++ .../actions/report/observe-reports-test.properties | 27 + .../observe/services/dto/gson/ClassAdapter.java | 42 + .../services/dto/gson/ObserveDtoGsonSupplier.java | 1 + .../ObserveDataSourceConfigurationMainFactory.java | 52 +- observe-services-topia/pom.xml | 9 + .../ird/observe/services/ObserveServiceTopia.java | 33 + ...Topia.java => ConsolidateDataServiceTopia.java} | 4 +- .../service/actions/report/ReportServiceTopia.java | 207 +++++ .../service/actions/validate/ObserveValidator.java | 166 ++++ .../actions/validate/ValidateServiceTopia.java | 226 +++++ .../actions/validate/ValidationDataContext.java | 181 ++++ .../validate/ValidationMessageDetector.java | 489 +++++++++++ .../service/actions/validate}/ValidatorsMap.java | 24 +- ...t.java => ConsolidateDataServiceTopiaTest.java} | 6 +- .../report/AbstractReportServiceTopiaTest.java | 150 ++-- .../actions/report/ReportAccessoryCatch2Test.java | 199 +++++ .../report/ReportAccessoryCatchByGroup2Test.java | 68 ++ .../report/ReportAccessoryCatchByGroupTest.java | 100 +++ .../actions/report/ReportAccessoryCatchTest.java | 156 ++++ .../report/ReportActivityWithCommentTest.java | 348 ++++++++ .../actions/report/ReportAllActivitysTest.java | 943 +++++++++++++++++++++ .../actions/report/ReportDailySetAndCatchTest.java | 61 +- .../service/actions/report/ReportDcpUsageTest.java | 67 +- .../report/ReportSetByAssociation2Test.java | 14 +- .../actions/report/ReportSetByAssociationTest.java | 26 +- .../report/ReportTargetCatchByAssociationTest.java | 66 +- .../ReportTargetDiscardedByAssociationTest.java | 66 +- .../actions/validate/ValidateServiceTopiaTest.java | 207 +++++ observe-validation/pom.xml | 4 +- .../field/ActivityDebutDePecheSaneValidator.java | 9 +- .../field/ActivityFinDePecheSaneValidator.java | 11 +- .../field/ActivityFinDeVeilleExistsValidator.java | 3 +- .../field/ActivitySimpleSpeedValidator.java | 27 +- .../validation/field/ActivitySpeedValidator.java | 30 +- .../validation/field/OpenableFieldValidator.java | 138 --- .../field/RouteActivitysFieldValidator.java | 7 +- .../field/SetLonglineUniqueHomeIdValidator.java | 14 +- .../field/SetLonglineUniqueNumberValidator.java | 14 +- .../field/VesselActivityFieldValidator.java | 49 +- .../TripLongline-n1-update-warning-validation.xml | 10 +- .../seine/Route-n1-update-warning-validation.xml | 6 +- .../TripSeine-n1-update-warning-validation.xml | 6 +- .../src/main/resources/validators.xml | 2 +- .../validation/BeanValidatorDetectorTest.java | 4 +- .../field/ActivitySeineSpeedValidatorTest.java | 3 +- .../field/OpenableEntityFieldValidatorTest.java | 82 -- .../seine/TripSeine-testOpen-error-validation.xml | 32 - pom.xml | 2 +- 80 files changed, 4660 insertions(+), 723 deletions(-) create mode 100644 observe-entities/src/main/java/fr/ird/observe/AbstractObserveTopiaDao.java copy {observe-business => observe-services-api}/src/main/filters/observe-reports.properties (99%) rename observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/{ConsolidationDataService.java => ConsolidateDataService.java} (92%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/ReportBuilder.java (97%) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/report/ReportService.java copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/DataMatrix.java (99%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/Report.java (88%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/ReportOperation.java (82%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/ReportRequest.java (86%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/ReportVariable.java (71%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/operations/ExecuteRequests.java (70%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/operations/GroupByLength.java (83%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/operations/SumColumn.java (84%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/operations/SumIntColumn.java (84%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/operations/SumIntRow.java (84%) copy {observe-business/src/main/java/fr/ird/observe => observe-services-api/src/main/java/fr/ird/observe/services/service/actions}/report/model/operations/SumRow.java (84%) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataRequest.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateDataResult.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsRequest.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateReferentialsResult.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessage.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationResultForDto.java create mode 100644 observe-services-api/src/main/resources/META-INF/services/fr.ird.observe.services.service.actions.report.model.ReportOperation create mode 100644 observe-services-api/src/test/java/fr/ird/observe/services/service/actions/report/ReportBuilderTest.java create mode 100644 observe-services-api/src/test/resources/fr/ird/observe/services/service/actions/report/observe-reports-test.properties create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ClassAdapter.java rename observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/{ConsolidationDataServiceTopia.java => ConsolidateDataServiceTopia.java} (99%) create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/report/ReportServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ObserveValidator.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationDataContext.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessageDetector.java copy {observe-business/src/main/java/fr/ird/observe/validation => observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate}/ValidatorsMap.java (75%) rename observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/consolidate/{ConsolidationDataServiceTopiaTest.java => ConsolidateDataServiceTopiaTest.java} (88%) copy observe-business/src/test/java/fr/ird/observe/its/report/AbstractReportIT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/AbstractReportServiceTopiaTest.java (60%) create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatch2Test.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroup2Test.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchByGroupTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAccessoryCatchTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportActivityWithCommentTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportAllActivitysTest.java copy observe-business/src/test/java/fr/ird/observe/its/report/dailySetAndCatch/ReportIT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDailySetAndCatchTest.java (53%) copy observe-business/src/test/java/fr/ird/observe/its/report/dcpUsage/ReportIT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportDcpUsageTest.java (55%) copy observe-business/src/test/java/fr/ird/observe/its/report/setByAssociation/Report2IT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportSetByAssociation2Test.java (85%) copy observe-business/src/test/java/fr/ird/observe/its/report/setByAssociation/ReportIT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportSetByAssociationTest.java (83%) copy observe-business/src/test/java/fr/ird/observe/its/report/targetCatchByAssociation/ReportIT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetCatchByAssociationTest.java (56%) copy observe-business/src/test/java/fr/ird/observe/its/report/targetDiscardedByAssociation/ReportIT.java => observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportTargetDiscardedByAssociationTest.java (55%) create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/validate/ValidateServiceTopiaTest.java delete mode 100644 observe-validation/src/main/java/fr/ird/observe/validation/field/OpenableFieldValidator.java delete mode 100644 observe-validation/src/test/java/fr/ird/observe/validation/field/OpenableEntityFieldValidatorTest.java delete mode 100644 observe-validation/src/test/resources/fr/ird/observe/entities/seine/TripSeine-testOpen-error-validation.xml -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7463 in repository observe. See http://git.codelutin.com/observe.git commit 6cf362b76f2d25baaf2648f3ed8201104f3d5c2f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Sep 3 16:18:08 2015 +0200 premier controleur pour le serveur web (refs #7463) --- .../ObserveWebApplicationConfiguration.java | 37 ++++++++-------- .../v1/ReferentialServiceController.java | 4 -- ...tivitySeineObservedSystemServiceController.java | 30 +++++++++++++ .../v1/seine/ActivitySeineServiceController.java | 46 ++++++++++++++++++++ .../v1/seine/TripSeineServiceController.java | 49 ++++++++++++++++++++++ observe-application-web/src/main/resources/mapping | 8 ++-- .../service/seine/TripSeineServiceTopia.java | 3 ++ 7 files changed, 151 insertions(+), 26 deletions(-) diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java index 8570f7b..794f34d 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfiguration.java @@ -50,24 +50,6 @@ public class ObserveWebApplicationConfiguration { ApplicationConfigProvider applicationConfigProvider = ApplicationConfigHelper.getProvider(getClass().getClassLoader(), ObserveWebApplicationConfigurationProvider.OBSERVE_WEB_CONFIGURATION_PROVIDER_NAME); applicationConfig.loadDefaultOptions(applicationConfigProvider.getOptions()); - if (isDevMode()) { - - // on utilise un répertoire temporaire comme basedir - File basedir; - - try { - Set<PosixFilePermission> posixFilePermissions = PosixFilePermissions.fromString("rwxr-x---"); - FileAttribute<Set<PosixFilePermission>> fileAttribute = PosixFilePermissions.asFileAttribute(posixFilePermissions); - basedir = Files.createTempDirectory("observeweb", fileAttribute).toFile(); - } catch (IOException e) { - throw new ObserveWebApplicationConfigurationInitException("could not create temporary basedir", e); - } - if (log.isInfoEnabled()) { - log.info("Dev mode detected, use temporary basedir: " + basedir); - } - applicationConfig.setOption(ObserveWebApplicationConfigurationOption.BASE_DIRECTORY.getKey(), basedir.getAbsolutePath()); - - } } public boolean isDevMode() { @@ -113,12 +95,29 @@ public class ObserveWebApplicationConfiguration { throw new ObserveWebApplicationConfigurationInitException("could not parse configuration", e); } + File applicationBaseDirectory = getBaseDirectory(); + + if (isDevMode() && !applicationBaseDirectory.exists()) { + // on utilise un répertoire temporaire comme basedir + + try { + Set<PosixFilePermission> posixFilePermissions = PosixFilePermissions.fromString("rwxr-x---"); + FileAttribute<Set<PosixFilePermission>> fileAttribute = PosixFilePermissions.asFileAttribute(posixFilePermissions); + applicationBaseDirectory = Files.createTempDirectory("observeweb", fileAttribute).toFile(); + } catch (IOException e) { + throw new ObserveWebApplicationConfigurationInitException("could not create temporary basedir", e); + } + if (log.isInfoEnabled()) { + log.info("Dev mode detected, use temporary basedir: " + applicationBaseDirectory); + } + applicationConfig.setOption(ObserveWebApplicationConfigurationOption.BASE_DIRECTORY.getKey(), applicationBaseDirectory.getAbsolutePath()); + } + if (log.isInfoEnabled()) { String message = getConfigurationDescription(); log.info(message); } - File applicationBaseDirectory = getBaseDirectory(); try { createDirectory(applicationBaseDirectory); } catch (IOException e) { diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java index 502e370..1901580 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java @@ -5,7 +5,6 @@ import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.service.DataNotFoundException; import fr.ird.observe.services.service.ReferentialService; -import fr.ird.observe.services.spi.Write; import org.debux.webmotion.server.WebMotionContextable; import java.util.Collection; @@ -48,19 +47,16 @@ public class ReferentialServiceController extends ObserveServiceControllerSuppor } @Override - @Write public <R extends ReferentialDto> String save(FormDto<R> form) { return service.save(form); } @Override - @Write public <R extends ReferentialDto> void delete(Class<R> type, String id) throws DataNotFoundException { service.delete(type, id); } @Override - @Write public <R extends ReferentialDto> void delete(Class<R> type, Collection<String> ids) throws DataNotFoundException { service.delete(type, ids); } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java new file mode 100644 index 0000000..4d3571c --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java @@ -0,0 +1,30 @@ +package fr.ird.observe.application.web.controller.v1.seine; + +import fr.ird.observe.application.web.controller.v1.ObserveServiceControllerSupport; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; +import fr.ird.observe.services.service.seine.ActivitySeineObservedSystemService; +import fr.ird.observe.services.spi.Write; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class ActivitySeineObservedSystemServiceController extends ObserveServiceControllerSupport<ActivitySeineObservedSystemService> implements ActivitySeineObservedSystemService { + + public ActivitySeineObservedSystemServiceController() { + super(ActivitySeineObservedSystemService.class); + } + + public FormDto<ActivitySeineObservedSystemDto> loadToRead(String activitySeineId) { + return service.loadToRead(activitySeineId); + } + + public FormDto<ActivitySeineObservedSystemDto> loadToEdit(String activitySeineId) { + return service.loadToEdit(activitySeineId); + } + + @Write + public String save(FormDto<ActivitySeineObservedSystemDto> form) { + return service.save(form); + } +} 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 new file mode 100644 index 0000000..51df759 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java @@ -0,0 +1,46 @@ +package fr.ird.observe.application.web.controller.v1.seine; + +import fr.ird.observe.application.web.controller.v1.ObserveServiceControllerSupport; +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.service.seine.ActivitySeineService; +import fr.ird.observe.services.spi.Write; + +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class ActivitySeineServiceController extends ObserveServiceControllerSupport<ActivitySeineService> implements ActivitySeineService { + + public ActivitySeineServiceController() { + super(ActivitySeineService.class); + } + + public List<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId) { + return service.getActivitySeineStubByRoute(routeId); + } + + public FormDto<ActivitySeineDto> loadToRead(String activitySeineId) { + return service.loadToRead(activitySeineId); + } + + public FormDto<ActivitySeineDto> loadToEdit(String activitySeineId) { + return service.loadToEdit(activitySeineId); + } + + public FormDto<ActivitySeineDto> preCreate(String routeId) { + return service.preCreate(routeId); + } + + @Write + public String save(String routeId, FormDto<ActivitySeineDto> form) { + return service.save(routeId, form); + } + + @Write + public void delete(String routeId, String activitySeineId) { + service.delete(routeId, activitySeineId); + } +} 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 new file mode 100644 index 0000000..96bc2b1 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java @@ -0,0 +1,49 @@ +package fr.ird.observe.application.web.controller.v1.seine; + +import fr.ird.observe.application.web.controller.v1.ObserveServiceControllerSupport; +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.service.seine.TripSeineService; + +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class TripSeineServiceController extends ObserveServiceControllerSupport<TripSeineService> implements TripSeineService { + + public TripSeineServiceController() { + super(TripSeineService.class); + } + + @Override + public List<TripSeineStubDto> getTripSeineByProgram(String programId) { + return service.getTripSeineByProgram(programId); + } + + @Override + public FormDto<TripSeineDto> loadToRead(String tripSeineId) { + return service.loadToRead(tripSeineId); + } + + @Override + public FormDto<TripSeineDto> loadToEdit(String tripSeineId) { + return service.loadToEdit(tripSeineId); + } + + @Override + public FormDto<TripSeineDto> preCreate(String programId) { + return service.preCreate(programId); + } + + @Override + public String save(FormDto<TripSeineDto> form) { + return service.save(form); + } + + @Override + public void delete(String tripSeineId) { + service.delete(tripSeineId); + } +} diff --git a/observe-application-web/src/main/resources/mapping b/observe-application-web/src/main/resources/mapping index 0fdc07a..b5936f8 100644 --- a/observe-application-web/src/main/resources/mapping +++ b/observe-application-web/src/main/resources/mapping @@ -40,7 +40,9 @@ default.render=fr.ird.observe.application.web.ObserveWebMotionRender [actions] -GET /admin/configuration/{method} ConfigurationController.{method} -GET,POST /api/v1/referential/{method} ReferentialServiceController.{method} -GET,POST /api/v1/dataSource/{method} DataSourceServiceController.{method} +GET /admin/configuration/{method} ConfigurationController.{method} +GET,POST /api/v1/{service}/{method} {service}Controller.{method} +GET,POST /api/v1/{package}/{service}/{method} {package}.{service}Controller.{method} + + 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 8b74739..f799ba5 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 @@ -30,6 +30,9 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe ReferenceLocale referenceLocale = getReferenceLocale(); + // pour verifier l'existance du programme + loadEntity(ProgramDto.class, Program.class, programId); + List<TripSeine> tripSeines = getDao().findAllStubByProgramId(programId, referenceLocale); List<TripSeineStubDto> stubs = Lists.newLinkedList(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7463 in repository observe. See http://git.codelutin.com/observe.git commit c579af126d7bb0ae06ba37f8449e87e1389e54de Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Sep 3 16:40:30 2015 +0200 controleur pour seine pour le serveur web (refs #7463) --- ...tivitySeineObservedSystemServiceController.java | 5 ++- .../v1/seine/ActivitySeineServiceController.java | 9 ++-- .../v1/seine/FloatingObjectServiceController.java | 49 ++++++++++++++++++++++ .../GearUseFeaturesSeineServiceController.java | 48 +++++++++++++++++++++ .../v1/seine/NonTargetCatchServiceController.java | 31 ++++++++++++++ .../v1/seine/NonTargetSampleServiceController.java | 36 ++++++++++++++++ .../ObjectObservedSpeciesServiceController.java | 31 ++++++++++++++ .../ObjectSchoolEstimateServiceController.java | 31 ++++++++++++++ .../v1/seine/RouteServiceController.java | 49 ++++++++++++++++++++++ .../v1/seine/SchoolEstimateServiceController.java | 31 ++++++++++++++ .../v1/seine/SetSeineServiceController.java | 41 ++++++++++++++++++ .../v1/seine/TargetCatchServiceController.java | 31 ++++++++++++++ .../v1/seine/TargetSampleServiceController.java | 36 ++++++++++++++++ ...TransmittingBuoyOperationServiceController.java | 31 ++++++++++++++ .../service/seine/NonTargetSampleService.java | 3 +- 15 files changed, 456 insertions(+), 6 deletions(-) diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java index 4d3571c..ef4e749 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java @@ -4,7 +4,6 @@ import fr.ird.observe.application.web.controller.v1.ObserveServiceControllerSupp import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; import fr.ird.observe.services.service.seine.ActivitySeineObservedSystemService; -import fr.ird.observe.services.spi.Write; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -15,15 +14,17 @@ public class ActivitySeineObservedSystemServiceController extends ObserveService super(ActivitySeineObservedSystemService.class); } + @Override public FormDto<ActivitySeineObservedSystemDto> loadToRead(String activitySeineId) { return service.loadToRead(activitySeineId); } + @Override public FormDto<ActivitySeineObservedSystemDto> loadToEdit(String activitySeineId) { return service.loadToEdit(activitySeineId); } - @Write + @Override public String save(FormDto<ActivitySeineObservedSystemDto> form) { return service.save(form); } 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 51df759..d8090b6 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 @@ -5,7 +5,6 @@ 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.service.seine.ActivitySeineService; -import fr.ird.observe.services.spi.Write; import java.util.List; @@ -18,28 +17,32 @@ public class ActivitySeineServiceController extends ObserveServiceControllerSupp super(ActivitySeineService.class); } + @Override public List<ActivitySeineStubDto> getActivitySeineStubByRoute(String routeId) { return service.getActivitySeineStubByRoute(routeId); } + @Override public FormDto<ActivitySeineDto> loadToRead(String activitySeineId) { return service.loadToRead(activitySeineId); } + @Override public FormDto<ActivitySeineDto> loadToEdit(String activitySeineId) { return service.loadToEdit(activitySeineId); } + @Override public FormDto<ActivitySeineDto> preCreate(String routeId) { return service.preCreate(routeId); } - @Write + @Override public String save(String routeId, FormDto<ActivitySeineDto> form) { return service.save(routeId, form); } - @Write + @Override public void delete(String routeId, String activitySeineId) { service.delete(routeId, 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 new file mode 100644 index 0000000..0a6c5ab --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java @@ -0,0 +1,49 @@ +package fr.ird.observe.application.web.controller.v1.seine; + +import fr.ird.observe.application.web.controller.v1.ObserveServiceControllerSupport; +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.service.seine.FloatingObjectService; + +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class FloatingObjectServiceController extends ObserveServiceControllerSupport<FloatingObjectService> implements FloatingObjectService { + + public FloatingObjectServiceController() { + super(FloatingObjectService.class); + } + + @Override + public List<FloatingObjectStubDto> getFloatingObjectStubByActivitySeine(String activitySeineId) { + return service.getFloatingObjectStubByActivitySeine(activitySeineId); + } + + @Override + public FormDto<FloatingObjectDto> loadToRead(String floatingObjectId) { + return service.loadToRead(floatingObjectId); + } + + @Override + public FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId) { + return service.loadToEdit(floatingObjectId); + } + + @Override + public FormDto<FloatingObjectDto> preCreate(String activitySeineId) { + return service.preCreate(activitySeineId); + } + + @Override + public String save(String activitySeineId, FormDto<FloatingObjectDto> form) { + return service.save(activitySeineId, form); + } + + @Override + public void delete(String activitySeineId, String floatingObjectId) { + service.delete(activitySeineId, floatingObjectId); + } +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/GearUseFeaturesSeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/GearUseFeaturesSeineServiceController.java new file mode 100644 index 0000000..8e554b8 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/GearUseFeaturesSeineServiceController.java @@ -0,0 +1,48 @@ +package fr.ird.observe.application.web.controller.v1.seine; + +import fr.ird.observe.application.web.controller.v1.ObserveServiceControllerSupport; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; +import fr.ird.observe.services.service.seine.GearUseFeaturesSeineService; + +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class GearUseFeaturesSeineServiceController extends ObserveServiceControllerSupport<GearUseFeaturesSeineService> implements GearUseFeaturesSeineService { + + public GearUseFeaturesSeineServiceController() { + super(GearUseFeaturesSeineService.class); + } + + @Override + public List<GearUseFeaturesSeineDto> getGearUseFeaturesSeineByTripSeine(String tripSeineId) { + return service.getGearUseFeaturesSeineByTripSeine(tripSeineId); + } + + @Override + public FormDto<GearUseFeaturesSeineDto> loadToRead(String gearUseFeaturesSeineId) { + return service.loadToRead(gearUseFeaturesSeineId); + } + + @Override + public FormDto<GearUseFeaturesSeineDto> loadToEdit(String gearUseFeaturesSeineId) { + return service.loadToEdit(gearUseFeaturesSeineId); + } + + @Override + public FormDto<GearUseFeaturesSeineDto> preCreate() { + return service.preCreate(); + } + + @Override + public String save(String tripSeineId, FormDto<GearUseFeaturesSeineDto> form) { + return service.save(tripSeineId, form); + } + + @Override + public void delete(String tripSeineId, String gearUseFeaturesSeineId) { + service.delete(tripSeineId, gearUseFeaturesSeineId); + } +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetCatchServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetCatchServiceController.java new file mode 100644 index 0000000..8bc43a5 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetCatchServiceController.java @@ -0,0 +1,31 @@ +package fr.ird.observe.application.web.controller.v1.seine; + +import fr.ird.observe.application.web.controller.v1.ObserveServiceControllerSupport; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; +import fr.ird.observe.services.service.seine.NonTargetCatchService; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class NonTargetCatchServiceController extends ObserveServiceControllerSupport<NonTargetCatchService> implements NonTargetCatchService { + + public NonTargetCatchServiceController() { + super(NonTargetCatchService.class); + } + + @Override + public FormDto<SetSeineNonTargetCatchDto> loadToRead(String setSeineId) { + return service.loadToRead(setSeineId); + } + + @Override + public FormDto<SetSeineNonTargetCatchDto> loadToEdit(String setSeineId) { + return service.loadToEdit(setSeineId); + } + + @Override + public String save(FormDto<SetSeineNonTargetCatchDto> form) { + return service.save(form); + } +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetSampleServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetSampleServiceController.java new file mode 100644 index 0000000..739ffe9 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/NonTargetSampleServiceController.java @@ -0,0 +1,36 @@ +package fr.ird.observe.application.web.controller.v1.seine; + +import fr.ird.observe.application.web.controller.v1.ObserveServiceControllerSupport; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.seine.NonTargetSampleDto; +import fr.ird.observe.services.service.seine.NonTargetSampleService; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class NonTargetSampleServiceController extends ObserveServiceControllerSupport<NonTargetSampleService> implements NonTargetSampleService { + + public NonTargetSampleServiceController() { + super(NonTargetSampleService.class); + } + + @Override + public boolean canUseNonTargetSample(String setSeineId) { + return service.canUseNonTargetSample(setSeineId); + } + + @Override + public FormDto<NonTargetSampleDto> loadToRead(String setSeineId) { + return service.loadToRead(setSeineId); + } + + @Override + public FormDto<NonTargetSampleDto> loadToEdit(String setSeineId) { + return service.loadToEdit(setSeineId); + } + + @Override + public String save(String setSeineId, FormDto<NonTargetSampleDto> form) { + return service.save(setSeineId, form); + } +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectObservedSpeciesServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectObservedSpeciesServiceController.java new file mode 100644 index 0000000..ad80bd6 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectObservedSpeciesServiceController.java @@ -0,0 +1,31 @@ +package fr.ird.observe.application.web.controller.v1.seine; + +import fr.ird.observe.application.web.controller.v1.ObserveServiceControllerSupport; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; +import fr.ird.observe.services.service.seine.ObjectObservedSpeciesService; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class ObjectObservedSpeciesServiceController extends ObserveServiceControllerSupport<ObjectObservedSpeciesService> implements ObjectObservedSpeciesService { + + public ObjectObservedSpeciesServiceController() { + super(ObjectObservedSpeciesService.class); + } + + @Override + public FormDto<FloatingObjectObservedSpeciesDto> loadToRead(String floatingObjectId) { + return service.loadToRead(floatingObjectId); + } + + @Override + public FormDto<FloatingObjectObservedSpeciesDto> loadToEdit(String floatingObjectId) { + return service.loadToEdit(floatingObjectId); + } + + @Override + public String save(FormDto<FloatingObjectObservedSpeciesDto> form) { + return service.save(form); + } +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectSchoolEstimateServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectSchoolEstimateServiceController.java new file mode 100644 index 0000000..c72d496 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ObjectSchoolEstimateServiceController.java @@ -0,0 +1,31 @@ +package fr.ird.observe.application.web.controller.v1.seine; + +import fr.ird.observe.application.web.controller.v1.ObserveServiceControllerSupport; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; +import fr.ird.observe.services.service.seine.ObjectSchoolEstimateService; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class ObjectSchoolEstimateServiceController extends ObserveServiceControllerSupport<ObjectSchoolEstimateService> implements ObjectSchoolEstimateService { + + public ObjectSchoolEstimateServiceController() { + super(ObjectSchoolEstimateService.class); + } + + @Override + public FormDto<FloatingObjectSchoolEstimateDto> loadToRead(String floatingObjectId) { + return service.loadToRead(floatingObjectId); + } + + @Override + public FormDto<FloatingObjectSchoolEstimateDto> loadToEdit(String floatingObjectId) { + return service.loadToEdit(floatingObjectId); + } + + @Override + public String save(FormDto<FloatingObjectSchoolEstimateDto> form) { + return service.save(form); + } +} 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 new file mode 100644 index 0000000..4e1ac4b --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java @@ -0,0 +1,49 @@ +package fr.ird.observe.application.web.controller.v1.seine; + +import fr.ird.observe.application.web.controller.v1.ObserveServiceControllerSupport; +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.service.seine.RouteService; + +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class RouteServiceController extends ObserveServiceControllerSupport<RouteService> implements RouteService { + + public RouteServiceController() { + super(RouteService.class); + } + + @Override + public List<RouteStubDto> getRouteByTripSeine(String tripSeineId) { + return service.getRouteByTripSeine(tripSeineId); + } + + @Override + public FormDto<RouteDto> loadToRead(String routeId) { + return service.loadToRead(routeId); + } + + @Override + public FormDto<RouteDto> loadToEdit(String routeId) { + return service.loadToEdit(routeId); + } + + @Override + public FormDto<RouteDto> preCreate(String tripSeineId) { + return service.preCreate(tripSeineId); + } + + @Override + public String save(String tripSeineId, FormDto<RouteDto> form) { + return service.save(tripSeineId, form); + } + + @Override + public void delete(String tripSeineId, String routeId) { + service.delete(tripSeineId, routeId); + } +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SchoolEstimateServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SchoolEstimateServiceController.java new file mode 100644 index 0000000..ba2485f --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SchoolEstimateServiceController.java @@ -0,0 +1,31 @@ +package fr.ird.observe.application.web.controller.v1.seine; + +import fr.ird.observe.application.web.controller.v1.ObserveServiceControllerSupport; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; +import fr.ird.observe.services.service.seine.SchoolEstimateService; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class SchoolEstimateServiceController extends ObserveServiceControllerSupport<SchoolEstimateService> implements SchoolEstimateService { + + public SchoolEstimateServiceController() { + super(SchoolEstimateService.class); + } + + @Override + public FormDto<SetSeineSchoolEstimateDto> loadToRead(String setSeineId) { + return service.loadToRead(setSeineId); + } + + @Override + public FormDto<SetSeineSchoolEstimateDto> loadToEdit(String setSeineId) { + return service.loadToEdit(setSeineId); + } + + @Override + public String save(FormDto<SetSeineSchoolEstimateDto> form) { + return service.save(form); + } +} 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 new file mode 100644 index 0000000..65250e0 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java @@ -0,0 +1,41 @@ +package fr.ird.observe.application.web.controller.v1.seine; + +import fr.ird.observe.application.web.controller.v1.ObserveServiceControllerSupport; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.service.seine.SetSeineService; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class SetSeineServiceController extends ObserveServiceControllerSupport<SetSeineService> implements SetSeineService { + + public SetSeineServiceController() { + super(SetSeineService.class); + } + + @Override + public FormDto<SetSeineDto> loadToRead(String setSeineId) { + return service.loadToRead(setSeineId); + } + + @Override + public FormDto<SetSeineDto> loadToEdit(String setSeineId) { + return service.loadToEdit(setSeineId); + } + + @Override + public FormDto<SetSeineDto> preCreate(String routeId, String activitySeineId) { + return service.preCreate(routeId, activitySeineId); + } + + @Override + public String save(String activitySeineId, FormDto<SetSeineDto> form) { + return service.save(activitySeineId, form); + } + + @Override + public void delete(String activitySeineId, String setSeineId) { + service.delete(activitySeineId, setSeineId); + } +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetCatchServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetCatchServiceController.java new file mode 100644 index 0000000..529ee75 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetCatchServiceController.java @@ -0,0 +1,31 @@ +package fr.ird.observe.application.web.controller.v1.seine; + +import fr.ird.observe.application.web.controller.v1.ObserveServiceControllerSupport; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; +import fr.ird.observe.services.service.seine.TargetCatchService; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class TargetCatchServiceController extends ObserveServiceControllerSupport<TargetCatchService> implements TargetCatchService { + + public TargetCatchServiceController() { + super(TargetCatchService.class); + } + + @Override + public FormDto<SetSeineTargetCatchDto> loadToRead(String setSeineId) { + return service.loadToRead(setSeineId); + } + + @Override + public FormDto<SetSeineTargetCatchDto> loadToEdit(String setSeineId) { + return service.loadToEdit(setSeineId); + } + + @Override + public String save(FormDto<SetSeineTargetCatchDto> form) { + return service.save(form); + } +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetSampleServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetSampleServiceController.java new file mode 100644 index 0000000..1495e2b --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TargetSampleServiceController.java @@ -0,0 +1,36 @@ +package fr.ird.observe.application.web.controller.v1.seine; + +import fr.ird.observe.application.web.controller.v1.ObserveServiceControllerSupport; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.seine.TargetSampleDto; +import fr.ird.observe.services.service.seine.TargetSampleService; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class TargetSampleServiceController extends ObserveServiceControllerSupport<TargetSampleService> implements TargetSampleService { + + public TargetSampleServiceController() { + super(TargetSampleService.class); + } + + @Override + public boolean canUseTargetSample(String setSeineId, boolean discarded) { + return service.canUseTargetSample(setSeineId, discarded); + } + + @Override + public FormDto<TargetSampleDto> loadToRead(String setSeineId, boolean discarded) { + return service.loadToRead(setSeineId, discarded); + } + + @Override + public FormDto<TargetSampleDto> loadToEdit(String setSeineId, boolean discarded) { + return service.loadToEdit(setSeineId, discarded); + } + + @Override + public String save(String setSeineId, FormDto<TargetSampleDto> form) { + return service.save(setSeineId, form); + } +} diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TransmittingBuoyOperationServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TransmittingBuoyOperationServiceController.java new file mode 100644 index 0000000..ae48852 --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TransmittingBuoyOperationServiceController.java @@ -0,0 +1,31 @@ +package fr.ird.observe.application.web.controller.v1.seine; + +import fr.ird.observe.application.web.controller.v1.ObserveServiceControllerSupport; +import fr.ird.observe.services.dto.FormDto; +import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; +import fr.ird.observe.services.service.seine.TransmittingBuoyOperationService; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class TransmittingBuoyOperationServiceController extends ObserveServiceControllerSupport<TransmittingBuoyOperationService> implements TransmittingBuoyOperationService { + + public TransmittingBuoyOperationServiceController() { + super(TransmittingBuoyOperationService.class); + } + + @Override + public FormDto<FloatingObjectTransmittingBuoyDto> loadToRead(String floatingObjectId) { + return service.loadToRead(floatingObjectId); + } + + @Override + public FormDto<FloatingObjectTransmittingBuoyDto> loadToEdit(String floatingObjectId) { + return service.loadToEdit(floatingObjectId); + } + + @Override + public String save(FormDto<FloatingObjectTransmittingBuoyDto> form) { + return service.save(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 a4a7299..664e759 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 @@ -1,5 +1,6 @@ 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.Write; @@ -7,7 +8,7 @@ import fr.ird.observe.services.spi.Write; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -public interface NonTargetSampleService { +public interface NonTargetSampleService extends ObserveService { boolean canUseNonTargetSample(String setSeineId); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm