August 2015 - Observe-commits - mailman.cloud.codelutin.com

branch develop updated (3c0bec6 -> 819491b)
by codelutin.com scm 29 Aug '15

29 Aug '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 3c0bec6 Définir l'API des services (termine #7458) \o/ Merge branch 'feature/7458-LonglineTopiaService' into develop new ceead9a Ajout de méthodes utiles sur certaines entités + amélioration du code de recherche des RTP (See #7488) new 1163ce4 Mise en place de consolidation des données sur les marées Seine Reste à finaliser le contenu des résultats See #7488 new af84d4d Sérialiser les objets + quelques améliorations de code new 4c1bcb5 Déplacement de l'implantation du service de consolidation (See #7488) new 96578ad Ajout de décorateurs sur les entités new 6f72a08 Ajout d'un exception si la relation RTP n'est pas trouvée new 79bfa04 Ajout de la locale applicative (mais cela devra certainement être redescendu au niveau du service context) new 5e48a71 Ajout des résultats de l'action de consolidation des données de marée Seine (See #7488) new 0a38d0d Ajout et nettoyage des clefs sur le module de persistence new 41aebf8 Revue des logs et ajout d'un test sur le service (See #7488) new 819491b Nouvelle implantation du service de consolidation des données (termine #7488) Merge branch 'feature/7488' into develop The 11 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 819491b546b0acf55ecf805dc04e260039b4e57a Merge: 3c0bec6 41aebf8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Aug 29 11:49:36 2015 +0200 Nouvelle implantation du service de consolidation des données (termine #7488) Merge branch 'feature/7488' into develop commit 41aebf8295434f06402d89137231ca794fab9c50 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Aug 29 11:49:18 2015 +0200 Revue des logs et ajout d'un test sur le service (See #7488) commit 0a38d0d5f867d14fc2b4028d6e0833adae02fd0c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Aug 29 11:35:43 2015 +0200 Ajout et nettoyage des clefs sur le module de persistence commit 5e48a71456549f04d9163766519eddc64f53855f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Aug 29 10:47:46 2015 +0200 Ajout des résultats de l'action de consolidation des données de marée Seine (See #7488) commit 79bfa048ccd925f5db4847e14305978c879d2175 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Aug 29 10:07:28 2015 +0200 Ajout de la locale applicative (mais cela devra certainement être redescendu au niveau du service context) commit 6f72a08c5233fc8bfbca6536c5566c62b6cd86d5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Aug 29 10:05:54 2015 +0200 Ajout d'un exception si la relation RTP n'est pas trouvée commit 96578ad25d0a6ca99938db41d2c6b2f26a97dcea Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Aug 29 10:05:37 2015 +0200 Ajout de décorateurs sur les entités commit 4c1bcb53528a8453c3c3a9a107f70930aab66920 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Aug 29 08:26:13 2015 +0200 Déplacement de l'implantation du service de consolidation (See #7488) commit af84d4d7dd6194c15fa2a7ef0ffba82d08054fa1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Aug 28 22:29:13 2015 +0200 Sérialiser les objets + quelques améliorations de code commit 1163ce4c15e14be824f5e42150c2891556e22e16 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Aug 28 12:27:59 2015 +0200 Mise en place de consolidation des données sur les marées Seine Reste à finaliser le contenu des résultats See #7488 commit ceead9a2c960628ade5b08f66bc2178574127af4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Aug 28 12:27:27 2015 +0200 Ajout de méthodes utiles sur certaines entités + amélioration du code de recherche des RTP (See #7488) Summary of changes: .../seine/NonTargetCatchComputedValueSource.java | 6 +- .../entities/constants/seine/SchoolType.java | 6 +- .../seine/TypeTransmittingBuoyOperation.java | 10 +- .../DuplicateLengthWeightParameterException.java | 52 ++ .../referentiel/I18nReferenceEntities.java | 23 + .../LengthWeightParameterNotFoundException.java | 45 ++ ...eterHelper.java => LengthWeightParameters.java} | 229 +++++-- .../referentiel/LengthWeightParemeterHelper.java | 23 +- .../ird/observe/entities/referentiel/Species2.java | 25 + .../ird/observe/entities/seine/ActivitySeines.java | 9 + .../observe/entities/seine/NonTargetCatches.java | 16 + .../fr/ird/observe/entities/seine/SetSeines.java | 33 + .../fr/ird/observe/entities/seine/TripSeines.java | 28 + .../i18n/observe-entities_en_GB.properties | 23 +- .../i18n/observe-entities_es_ES.properties | 25 +- .../i18n/observe-entities_fr_FR.properties | 23 +- .../services/ObserveServiceApplicationContext.java | 15 + .../observe/services/ObserveServiceContext.java | 4 +- .../ConsolidateActivitySeineDataResult.java | 208 ++++++ .../ConsolidateTripSeineDataRequest.java | 44 ++ .../ConsolidateTripSeineDataResult.java | 52 ++ .../consolidate/ConsolidationDataService.java | 25 + observe-services-topia/pom.xml | 23 + .../services/ObserveServiceContextTopia.java | 6 + .../ConsolidateActivitySeineDataResultBuilder.java | 232 +++++++ .../consolidate/ConsolidationDataServiceTopia.java | 715 +++++++++++++++++++++ .../i18n/observe-services-topia_en_GB.properties | 2 + .../i18n/observe-services-topia_es_ES.properties | 2 + .../i18n/observe-services-topia_fr_FR.properties | 2 + .../services/ApplicationContextResource.java | 2 + .../ConsolidationDataServiceTopiaTest.java | 55 ++ 31 files changed, 1834 insertions(+), 129 deletions(-) create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/referentiel/DuplicateLengthWeightParameterException.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterNotFoundException.java copy observe-entities/src/main/java/fr/ird/observe/entities/referentiel/{LengthWeightParemeterHelper.java => LengthWeightParameters.java} (58%) create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatches.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/seine/SetSeines.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeines.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataRequest.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataResult.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidationDataService.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidationDataServiceTopia.java create mode 100644 observe-services-topia/src/main/resources/i18n/observe-services-topia_en_GB.properties create mode 100644 observe-services-topia/src/main/resources/i18n/observe-services-topia_es_ES.properties create mode 100644 observe-services-topia/src/main/resources/i18n/observe-services-topia_fr_FR.properties create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/consolidate/ConsolidationDataServiceTopiaTest.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 11

branch feature/7488 deleted (was 8740cfe)
by codelutin.com scm 29 Aug '15

29 Aug '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7488 in repository observe. See http://git.codelutin.com/observe.git was 8740cfe Sérialiser les objets + quelques améliorations de code This change permanently discards the following revisions: discards 8740cfe Sérialiser les objets + quelques améliorations de code discards 89f9a9a Mise en place de consolidation des données sur les marées Seine Reste à finaliser le contenu des résultats See #7488 discards a9b44ea Ajout de méthodes utiles sur certaines entités + amélioration du code de recherche des RTP (See #7488) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch develop updated (e3890a1 -> 3c0bec6)
by codelutin.com scm 28 Aug '15

28 Aug '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from e3890a1 correction des la génération des bases pour les test. new 0d89aa9 implantation TripLonglineService (refs #7458). new 2cb18d6 implantation GearUseFeaturesLonglineService (refs #7458). new 202e925 implantation ActivityLonglineService (refs #7458). new 16363ab changement d'implantaton de la transformation de l'entité en formulaire. new fe02687 implantation ActivityLongLineEncouterService (refs #7458). new ac88c69 implantation ActivityLongLineEncouterService (refs #7458). new 2a2dda6 implantation ActivityLongLineSensorUsedService (refs #7458). new f193a5d implantation SetLonglineService (refs #7458). new 1cf8a06 implantation SetLonglineGlobalCompositionService (refs #7458). new 1805145 implantation SetLonglineDetailCompositionService (refs #7458). new 6fd93d9 implantation SetLonglineCatchService (refs #7458). new 0d63899 implantation TdrServiceTopia (refs #7458). new 949a51b Renommage méthode new 77d6e0d corrections suite aux tests new 3c0bec6 Définir l'API des services (termine #7458) \o/ Merge branch 'feature/7458-LonglineTopiaService' into develop The 15 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 3c0bec699c2db2b40c9fc25acc3c6ab7bd9c00e3 Merge: e3890a1 77d6e0d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Aug 28 22:32:41 2015 +0200 Définir l'API des services (termine #7458) \o/ Merge branch 'feature/7458-LonglineTopiaService' into develop commit 77d6e0def28c7d4b5cd22c114946d50be8a5dc83 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Aug 28 09:20:54 2015 +0200 corrections suite aux tests commit 949a51bf763b385579da92dac517d4e72d7f46c0 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 27 17:36:01 2015 +0200 Renommage méthode commit 0d638992a71a10b6199b1bff6f46c462b6594df4 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 27 17:21:06 2015 +0200 implantation TdrServiceTopia (refs #7458). commit 6fd93d9ea5681d4a75548bd4706dc65d5aed114e Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 27 17:11:31 2015 +0200 implantation SetLonglineCatchService (refs #7458). commit 1805145aa42f84e6a470feb8d60ef41169869761 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 27 15:27:13 2015 +0200 implantation SetLonglineDetailCompositionService (refs #7458). commit 1cf8a0677bc11d3637a110f352482439f8b7885b Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 27 12:54:45 2015 +0200 implantation SetLonglineGlobalCompositionService (refs #7458). commit f193a5d8f597195665fdee63f880e9dfe290791f Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 27 12:42:33 2015 +0200 implantation SetLonglineService (refs #7458). commit 2a2dda632d89e2ad5341823fedcaf216b79914e7 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 27 12:29:02 2015 +0200 implantation ActivityLongLineSensorUsedService (refs #7458). commit ac88c69c54f95d318cd5684cb6b0d03a0e5e076c Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 27 12:25:27 2015 +0200 implantation ActivityLongLineEncouterService (refs #7458). commit fe026872f3c399da0e9f26a4605077ef8d6d1bc4 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 27 12:23:19 2015 +0200 implantation ActivityLongLineEncouterService (refs #7458). commit 16363ab5f30b5388c888e9d8acfc4cd2ff629076 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 27 12:16:32 2015 +0200 changement d'implantaton de la transformation de l'entité en formulaire. commit 202e9253993e0f1a4371d606c05a4bd54aa43ec3 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 27 11:19:47 2015 +0200 implantation ActivityLonglineService (refs #7458). commit 2cb18d62f4b73f8988f9ecd5ccbba2f3ed3125ff Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 27 10:07:34 2015 +0200 implantation GearUseFeaturesLonglineService (refs #7458). commit 0d89aa90898607bee65e92027a273494c17ae1ae Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 27 09:38:21 2015 +0200 implantation TripLonglineService (refs #7458). Summary of changes: .../entities/longline/TripLonglineTopiaDao.java | 4 +- .../ActivityLongLineSensorUsedService.java | 3 +- .../service/longline/ActivityLonglineService.java | 29 ++++ .../longline/GearUseFeaturesLonglineService.java | 4 +- ...neService.java => SetLonglineCatchService.java} | 5 +- .../SetLonglineDetailCompositionService.java | 8 +- .../service/longline/SetLonglineService.java | 5 +- .../service/longline/TripLonglineService.java | 4 +- .../xmi/observe-services-dto-longline.properties | 8 +- .../main/xmi/observe-services-dto-longline.zargo | Bin 57340 -> 59030 bytes .../services/dto/ObserveDtosInitializer.java | 30 ++-- .../ActivityLongLineEncouterServiceTopia.java | 54 +++++++ .../ActivityLongLineSensorUsedServiceTopia.java | 54 +++++++ .../longline/ActivityLonglineServiceTopia.java | 161 ++++++++++++++++++++ .../GearUseFeaturesLonglineServiceTopia.java | 115 ++++++++++++++ .../longline/SetLonglineCatchServiceTopia.java | 76 ++++++++++ .../SetLonglineDetailCompositionServiceTopia.java | 63 ++++++++ .../SetLonglineGlobalCompositionServiceTopia.java | 62 ++++++++ .../service/longline/SetLonglineServiceTopia.java | 112 ++++++++++++++ .../services/service/longline/TdrServiceTopia.java | 66 ++++++++ .../service/longline/TripLonglineServiceTopia.java | 114 ++++++++++++++ ...tLonglineDetailCompositionServiceTopiaTest.java | 168 +++++++++++++++++++++ ...ServiceTest.java => RouteServiceTopiaTest.java} | 2 +- 23 files changed, 1112 insertions(+), 35 deletions(-) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java rename observe-services-api/src/main/java/fr/ird/observe/services/service/longline/{CatchLonglineService.java => SetLonglineCatchService.java} (88%) create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/GearUseFeaturesLonglineServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TdrServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java rename observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/{RouteServiceTest.java => RouteServiceTopiaTest.java} (95%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 15

branch feature/7458-LonglineTopiaService deleted (was 77d6e0d)
by codelutin.com scm 28 Aug '15

28 Aug '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7458-LonglineTopiaService in repository observe. See http://git.codelutin.com/observe.git was 77d6e0d corrections suite aux tests This change permanently discards the following revisions: discards 77d6e0d corrections suite aux tests discards 949a51b Renommage méthode discards 0d63899 implantation TdrServiceTopia (refs #7458). discards 6fd93d9 implantation SetLonglineCatchService (refs #7458). discards 1805145 implantation SetLonglineDetailCompositionService (refs #7458). discards 1cf8a06 implantation SetLonglineGlobalCompositionService (refs #7458). discards f193a5d implantation SetLonglineService (refs #7458). discards 2a2dda6 implantation ActivityLongLineSensorUsedService (refs #7458). discards ac88c69 implantation ActivityLongLineEncouterService (refs #7458). discards fe02687 implantation ActivityLongLineEncouterService (refs #7458). discards 16363ab changement d'implantaton de la transformation de l'entité en formulaire. discards 202e925 implantation ActivityLonglineService (refs #7458). discards 2cb18d6 implantation GearUseFeaturesLonglineService (refs #7458). discards 0d89aa9 implantation TripLonglineService (refs #7458). -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

01/01: Sérialiser les objets + quelques améliorations de code
by codelutin.com scm 28 Aug '15

28 Aug '15

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7488 in repository observe. See http://git.codelutin.com/observe.git commit 8740cfebce6fb7fd7930bdeb2589bbe18d576b4b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Aug 28 22:29:13 2015 +0200 Sérialiser les objets + quelques améliorations de code --- .../ConsolidateActivitySeineDataResult.java | 5 +- .../ConsolidateTripSeineDataRequest.java | 8 +++- .../ConsolidateTripSeineDataResult.java | 13 ++--- .../service/ConsolidationDataServiceTopia.java | 56 ++++++++++++---------- 4 files changed, 45 insertions(+), 37 deletions(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java index 0298edd..8cc778f 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java @@ -1,5 +1,6 @@ package fr.ird.observe.services.service.actions.consolidate; +import java.io.Serializable; import java.util.Date; /** @@ -9,7 +10,9 @@ import java.util.Date; * * @author Tony Chemit - chemit(a)codelutin.com */ -public class ConsolidateActivitySeineDataResult { +public class ConsolidateActivitySeineDataResult implements Serializable { + + private static final long serialVersionUID = 1L; protected String schoolTypeChanged; diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataRequest.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataRequest.java index 5205e33..a43081f 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataRequest.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataRequest.java @@ -2,15 +2,19 @@ package fr.ird.observe.services.service.actions.consolidate; import com.google.common.collect.ImmutableSet; +import java.io.Serializable; + /** * Pour configurer l'opération de consolidation. * * Created on 28/08/15. * * @author Tony Chemit - chemit(a)codelutin.com - * @see ConsolidationDataService#consolidateTripSeine(String) + * @see ConsolidationDataService#consolidateTripSeines(ConsolidateTripSeineDataRequest) */ -public class ConsolidateTripSeineDataRequest { +public class ConsolidateTripSeineDataRequest implements Serializable { + + private static final long serialVersionUID = 1L; protected ImmutableSet<String> tripSeineIds; diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataResult.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataResult.java index ff9c6a1..7da61b1 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataResult.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateTripSeineDataResult.java @@ -1,5 +1,6 @@ package fr.ird.observe.services.service.actions.consolidate; +import java.io.Serializable; import java.util.LinkedHashSet; import java.util.Set; @@ -9,22 +10,18 @@ import java.util.Set; * Created on 28/08/15. * * @author Tony Chemit - chemit(a)codelutin.com - * @see ConsolidationDataService#consolidateTripSeine(String) + * @see ConsolidationDataService#consolidateTripSeines(ConsolidateTripSeineDataRequest) */ -public class ConsolidateTripSeineDataResult { +public class ConsolidateTripSeineDataResult implements Serializable{ - protected boolean noActivityFound; + private static final long serialVersionUID = 1L; protected boolean tripWasModified; protected final Set<ConsolidateActivitySeineDataResult> activitySeineDataResults = new LinkedHashSet<>(); public boolean isNoActivityFound() { - return noActivityFound; - } - - public void setNoActivityFound(boolean noActivityFound) { - this.noActivityFound = noActivityFound; + return activitySeineDataResults.isEmpty(); } public boolean isTripWasModified() { diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ConsolidationDataServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ConsolidationDataServiceTopia.java index 13ef1a9..4f033a4 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ConsolidationDataServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ConsolidationDataServiceTopia.java @@ -1,7 +1,6 @@ package fr.ird.observe.services.service; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; import fr.ird.observe.entities.LengthWeightComputable; import fr.ird.observe.entities.constants.seine.NonTargetCatchComputedValueSource; import fr.ird.observe.entities.constants.seine.SchoolType; @@ -35,7 +34,6 @@ import org.nuiton.util.beans.BeanMonitor; import java.util.Collection; import java.util.Date; -import java.util.Set; /** * Created on 28/08/15. @@ -107,12 +105,14 @@ public class ConsolidationDataServiceTopia extends ObserveServiceTopia implement public void flushTargetLength() { if (targetLengthMonitor.wasModified()) { TargetLength targetLength = (TargetLength) targetLengthMonitor.getBean(); - Set<String> modifiedProperties = Sets.newHashSet(targetLengthMonitor.getModifiedProperties()); - if (modifiedProperties.contains(TargetLength.PROPERTY_LENGTH)) { - consolidateActivitySeineDataResult.registerTargetLengthLengthWasComputed(targetLength.getTopiaId(), targetLength.getLength()); - } - if (modifiedProperties.contains(TargetLength.PROPERTY_WEIGHT)) { - consolidateActivitySeineDataResult.registerTargetLengthWeightWasComputed(targetLength.getTopiaId(), targetLength.getWeight()); + Species species = targetLength.getSpecies(); + String speciesLabel = ""; + for (String modifiedProperty : targetLengthMonitor.getModifiedProperties()) { + if (modifiedProperty.equals(TargetLength.PROPERTY_LENGTH)) { + consolidateActivitySeineDataResult.registerTargetLengthLengthWasComputed(targetLength.getTopiaId(), targetLength.getLength()); + } else if (modifiedProperty.equals(TargetLength.PROPERTY_WEIGHT)) { + consolidateActivitySeineDataResult.registerTargetLengthWeightWasComputed(targetLength.getTopiaId(), targetLength.getWeight()); + } } } targetLengthMonitor.setBean(null); @@ -121,13 +121,16 @@ public class ConsolidationDataServiceTopia extends ObserveServiceTopia implement public void flushNonTargetLength() { if (nonTargetLengthMonitor.wasModified()) { NonTargetLength nonTargetLength = (NonTargetLength) nonTargetLengthMonitor.getBean(); - Set<String> modifiedProperties = Sets.newHashSet(nonTargetLengthMonitor.getModifiedProperties()); - if (modifiedProperties.contains(NonTargetLength.PROPERTY_LENGTH)) { - consolidateActivitySeineDataResult.registerNonTargetLengthLengthWasComputed(nonTargetLength.getTopiaId(), nonTargetLength.getLength()); - } - if (modifiedProperties.contains(NonTargetLength.PROPERTY_WEIGHT)) { - consolidateActivitySeineDataResult.registerNonTargetLengthWeightWasComputed(nonTargetLength.getTopiaId(), nonTargetLength.getWeight()); + Species species = nonTargetLength.getSpecies(); + String speciesLabel = ""; + for (String modifiedProperty : nonTargetLengthMonitor.getModifiedProperties()) { + if (modifiedProperty.equals(NonTargetLength.PROPERTY_LENGTH)) { + consolidateActivitySeineDataResult.registerNonTargetLengthLengthWasComputed(nonTargetLength.getTopiaId(), nonTargetLength.getLength()); + } else if (modifiedProperty.equals(NonTargetLength.PROPERTY_WEIGHT)) { + consolidateActivitySeineDataResult.registerNonTargetLengthWeightWasComputed(nonTargetLength.getTopiaId(), nonTargetLength.getWeight()); + } } + } nonTargetLengthMonitor.setBean(null); } @@ -139,19 +142,20 @@ public class ConsolidationDataServiceTopia extends ObserveServiceTopia implement public void flushNonTargetCatch() { if (nonTargetCatchMonitor.wasModified()) { NonTargetCatch nonTargetCatch = (NonTargetCatch) nonTargetCatchMonitor.getBean(); - Set<String> modifiedProperties = Sets.newHashSet(nonTargetCatchMonitor.getModifiedProperties()); - if (modifiedProperties.contains(NonTargetCatch.PROPERTY_MEAN_LENGTH)) { - consolidateActivitySeineDataResult.registerNonTargetCatchMeanLengthWasComputed(nonTargetCatch.getTopiaId(), nonTargetCatch.getMeanLength(), nonTargetCatch.getMeanLengthComputedSource().name()); - } - if (modifiedProperties.contains(NonTargetCatch.PROPERTY_MEAN_WEIGHT)) { - consolidateActivitySeineDataResult.registerNonTargetCatchMeanWeightWasComputed(nonTargetCatch.getTopiaId(), nonTargetCatch.getMeanWeight(), nonTargetCatch.getMeanWeightComputedSource().name()); - } - if (modifiedProperties.contains(NonTargetCatch.PROPERTY_CATCH_WEIGHT)) { - consolidateActivitySeineDataResult.registerNonTargetCatchCatchWeightWasComputed(nonTargetCatch.getTopiaId(), nonTargetCatch.getCatchWeight(), nonTargetCatch.getCatchWeightComputedSource().name()); - } - if (modifiedProperties.contains(NonTargetCatch.PROPERTY_TOTAL_COUNT)) { - consolidateActivitySeineDataResult.registerNonTargetCatchTotalCountWasComputed(nonTargetCatch.getTopiaId(), nonTargetCatch.getTotalCount(), nonTargetCatch.getTotalCountComputedSource().name()); + Species species = nonTargetCatch.getSpecies(); + String speciesLabel = ""; + for (String modifiedProperty : nonTargetCatchMonitor.getModifiedProperties()) { + if (modifiedProperty.equals(NonTargetCatch.PROPERTY_MEAN_LENGTH)) { + consolidateActivitySeineDataResult.registerNonTargetCatchMeanLengthWasComputed(nonTargetCatch.getTopiaId(), nonTargetCatch.getMeanLength(), nonTargetCatch.getMeanLengthComputedSource().name()); + } else if (modifiedProperty.equals(NonTargetCatch.PROPERTY_MEAN_WEIGHT)) { + consolidateActivitySeineDataResult.registerNonTargetCatchMeanWeightWasComputed(nonTargetCatch.getTopiaId(), nonTargetCatch.getMeanWeight(), nonTargetCatch.getMeanWeightComputedSource().name()); + } else if (modifiedProperty.equals(NonTargetCatch.PROPERTY_CATCH_WEIGHT)) { + consolidateActivitySeineDataResult.registerNonTargetCatchCatchWeightWasComputed(nonTargetCatch.getTopiaId(), nonTargetCatch.getCatchWeight(), nonTargetCatch.getCatchWeightComputedSource().name()); + } else if (modifiedProperty.equals(NonTargetCatch.PROPERTY_TOTAL_COUNT)) { + consolidateActivitySeineDataResult.registerNonTargetCatchTotalCountWasComputed(nonTargetCatch.getTopiaId(), nonTargetCatch.getTotalCount(), nonTargetCatch.getTotalCountComputedSource().name()); + } } + } nonTargetCatchMonitor.setBean(null); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch feature/7488 updated (89f9a9a -> 8740cfe)
by codelutin.com scm 28 Aug '15

28 Aug '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7488 in repository observe. See http://git.codelutin.com/observe.git from 89f9a9a Mise en place de consolidation des données sur les marées Seine Reste à finaliser le contenu des résultats See #7488 new 8740cfe Sérialiser les objets + quelques améliorations de code The 1 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 8740cfebce6fb7fd7930bdeb2589bbe18d576b4b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Aug 28 22:29:13 2015 +0200 Sérialiser les objets + quelques améliorations de code Summary of changes: .../ConsolidateActivitySeineDataResult.java | 5 +- .../ConsolidateTripSeineDataRequest.java | 8 +++- .../ConsolidateTripSeineDataResult.java | 13 ++--- .../service/ConsolidationDataServiceTopia.java | 56 ++++++++++++---------- 4 files changed, 45 insertions(+), 37 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

branch feature/7488 updated (6d1a554 -> 89f9a9a)
by codelutin.com scm 28 Aug '15

28 Aug '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7488 in repository observe. See http://git.codelutin.com/observe.git discards 6d1a554 Mise en place de consolidation des données sur les marées Seine Reste à finaliser le contenu des résultats See #7488 discards 35d2b0d Ajout de méthodes utiles sur certaines entités + amélioration du code de recherche des RTP (See #7488) adds e3890a1 correction des la génération des bases pour les test. new a9b44ea Ajout de méthodes utiles sur certaines entités + amélioration du code de recherche des RTP (See #7488) new 89f9a9a Mise en place de consolidation des données sur les marées Seine Reste à finaliser le contenu des résultats See #7488 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 (6d1a554) \ N -- N -- N refs/heads/feature/7488 (89f9a9a) 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 89f9a9af644cf2da72a630733bcd8b63d55905cf Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Aug 28 12:27:59 2015 +0200 Mise en place de consolidation des données sur les marées Seine Reste à finaliser le contenu des résultats See #7488 commit a9b44ea954ff94b1f9a06d19a2075dd57a495595 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Aug 28 12:27:27 2015 +0200 Ajout de méthodes utiles sur certaines entités + amélioration du code de recherche des RTP (See #7488) Summary of changes: .../services/ApplicationContextResource.java | 21 ++++++----- .../ird/observe/services/DataSourceResource.java | 41 ++++++++++++++-------- .../services/service/AbstractServiceTopiaTest.java | 17 +++++++-- .../service/DataSourceServiceTopiaTest.java | 2 +- .../main/java/fr/ird/observe/test/TestHelper.java | 4 +++ 5 files changed, 56 insertions(+), 29 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 2

branch feature/7488 created (now 6d1a554)
by codelutin.com scm 28 Aug '15

28 Aug '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7488 in repository observe. See http://git.codelutin.com/observe.git at 6d1a554 Mise en place de consolidation des données sur les marées Seine Reste à finaliser le contenu des résultats See #7488 This branch includes the following new commits: new 35d2b0d Ajout de méthodes utiles sur certaines entités + amélioration du code de recherche des RTP (See #7488) new 6d1a554 Mise en place de consolidation des données sur les marées Seine Reste à finaliser le contenu des résultats See #7488 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 6d1a5545f75bcf92b70e74ef01325570bbbaecd7 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Aug 28 12:27:59 2015 +0200 Mise en place de consolidation des données sur les marées Seine Reste à finaliser le contenu des résultats See #7488 commit 35d2b0d35315751140f28d775131cd0b08de0165 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Aug 28 12:27:27 2015 +0200 Ajout de méthodes utiles sur certaines entités + amélioration du code de recherche des RTP (See #7488) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 2

branch feature/7458-LonglineTopiaService updated (6e6dc41 -> 77d6e0d)
by codelutin.com scm 28 Aug '15

28 Aug '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7458-LonglineTopiaService in repository observe. See http://git.codelutin.com/observe.git discards 6e6dc41 corrections suite aux tests discards 2dd7e5c Renommage méthode discards 0a11123 implantation TdrServiceTopia (refs #7458). discards 025cbcc implantation SetLonglineCatchService (refs #7458). discards 36e3dfc implantation SetLonglineDetailCompositionService (refs #7458). discards 24de12d implantation SetLonglineGlobalCompositionService (refs #7458). discards 4883e40 implantation SetLonglineService (refs #7458). discards 060f1e6 implantation ActivityLongLineSensorUsedService (refs #7458). discards 321e597 implantation ActivityLongLineEncouterService (refs #7458). discards a34cfc9 implantation ActivityLongLineEncouterService (refs #7458). discards 013cf10 changement d'implantaton de la transformation de l'entité en formulaire. discards 7561a49 implantation ActivityLonglineService (refs #7458). discards 824c4ac implantation GearUseFeaturesLonglineService (refs #7458). discards 556c120 implantation TripLonglineService (refs #7458). adds e3890a1 correction des la génération des bases pour les test. new 0d89aa9 implantation TripLonglineService (refs #7458). new 2cb18d6 implantation GearUseFeaturesLonglineService (refs #7458). new 202e925 implantation ActivityLonglineService (refs #7458). new 16363ab changement d'implantaton de la transformation de l'entité en formulaire. new fe02687 implantation ActivityLongLineEncouterService (refs #7458). new ac88c69 implantation ActivityLongLineEncouterService (refs #7458). new 2a2dda6 implantation ActivityLongLineSensorUsedService (refs #7458). new f193a5d implantation SetLonglineService (refs #7458). new 1cf8a06 implantation SetLonglineGlobalCompositionService (refs #7458). new 1805145 implantation SetLonglineDetailCompositionService (refs #7458). new 6fd93d9 implantation SetLonglineCatchService (refs #7458). new 0d63899 implantation TdrServiceTopia (refs #7458). new 949a51b Renommage méthode new 77d6e0d corrections suite aux tests 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 (6e6dc41) \ N -- N -- N refs/heads/feature/7458-LonglineTopiaService (77d6e0d) 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 14 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 77d6e0def28c7d4b5cd22c114946d50be8a5dc83 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Aug 28 09:20:54 2015 +0200 corrections suite aux tests commit 949a51bf763b385579da92dac517d4e72d7f46c0 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 27 17:36:01 2015 +0200 Renommage méthode commit 0d638992a71a10b6199b1bff6f46c462b6594df4 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 27 17:21:06 2015 +0200 implantation TdrServiceTopia (refs #7458). commit 6fd93d9ea5681d4a75548bd4706dc65d5aed114e Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 27 17:11:31 2015 +0200 implantation SetLonglineCatchService (refs #7458). commit 1805145aa42f84e6a470feb8d60ef41169869761 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 27 15:27:13 2015 +0200 implantation SetLonglineDetailCompositionService (refs #7458). commit 1cf8a0677bc11d3637a110f352482439f8b7885b Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 27 12:54:45 2015 +0200 implantation SetLonglineGlobalCompositionService (refs #7458). commit f193a5d8f597195665fdee63f880e9dfe290791f Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 27 12:42:33 2015 +0200 implantation SetLonglineService (refs #7458). commit 2a2dda632d89e2ad5341823fedcaf216b79914e7 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 27 12:29:02 2015 +0200 implantation ActivityLongLineSensorUsedService (refs #7458). commit ac88c69c54f95d318cd5684cb6b0d03a0e5e076c Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 27 12:25:27 2015 +0200 implantation ActivityLongLineEncouterService (refs #7458). commit fe026872f3c399da0e9f26a4605077ef8d6d1bc4 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 27 12:23:19 2015 +0200 implantation ActivityLongLineEncouterService (refs #7458). commit 16363ab5f30b5388c888e9d8acfc4cd2ff629076 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 27 12:16:32 2015 +0200 changement d'implantaton de la transformation de l'entité en formulaire. commit 202e9253993e0f1a4371d606c05a4bd54aa43ec3 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 27 11:19:47 2015 +0200 implantation ActivityLonglineService (refs #7458). commit 2cb18d62f4b73f8988f9ecd5ccbba2f3ed3125ff Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 27 10:07:34 2015 +0200 implantation GearUseFeaturesLonglineService (refs #7458). commit 0d89aa90898607bee65e92027a273494c17ae1ae Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Thu Aug 27 09:38:21 2015 +0200 implantation TripLonglineService (refs #7458). Summary of changes: .../services/ApplicationContextResource.java | 21 ++++++----- .../ird/observe/services/DataSourceResource.java | 41 ++++++++++++++-------- .../services/service/AbstractServiceTopiaTest.java | 17 +++++++-- .../service/DataSourceServiceTopiaTest.java | 2 +- .../main/java/fr/ird/observe/test/TestHelper.java | 4 +++ 5 files changed, 56 insertions(+), 29 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 14

branch develop updated (ca2178d -> e3890a1)
by codelutin.com scm 28 Aug '15

28 Aug '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from ca2178d Correction de l'api de migration suite au cherry-pcik new e3890a1 correction des la génération des bases pour les test. The 1 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 e3890a1af45cfbf092aebb44234c882c38d3fadf Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Aug 28 11:38:26 2015 +0200 correction des la génération des bases pour les test. Summary of changes: .../services/ApplicationContextResource.java | 21 ++++++----- .../ird/observe/services/DataSourceResource.java | 41 ++++++++++++++-------- .../services/service/AbstractServiceTopiaTest.java | 17 +++++++-- .../service/DataSourceServiceTopiaTest.java | 2 +- .../main/java/fr/ird/observe/test/TestHelper.java | 4 +++ 5 files changed, 56 insertions(+), 29 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1