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

branch feature/7458-4 updated (0e30315 -> c59457a)
by codelutin.com scm 25 Aug '15

25 Aug '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7458-4 in repository observe. See http://git.codelutin.com/observe.git from 0e30315 ajout d'un DTO stub pour les tripSeine et modification des service + ajout du test du delete (refs #7458). new c59457a correction du test pour TripSeineServiceTopia (refs #7458). 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 c59457ac2e5bac3e3609c86d66ad270ad933049e Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Aug 25 10:42:43 2015 +0200 correction du test pour TripSeineServiceTopia (refs #7458). Summary of changes: .../entities/constants/ReferenceLocale.java | 14 ++-- .../observe/entities/seine/TripSeineTopiaDao.java | 4 +- .../services/service/AbstractServiceTopiaTest.java | 76 +++++++++++++++++++ .../service/ReferentialServiceTopiaTest.java | 39 ++++------ .../service/seine/TripSeineServiceTopiaTest.java | 86 ++++++---------------- 5 files changed, 123 insertions(+), 96 deletions(-) create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/AbstractServiceTopiaTest.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/7458-4 updated (615fdd1 -> 0e30315)
by codelutin.com scm 25 Aug '15

25 Aug '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7458-4 in repository observe. See http://git.codelutin.com/observe.git from 615fdd1 déplacement du stéréotype ordered du model zargo dans le fichier de propriétées (refs #7458). new 0e30315 ajout d'un DTO stub pour les tripSeine et modification des service + ajout du test du delete (refs #7458). 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 0e303154f3d596f9aa06d67b988bbab539326f00 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Tue Aug 25 08:40:32 2015 +0200 ajout d'un DTO stub pour les tripSeine et modification des service + ajout du test du delete (refs #7458). Summary of changes: .../entities/constants/ReferenceLocale.java | 35 ++++++++++ .../services/service/seine/TripSeineService.java | 6 +- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 54397 -> 55301 bytes .../ird/observe/services/ObserveServiceTopia.java | 2 +- .../services/dto/ObserveDtosInitializer.java | 5 ++ .../service/seine/TripSeineServiceTopia.java | 25 ++++--- .../ird/observe/services/DataSourceResource.java | 12 ++++ .../services/builder/DtoToEntityBuilderTest.java | 3 +- .../service/seine/TripSeineServiceTopiaTest.java | 72 +++++++++++++++++---- 9 files changed, 132 insertions(+), 28 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/7458-4 updated (37c7478 -> 615fdd1)
by codelutin.com scm 24 Aug '15

24 Aug '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7458-4 in repository observe. See http://git.codelutin.com/observe.git from 37c7478 TripSeineServiceTopia : implantation des tests de sauvegarde. Ne pas regenérer la base de test à chacque début de test (uniquement si des modifications y sont apportées) (refs #7458). new 615fdd1 déplacement du stéréotype ordered du model zargo dans le fichier de propriétées (refs #7458). 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 615fdd18a14e9a94485779584d34948b73dfda0a Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Aug 24 17:15:52 2015 +0200 déplacement du stéréotype ordered du model zargo dans le fichier de propriétées (refs #7458). Summary of changes: .../src/main/xmi/observe-longline.properties | 12 ++++++++++++ .../src/main/xmi/observe-longline.zargo | Bin 96124 -> 96372 bytes .../src/main/xmi/observe-seine.properties | 17 +++++++++++++++++ observe-entities/src/main/xmi/observe-seine.zargo | Bin 85518 -> 85804 bytes 4 files changed, 29 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch feature/7458-4 created (now 37c7478)
by codelutin.com scm 24 Aug '15

24 Aug '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7458-4 in repository observe. See http://git.codelutin.com/observe.git at 37c7478 TripSeineServiceTopia : implantation des tests de sauvegarde. Ne pas regenérer la base de test à chacque début de test (uniquement si des modifications y sont apportées) (refs #7458). This branch includes the following new commits: new 37c7478 TripSeineServiceTopia : implantation des tests de sauvegarde. Ne pas regenérer la base de test à chacque début de test (uniquement si des modifications y sont apportées) (refs #7458). 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 37c7478535d304721925f811438db1c2c2199b8a Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Mon Aug 24 14:03:10 2015 +0200 TripSeineServiceTopia : implantation des tests de sauvegarde. Ne pas regenérer la base de test à chacque début de test (uniquement si des modifications y sont apportées) (refs #7458). -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 1

branch develop updated (bbce2ed -> 730d5a5)
by codelutin.com scm 23 Aug '15

23 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 bbce2ed Migration vers ToPIA 3 (termine #7464) Merge branch 'feature/7464' into develop new 15cb0af Suppression du fromRefactor (on l'a dans le module d'implantation topia) new 730d5a5 Revue de code 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 730d5a55111a8bcecf89b9b61233205a5b5059d5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Aug 23 23:02:01 2015 +0200 Revue de code commit 15cb0af1a29d8683c86a9a29482b3a06d3d280a4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Aug 23 22:58:56 2015 +0200 Suppression du fromRefactor (on l'a dans le module d'implantation topia) Summary of changes: .../fr/ird/observe/services/Commit.java | 20 - .../fr/ird/observe/services/NoTransaction.java | 20 - .../fr/ird/observe/services/ObserveService.java | 26 -- .../observe/services/ObserveServiceContext.java | 84 ---- .../observe/services/ObserveServiceFactory.java | 90 ----- .../services/ObserveServiceFactoryProvider.java | 17 - .../ird/observe/services/ObserveServicesCache.java | 189 --------- .../ird/observe/services/ReplicationService.java | 33 -- .../observe/services/data/DataSelectionModel.java | 440 --------------------- .../ird/observe/services/data/OpenableService.java | 25 -- .../fr/ird/observe/services/data/TripService.java | 36 -- .../data/longline/ActivityLonglineService.java | 31 -- .../data/longline/BaitsCompositionService.java | 20 - .../longline/BranchlinesCompositionService.java | 20 - .../data/longline/CatchLonglineService.java | 34 -- .../services/data/longline/EncounterService.java | 20 - .../longline/FloatlinesCompositionService.java | 20 - .../longline/GearUseFeaturesLonglineService.java | 27 -- .../data/longline/HooksCompositionService.java | 20 - .../longline/LonglineDetailCompositionService.java | 23 -- .../longline/LonglineGlobalCompositionService.java | 16 - .../services/data/longline/SensorUsedService.java | 23 -- .../services/data/longline/SetLonglineService.java | 32 -- .../observe/services/data/longline/TdrService.java | 23 -- .../data/longline/TripLonglineService.java | 33 -- .../services/data/seine/ActivitySeineService.java | 36 -- .../services/data/seine/FloatingObjectService.java | 36 -- .../data/seine/GearUseFeaturesSeineService.java | 27 -- .../services/data/seine/NonTargetCatchService.java | 20 - .../data/seine/NonTargetSampleService.java | 34 -- .../data/seine/ObjectObservedSpeciesService.java | 20 - .../data/seine/ObjectSchoolEstimateService.java | 20 - .../observe/services/data/seine/RouteService.java | 31 -- .../services/data/seine/SchoolEstimateService.java | 20 - .../services/data/seine/SetSeineService.java | 30 -- .../services/data/seine/TargetCatchService.java | 28 -- .../services/data/seine/TargetSampleService.java | 34 -- .../services/data/seine/TripSeineService.java | 33 -- .../services/operation/ComputeDataService.java | 18 - .../services/operation/GpsImportService.java | 27 -- .../operation/ObsoleteReferenceToReplace.java | 111 ------ .../services/operation/SynchronizeService.java | 38 -- .../services/operation/ValidationService.java | 18 - .../referential/AbstractReferentialCache.java | 143 ------- .../services/referential/ReferentialService.java | 70 ---- .../services/service/seine/TripSeineService.java | 7 +- .../ird/observe/services/ObserveServiceTopia.java | 51 +-- .../services/builder/DtoToEntityBuilder.java | 2 +- .../services/builder/EntityToDtoBuilder.java | 10 +- .../builder/EntityToReferenceDtoBuilder.java | 28 +- .../EntityToReferentialReferenceDtoBuilder.java | 6 +- .../services/dto/ObserveDtosInitializer.java | 38 +- .../service/seine/TripSeineServiceTopia.java | 11 +- .../ird/observe/services/DataSourceResource.java | 14 + .../service/seine/TripSeineServiceTopiaTest.java | 29 +- 55 files changed, 128 insertions(+), 2184 deletions(-) delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/Commit.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/NoTransaction.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/ObserveService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/ObserveServiceContext.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/ObserveServiceFactory.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/ObserveServiceFactoryProvider.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/ObserveServicesCache.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/ReplicationService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/DataSelectionModel.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/OpenableService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/TripService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/longline/ActivityLonglineService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/longline/BaitsCompositionService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/longline/BranchlinesCompositionService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/longline/CatchLonglineService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/longline/EncounterService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/longline/FloatlinesCompositionService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/longline/GearUseFeaturesLonglineService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/longline/HooksCompositionService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/longline/LonglineDetailCompositionService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/longline/LonglineGlobalCompositionService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/longline/SensorUsedService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/longline/SetLonglineService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/longline/TdrService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/longline/TripLonglineService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/seine/ActivitySeineService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/seine/FloatingObjectService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/seine/GearUseFeaturesSeineService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/seine/NonTargetCatchService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/seine/NonTargetSampleService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/seine/ObjectObservedSpeciesService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/seine/ObjectSchoolEstimateService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/seine/RouteService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/seine/SchoolEstimateService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/seine/SetSeineService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/seine/TargetCatchService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/seine/TargetSampleService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/data/seine/TripSeineService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/operation/ComputeDataService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/operation/GpsImportService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/operation/ObsoleteReferenceToReplace.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/operation/SynchronizeService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/operation/ValidationService.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/referential/AbstractReferentialCache.java delete mode 100644 observe-services-api/src/main/fromRefactor/fr/ird/observe/services/referential/ReferentialService.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 2

branch develop updated (d348383 -> bbce2ed)
by codelutin.com scm 23 Aug '15

23 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 d348383 Création d'un module pour contenir les données de tests termine #7466 new 8dea399 add DTo test and fix DtoToEntityBuilder (refs #7458). new 70d40f0 use reference for section basket and branchline in catchLongline an Tdr (refs #7458). new 3292d1d add trip seine service topia implement and test (refs #7458). new f326ae4 Retour sur develop Merge branch 'feature/7458-3' into develop new 3bf1bd4 Dependance vers topia 3.0 new 3a6a342 Modification de la configuration du plugin eugene new 0f811e5 Suppression TopiaException new b3586d9 Taiste new b84d3d2 Refacotr module entite new de632ec Portage des DAO dans fr.ird.observe.entities.seine vers ToPIA 3 new 0b2f9f8 mise en forme du service de migration + debut de migration des tag values new ba59e6b On passe sur topia 3.1-SNAPSHOT new 8212d4e Ajout d'une dépendance sur le service de replication dans le module entities new da5dc4d Ajout dépendances sur les drivers jdbc utilisés new 5c7e021 Utilisation des bonnes tag values new f3173ee Exposition des services utilisables sur le context applicatif de topia new b2ccb2d Ajout du nom de la base h2 à utiliser dans la configuration new c8cb4b2 Suppresion de la dépendance sur observe-business dans le module d'implantation des services topia new b9657cb Deplacement de constantes + utilisation du mode autoMigrate dans la migration new d12124b Debut de boot avec topia 3.0, reste à écrire la logique d'ouverture ou création de base new 77f8472 Utilisation de la tag value attributeType new 47dc616 Implantation de création d'une base (See #7464) new 1c83610 L'import d'une base fonctionne, mais pas encore la création d'une base vide (le mapping hibernate n'est pas correcte) (See #7464) new 741a138 Ajout d'une méthode pour tester que toutes les types d'entités sont bien créer sur un base new 58b4582 Ajout d'une usine de ObserveTopiaConfiguration Ajout d'un test de chargement d'une base Ajout d'une méthode sur le context applicatif pour charger un script sql gzippé new 668c914 Ajout d'exceptions et d'annoations qui vont bien sur le service DataSourceService new 949b547 La création d'une base à partir d'un dump et l'ouverture d'une base existante fonctionne new 3133ba1 Rebase de develop new bbce2ed Migration vers ToPIA 3 (termine #7464) Merge branch 'feature/7464' into develop The 29 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 bbce2eded12c44c84e6e018dfa0c3c113e59fd8d Merge: f326ae4 3133ba1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Aug 23 21:58:55 2015 +0200 Migration vers ToPIA 3 (termine #7464) Merge branch 'feature/7464' into develop commit 3133ba193bb3e3a3b2af40217348534455794a67 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Aug 23 21:58:36 2015 +0200 Rebase de develop commit 949b547774abdd6419483c9250438b16cdb7493c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Aug 23 21:12:52 2015 +0200 La création d'une base à partir d'un dump et l'ouverture d'une base existante fonctionne commit 668c914ffcd0bff2b546a05db2e6ba77d42cc4e8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Aug 23 20:33:10 2015 +0200 Ajout d'exceptions et d'annoations qui vont bien sur le service DataSourceService commit 58b458282a1b94169cc9d7b061fb1056c57ffb63 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Aug 23 19:54:23 2015 +0200 Ajout d'une usine de ObserveTopiaConfiguration Ajout d'un test de chargement d'une base Ajout d'une méthode sur le context applicatif pour charger un script sql gzippé commit 741a13826817ce59543b6499905f6cc04982c809 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Aug 23 19:50:07 2015 +0200 Ajout d'une méthode pour tester que toutes les types d'entités sont bien créer sur un base commit 1c83610ba4d97661c002ca6b49971ee030317d4f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Aug 23 04:15:54 2015 +0200 L'import d'une base fonctionne, mais pas encore la création d'une base vide (le mapping hibernate n'est pas correcte) (See #7464) commit 47dc6164bac1a9d5c065eff6d00d464e82205657 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Aug 23 01:34:49 2015 +0200 Implantation de création d'une base (See #7464) commit 77f847202aa99128a6d07c718f1e5498549836e6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Aug 22 21:01:14 2015 +0200 Utilisation de la tag value attributeType commit d12124b6f6a60a31f6fd4a093730ee478c06fee1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Aug 21 19:14:34 2015 +0200 Debut de boot avec topia 3.0, reste à écrire la logique d'ouverture ou création de base commit b9657cba5f77d34a21f3ce1b54fa3e2a4d603f12 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Aug 21 19:07:30 2015 +0200 Deplacement de constantes + utilisation du mode autoMigrate dans la migration commit c8cb4b2054646f25ab8bf4725a85da7bfe4acc19 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Aug 21 19:06:20 2015 +0200 Suppresion de la dépendance sur observe-business dans le module d'implantation des services topia commit b2ccb2d35c4fb2de85459e0da70147e8faf67367 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Aug 21 18:57:17 2015 +0200 Ajout du nom de la base h2 à utiliser dans la configuration commit f3173ee03ffb92dd83a150523e64cb2f6aeff2f6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Aug 21 18:56:46 2015 +0200 Exposition des services utilisables sur le context applicatif de topia commit 5c7e0214f3c9eda71631401df85df6b9ef00160f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Aug 21 18:56:12 2015 +0200 Utilisation des bonnes tag values commit da5dc4d8d13dc9714c5fb73222090ad6ee23536f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Aug 21 18:55:38 2015 +0200 Ajout dépendances sur les drivers jdbc utilisés commit 8212d4e112bc1c39bfb8a80620ebd9b286835559 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Aug 21 18:55:08 2015 +0200 Ajout d'une dépendance sur le service de replication dans le module entities commit ba59e6b4a6639bcfe6625f97500604f8c7f43668 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Aug 21 18:54:34 2015 +0200 On passe sur topia 3.1-SNAPSHOT commit 0b2f9f8276a7920507156972b208c1e81aa6add5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Aug 21 12:47:41 2015 +0200 mise en forme du service de migration + debut de migration des tag values commit de632ec62054d1fe1426143611155becd6f4e94a Author: Brendan Le Ny <bleny(a)codelutin.com> Date: Fri Aug 21 12:16:15 2015 +0200 Portage des DAO dans fr.ird.observe.entities.seine vers ToPIA 3 commit b84d3d20a9af11d21b657f48fc62cf23ef73840f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Aug 21 12:16:38 2015 +0200 Refacotr module entite commit b3586d9f7ba32e40f3bdd9ce108cc46a2d2172fb Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Aug 21 11:45:44 2015 +0200 Taiste commit 0f811e53016fd7269749960a65c37c22e149163d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Aug 21 11:08:41 2015 +0200 Suppression TopiaException commit 3a6a34260a79dfcc60b17593ca077dc3f1be5983 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Aug 21 11:06:54 2015 +0200 Modification de la configuration du plugin eugene commit 3bf1bd4447d5d58a24d69d617020f53295c6befe Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Aug 21 10:57:36 2015 +0200 Dependance vers topia 3.0 commit f326ae4371d6cb2ed672eb2d3a69af8e2119d8f4 Merge: d348383 3292d1d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Aug 23 21:39:34 2015 +0200 Retour sur develop Merge branch 'feature/7458-3' into develop commit 3292d1d82daffac5b7dacc81bcd1c24104619ed3 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Aug 21 18:01:36 2015 +0200 add trip seine service topia implement and test (refs #7458). commit 70d40f085121f1f86bbfb8e94a4b58a1dc0b06c2 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Aug 21 10:14:45 2015 +0200 use reference for section basket and branchline in catchLongline an Tdr (refs #7458). commit 8dea399bbc63246a9c10e35f3a622043bac1f6d1 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Aug 21 09:38:29 2015 +0200 add DTo test and fix DtoToEntityBuilder (refs #7458). Summary of changes: .../src/main/java/fr/ird/observe/DataService.java | 6 +- .../main/java/fr/ird/observe/db/DataSource.java | 2 +- .../java/fr/ird/observe/db/ReplicationService.java | 8 +- .../fr/ird/observe/db/impl/AbstractDataSource.java | 8 +- .../db/impl/AbstractDataSourceProvider.java | 1 - .../java/fr/ird/observe/db/impl/H2DataSource.java | 4 +- .../java/fr/ird/observe/db/impl/PGDataSource.java | 4 +- .../java/fr/ird/observe/db/util/TopiaExecutor.java | 2 +- .../fr/ird/observe/db/util/TopiaExecutor2.java | 2 +- .../fr/ird/observe/report/model/ReportExecute.java | 2 +- .../ird/observe/report/model/ReportOperation.java | 4 +- .../fr/ird/observe/report/model/ReportRequest.java | 6 +- .../report/model/operations/ExecuteRequests.java | 4 +- .../report/model/operations/GroupByLength.java | 4 +- .../observe/report/model/operations/SumColumn.java | 4 +- .../report/model/operations/SumIntColumn.java | 4 +- .../observe/report/model/operations/SumIntRow.java | 4 +- .../observe/report/model/operations/SumRow.java | 4 +- .../src/main/java/fr/ird/observe/util/Scripts.java | 30 +-- .../validation/ValidationMessageDetector.java | 2 +- .../ird/observe/validation/ValidationService.java | 2 +- .../test/java/fr/ird/observe/db/DBTestHelper.java | 31 ++- .../java/fr/ird/observe/db/DataServiceTest.java | 3 +- .../fr/ird/observe/db/ReplicationServiceTest.java | 2 +- .../observe/db/impl/H2DataSourceConfigTest.java | 3 +- .../observe/db/impl/PGDataSourceConfigTest.java | 4 +- .../fr/ird/observe/its/DataSourceFactoryIT.java | 2 +- .../test/java/fr/ird/observe/its/PGInstallIT.java | 3 +- .../java/fr/ird/observe/its/RestoreEmptyPGIT.java | 3 +- .../its/migration/AbstractMigrationTest.java | 5 +- .../its/migration/PGDataSourceMigrationIT.java | 3 +- .../h2ToLast/AbstractH2MigrationToLastIT.java | 3 +- .../its/replication/AbstractReplicateDataTest.java | 6 +- .../AbstractReplicateReferentielTest.java | 6 +- .../its/replication/H2ReplicateDataTest.java | 8 +- .../its/replication/ReplicationDataModel.java | 8 +- .../ird/observe/its/report/AbstractReportIT.java | 3 +- observe-entities/pom.xml | 31 ++- .../observe/ObserveTopiaApplicationContext.java | 129 ++++++++++++ .../fr/ird/observe/ObserveTopiaConfiguration.java | 25 +++ .../observe/ObserveTopiaConfigurationFactory.java | 143 ++++++++++++++ .../java/fr/ird/observe/ObserveTopiaIdFactory.java | 23 +++ .../observe/ObserveTopiaPersistenceContext.java | 11 ++ .../java/fr/ird/observe/entities/Entities.java | 13 +- .../fr/ird/observe/entities/OpenableEntities.java | 14 +- ...eDAOImpl.java => ActivityLonglineTopiaDao.java} | 35 ++-- .../entities/longline/SectionWithTemplateImpl.java | 6 +- ...glineDAOImpl.java => TripLonglineTopiaDao.java} | 126 ++++++------ .../migration/AbstractDataSourceMigration.java | 42 +--- .../AbstractObserveMigrationCallBack.java | 13 +- .../entities/migration/H2DataSourceMigration.java | 38 ++-- ...ObserveMigrationCallBackForVersionResolver.java | 4 +- .../entities/migration/ObserveMigrationEngine.java | 21 ++ .../entities/migration/PGDataSourceMigration.java | 41 ++-- .../DataSourceMigrationForVersion_3_1.java | 28 ++- .../DataSourceMigrationForVersion_3_10.java | 7 +- .../DataSourceMigrationForVersion_3_11.java | 7 +- .../DataSourceMigrationForVersion_3_12.java | 7 +- .../DataSourceMigrationForVersion_3_14.java | 7 +- .../DataSourceMigrationForVersion_3_15.java | 7 +- .../DataSourceMigrationForVersion_3_16.java | 41 ++-- .../DataSourceMigrationForVersion_3_5.java | 44 ++--- .../DataSourceMigrationForVersion_3_7.java | 7 +- .../DataSourceMigrationForVersion_3_8.java | 7 +- .../DataSourceMigrationForVersion_3_9.java | 7 +- .../DataSourceMigrationForVersion_4_0.java | 9 +- .../DataSourceMigrationForVersion_4_0_1.java | 33 ++-- .../DataSourceMigrationForVersion_4_0_RC2.java | 11 +- .../DataSourceMigrationForVersion_4_0_RC3.java | 24 +-- .../DataSourceMigrationForVersion_4_0_RC4.java | 9 +- .../DataSourceMigrationForVersion_4_0_RC6.java | 15 +- .../DataSourceMigrationForVersion_4_0_RC7.java | 7 +- .../referentiel/LengthWeightParemeterHelper.java | 14 +- .../{ProgramDAOImpl.java => ProgramTopiaDao.java} | 36 ++-- ...eineDAOImpl.java => ActivitySeineTopiaDao.java} | 35 ++-- ...ectDAOImpl.java => FloatingObjectTopiaDao.java} | 35 ++-- .../{RouteDAOImpl.java => RouteTopiaDao.java} | 47 +++-- ...ripSeineDAOImpl.java => TripSeineTopiaDao.java} | 69 ++++--- .../main/java/fr/ird/observe/util/DBHelper.java | 75 ------- .../src/main/xmi/observe-common.properties | 18 +- .../src/main/xmi/observe-longline.properties | 1 - .../src/main/xmi/observe-seine.properties | 13 +- .../ObserveTopiaApplicationContextTest.java | 69 +++++++ .../LengthWeightParemeterHelperTest.java | 3 +- .../{DBHelperTest.java => util/NumbersTest.java} | 51 +---- .../operation/ObsoleteReferenceToReplace.java | 2 +- .../services/ObserveServiceApplicationContext.java | 37 ++++ .../observe/services/ObserveServiceContext.java | 18 ++ .../service/DataSourceDumpProducerService.java | 16 ++ .../services/service/DataSourceService.java | 20 +- .../DatabaseConnexionNotAuthorizedException.java | 29 +++ .../service/DatabaseNotFoundException.java | 26 +++ .../services/service/seine/TripSeineService.java | 1 + observe-services-configuration-api/pom.xml | 7 - .../ObserveDataSourceConfiguration.java | 8 +- .../ObserveDataSourceConfigurationTopiaH2.java | 20 ++ .../ObserveDataSourceConfigurationTopiaPG.java | 8 + ...ObserveDataSourceConfigurationTopiaSupport.java | 15 ++ observe-services-model/pom.xml | 7 + .../dto/DataSourceCreateConfigurationDto.java | 102 ++++++++++ ...urceCreateWithNoReferentialImportException.java | 21 ++ ...ibleDataSourceCreateConfigurationException.java | 22 +++ .../ird/observe/services/dto/ReferenceSetDtos.java | 21 ++ .../xmi/observe-services-dto-longline.properties | 6 + .../main/xmi/observe-services-dto-longline.zargo | Bin 57827 -> 57355 bytes observe-services-runner/pom.xml | 2 + observe-services-topia/pom.xml | 26 ++- .../observe/services/AbstractObserveService.java | 4 +- .../observe/services/ReplicationServiceImpl.java | 8 +- .../LonglineDetailCompositionServiceImpl.java | 8 +- .../data/seine/NonTargetCatchServiceImpl.java | 4 +- .../data/seine/TargetCatchServiceImpl.java | 4 +- .../services/operation/SynchronizeServiceImpl.java | 4 +- .../services/ObserveServiceContextTopia.java | 66 +++++-- .../services/ObserveServiceFactoryTopia.java | 131 ++---------- .../ird/observe/services/ObserveServiceTopia.java | 154 +++++++++++++-- .../ObserveTopiaApplicationContextFactory.java | 150 ++++++++++++++ .../services/builder/DtoToEntityBuilder.java | 31 ++- .../services/builder/EntityToDtoBuilder.java | 110 ++++++----- .../DataSourceDumpProducerServiceTopia.java | 21 ++ .../services/service/DataSourceServiceTopia.java | 153 ++++++++++++++ .../services/service/ReferentialServiceTopia.java | 69 +------ .../service/seine/TripSeineServiceTopia.java | 107 ++++++++++ .../{service => }/ApplicationContextResource.java | 52 +++-- .../ird/observe/services/DataSourceResource.java | 147 ++++++++++++++ .../services/ObserveServiceContextTopiaTaiste.java | 18 ++ .../services/ObserveServiceFactoryTopiaTaiste.java | 37 ---- .../services/builder/DtoToEntityBuilderTest.java | 149 ++++++++------ .../services/service/DataSourceResource.java | 154 --------------- .../service/DataSourceServiceTopiaTest.java | 144 ++++++++++++++ .../service/ReferentialServiceTopiaTest.java | 48 ++--- .../service/seine/TripSeineServiceTopiaTest.java | 220 +++++++++++++++++++++ observe-test-data/pom.xml | 5 + .../main/java/fr/ird/observe/test/TestHelper.java | 77 ++++---- .../src/main/resources/db/4.0.1/test.sql.gz | Bin 0 -> 5044065 bytes pom.xml | 16 +- 136 files changed, 2825 insertions(+), 1338 deletions(-) rename {observe-entities => observe-business}/src/main/java/fr/ird/observe/util/Scripts.java (85%) create mode 100644 observe-entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/ObserveTopiaConfigurationFactory.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/ObserveTopiaIdFactory.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java rename observe-entities/src/main/java/fr/ird/observe/entities/longline/{ActivityLonglineDAOImpl.java => ActivityLonglineTopiaDao.java} (69%) rename observe-entities/src/main/java/fr/ird/observe/entities/longline/{TripLonglineDAOImpl.java => TripLonglineTopiaDao.java} (74%) create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationEngine.java rename observe-entities/src/main/java/fr/ird/observe/entities/referentiel/{ProgramDAOImpl.java => ProgramTopiaDao.java} (67%) rename observe-entities/src/main/java/fr/ird/observe/entities/seine/{ActivitySeineDAOImpl.java => ActivitySeineTopiaDao.java} (69%) rename observe-entities/src/main/java/fr/ird/observe/entities/seine/{FloatingObjectDAOImpl.java => FloatingObjectTopiaDao.java} (65%) rename observe-entities/src/main/java/fr/ird/observe/entities/seine/{RouteDAOImpl.java => RouteTopiaDao.java} (69%) rename observe-entities/src/main/java/fr/ird/observe/entities/seine/{TripSeineDAOImpl.java => TripSeineTopiaDao.java} (80%) delete mode 100644 observe-entities/src/main/java/fr/ird/observe/util/DBHelper.java create mode 100644 observe-entities/src/test/java/fr/ird/observe/ObserveTopiaApplicationContextTest.java rename observe-entities/src/test/java/fr/ird/observe/{DBHelperTest.java => util/NumbersTest.java} (52%) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/DataSourceDumpProducerService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/DatabaseConnexionNotAuthorizedException.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/DatabaseNotFoundException.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/DataSourceCreateConfigurationDto.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/DataSourceCreateWithNoReferentialImportException.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/IncompatibleDataSourceCreateConfigurationException.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/ObserveTopiaApplicationContextFactory.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceDumpProducerServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java rename observe-services-topia/src/test/java/fr/ird/observe/services/{service => }/ApplicationContextResource.java (51%) create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/ObserveServiceContextTopiaTaiste.java delete mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/ObserveServiceFactoryTopiaTaiste.java delete mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceResource.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceServiceTopiaTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java create mode 100644 observe-test-data/src/main/resources/db/4.0.1/test.sql.gz -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 27

02/29: use reference for section basket and branchline in catchLongline an Tdr (refs #7458).
by codelutin.com scm 23 Aug '15

23 Aug '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 70d40f085121f1f86bbfb8e94a4b58a1dc0b06c2 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Aug 21 10:14:45 2015 +0200 use reference for section basket and branchline in catchLongline an Tdr (refs #7458). --- .../xmi/observe-services-dto-longline.properties | 6 ++++++ .../main/xmi/observe-services-dto-longline.zargo | Bin 57827 -> 57355 bytes 2 files changed, 6 insertions(+) diff --git a/observe-services-model/src/main/xmi/observe-services-dto-longline.properties b/observe-services-model/src/main/xmi/observe-services-dto-longline.properties index 48b4649..29b7352 100644 --- a/observe-services-model/src/main/xmi/observe-services-dto-longline.properties +++ b/observe-services-model/src/main/xmi/observe-services-dto-longline.properties @@ -20,8 +20,11 @@ fr.ird.observe.services.dto.longline.SensorUsed.attribute.sensorBrand.tagValue.s fr.ird.observe.services.dto.longline.SizeMeasure.attribute.sizeMeasureType.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto +fr.ird.observe.services.dto.longline.Tdr.attribute.branchline.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.longline.BranchlineDto fr.ird.observe.services.dto.longline.Tdr.attribute.sensorBrand.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.longline.SensorBrandDto fr.ird.observe.services.dto.longline.Tdr.attribute.species.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.SpeciesDto +fr.ird.observe.services.dto.longline.Tdr.attribute.section.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.longline.SectionDto +fr.ird.observe.services.dto.longline.Tdr.attribute.basket.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.longline.BasketDto fr.ird.observe.services.dto.longline.Tdr.attribute.itemHorizontalPosition.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.longline.ItemHorizontalPositionDto fr.ird.observe.services.dto.longline.Tdr.attribute.itemVerticalPosition.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.longline.ItemVerticalPositionDto @@ -40,10 +43,13 @@ fr.ird.observe.services.dto.longline.FloatlinesComposition.attribute.lineType.ta fr.ird.observe.services.dto.longline.Encounter.attribute.species.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.longline.Encounter.attribute.encounterType.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.longline.EncounterTypeDto +fr.ird.observe.services.dto.longline.CatchLongline.attribute.basket.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.longline.BasketDto +fr.ird.observe.services.dto.longline.CatchLongline.attribute.branchline.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.longline.BranchlineDto fr.ird.observe.services.dto.longline.CatchLongline.attribute.catchFateLongline.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto fr.ird.observe.services.dto.longline.CatchLongline.attribute.discardHealthness.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.longline.HealthnessDto fr.ird.observe.services.dto.longline.CatchLongline.attribute.speciesCatch.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.longline.CatchLongline.attribute.predator.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.SpeciesDto +fr.ird.observe.services.dto.longline.CatchLongline.attribute.section.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.longline.SectionDto fr.ird.observe.services.dto.longline.CatchLongline.attribute.maturityStatus.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.longline.MaturityStatusDto fr.ird.observe.services.dto.longline.CatchLongline.attribute.stomacFullness.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.longline.StomacFullnessDto fr.ird.observe.services.dto.longline.CatchLongline.attribute.hookPosition.tagValue.simpleBeanWithNoInterfaceAttributeGeneric=fr.ird.observe.services.dto.referential.longline.HookPositionDto diff --git a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo index adc7a37..ce76874 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-longline.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)list.forge.codelutin.com>.

1 0

01/29: add DTo test and fix DtoToEntityBuilder (refs #7458).
by codelutin.com scm 23 Aug '15

23 Aug '15

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 8dea399bbc63246a9c10e35f3a622043bac1f6d1 Author: Sylvain Bavencoff <bavencoff(a)codelutin.com> Date: Fri Aug 21 09:38:29 2015 +0200 add DTo test and fix DtoToEntityBuilder (refs #7458). --- .../services/builder/DtoToEntityBuilder.java | 31 ++++- .../services/builder/DtoToEntityBuilderTest.java | 147 +++++++++++++-------- 2 files changed, 116 insertions(+), 62 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java index d8868d7..4aaa78d 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java @@ -72,27 +72,44 @@ public class DtoToEntityBuilder<D extends IdDto, E extends TopiaEntity> implemen if (!collection.isEmpty()) { - ParameterizedType collectionGenericTypeType = (ParameterizedType) collectionGenericType; - ParameterizedType type1 = (ParameterizedType) collectionGenericTypeType.getActualTypeArguments()[0]; - Class type = (Class) type1.getActualTypeArguments()[0]; + Type collectionGenericTypeSource = binder.getSourcePropertyGenericType(propertyName); - if (ReferenceDto.class.isAssignableFrom(type)) { + ParameterizedType collectionGenericTypeType1 = (ParameterizedType) collectionGenericTypeSource; + Type type1 = collectionGenericTypeType1.getActualTypeArguments()[0]; + Class typeSource; + if (type1 instanceof Class) { + typeSource = (Class) type1; + } else { + typeSource = (Class) ((ParameterizedType) type1).getActualTypeArguments()[0]; + } + + ParameterizedType collectionGenericTypeType2 = (ParameterizedType) collectionGenericType; + Type type2 = collectionGenericTypeType2.getActualTypeArguments()[0]; + Class typeTarget; + if (type1 instanceof Class) { + typeTarget = (Class) type2; + } else { + typeTarget = (Class) ((ParameterizedType) type2).getActualTypeArguments()[0]; + } + + + if (ReferenceDto.class.isAssignableFrom(typeSource)) { Collection<ReferenceDto> referenceDtos = (Collection<ReferenceDto>) collection; for (ReferenceDto referenceDto : referenceDtos) { - TopiaEntity propertyEntity = toEntity(type, referenceDto); + TopiaEntity propertyEntity = toEntity(typeTarget, referenceDto); entityCollection.add(propertyEntity); } - } else if (IdDto.class.isAssignableFrom(type)) { + } else if (IdDto.class.isAssignableFrom(typeSource)) { Collection<IdDto> idDtos = (Collection<IdDto>) collection; for (IdDto idDto : idDtos) { - TopiaEntity propertyEntity = toEntity(type, idDto); + TopiaEntity propertyEntity = toEntity(typeTarget, idDto); entityCollection.add(propertyEntity); } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/builder/DtoToEntityBuilderTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/builder/DtoToEntityBuilderTest.java index 669bb89..f5f8e92 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/builder/DtoToEntityBuilderTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/builder/DtoToEntityBuilderTest.java @@ -4,16 +4,22 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.entities.referentiel.Organism; import fr.ird.observe.entities.referentiel.Program; +import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; +import fr.ird.observe.entities.seine.GearUseFeaturesSeine; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.constants.GearType; import fr.ird.observe.services.dto.constants.ReferenceStatus; import fr.ird.observe.services.dto.constants.ReferentialLocale; +import fr.ird.observe.services.dto.referential.GearCaracteristicDto; +import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.referential.I18nReferentialDto; import fr.ird.observe.services.dto.referential.OrganismDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.ReferentialReferenceDtos; +import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; +import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -35,25 +41,7 @@ public class DtoToEntityBuilderTest { @Test public void testCopy() { - ObserveServiceTopia service = new ObserveServiceTopia() { - - @Override - protected <D extends ReferentialDto, E extends TopiaEntity> E loadEntity(Class<D> dtoType, Class<E> entityType, String id) { - E e = newEntity(entityType); - e.setTopiaId(id); - return e; - } - - @Override - public <E extends TopiaEntity> E newEntity(Class<E> entityType) { - - try { - return (E) ObserveEntityEnum.valueOf(entityType).getImplementation().newInstance(); - } catch (InstantiationException | IllegalAccessException e) { - throw new IllegalStateException("could not create instance of " + entityType.getName()); - } - } - }; + ObserveServiceTopia service = new ObserveServiceTopiaMock(); ProgramDto programDto = new ProgramDto(); programDto.setCode("code"); @@ -114,41 +102,90 @@ public class DtoToEntityBuilderTest { } -// @Test -// public void testCopyWithSubDto() { -// -// GearCaracteristic gearCaracteristic = new GearCaracteristicImpl(); -// gearCaracteristic.setTopiaId("gearCaracteristicId"); -// gearCaracteristic.setCode("gearCaracteristicCode"); -// gearCaracteristic.setLabel1("gearCaracteristicLabel1"); -// gearCaracteristic.setLabel2("gearCaracteristicLabel2"); -// gearCaracteristic.setLabel3("gearCaracteristicLabel3"); -// gearCaracteristic.setLabel4("gearCaracteristicLabel4"); -// gearCaracteristic.setLabel5("gearCaracteristicLabel5"); -// gearCaracteristic.setLabel6("gearCaracteristicLabel6"); -// gearCaracteristic.setLabel7("gearCaracteristicLabel7"); -// gearCaracteristic.setLabel8("gearCaracteristicLabel8"); -// gearCaracteristic.setNeedComment(true); -// gearCaracteristic.setUri("gearCaracteristicUrl"); -// gearCaracteristic.setUnit("m"); -// gearCaracteristic.setStatus(fr.ird.observe.entities.constants.ReferenceStatus.enabled); -// -// Gear gear = new GearImpl(); -// gear.setTopiaId("gearId"); -// gear.setCode("gearCode"); -// gear.setLabel1("gearLabel1"); -// gear.setLabel2("gearLabel2"); -// gear.setLabel3("gearLabel3"); -// gear.setLabel4("gearLabel4"); -// gear.setLabel5("gearLabel5"); -// gear.setLabel6("gearLabel6"); -// gear.setLabel7("gearLabel7"); -// gear.setLabel8("gearLabel8"); -// gear.setNeedComment(true); -// gear.setUri("gearUrl"); -// gear.setStatus(fr.ird.observe.entities.constants.ReferenceStatus.enabled); -// gear.addGearCaracteristic(gearCaracteristic); -// -// } + @Test + public void testCopyWithSubDto() { + + ObserveServiceTopia service = new ObserveServiceTopiaMock(); + + ReferentialReferenceDto<GearCaracteristicDto> gearCaracteristicDto = + ReferentialReferenceDtos.newReferentialReferenceDto( + GearCaracteristicDto.class, + ReferentialLocale.FR, + ImmutableSet.of( + I18nReferentialDto.PROPERTY_LABEL2, + I18nReferentialDto.PROPERTY_CODE + ) + ); + + gearCaracteristicDto.setId("gearCaracteristicId"); + gearCaracteristicDto.setPropertyValue(ReferentialLocale.FR, I18nReferentialDto.PROPERTY_LABEL2, "gearCaracteristicLabel2"); + gearCaracteristicDto.setPropertyValue(I18nReferentialDto.PROPERTY_CODE, "gearCaracteristicCode"); + + ReferentialReferenceDto<GearDto> gearDto = + ReferentialReferenceDtos.newReferentialReferenceDto( + GearDto.class, + ReferentialLocale.FR, + ImmutableSet.of( + I18nReferentialDto.PROPERTY_LABEL2, + I18nReferentialDto.PROPERTY_CODE + ) + ); + + gearDto.setId("gearId"); + gearDto.setPropertyValue(ReferentialLocale.FR, I18nReferentialDto.PROPERTY_LABEL2, "gearLabel2"); + gearDto.setPropertyValue(I18nReferentialDto.PROPERTY_CODE, "gearCode"); + + GearUseFeaturesMeasurementSeineDto measurementDto = new GearUseFeaturesMeasurementSeineDto(); + measurementDto.setId("gearUseFeaturesMeasurementSeineId"); + measurementDto.setGearCaracteristic(gearCaracteristicDto); + measurementDto.setMeasurementValue("15.2"); + + GearUseFeaturesSeineDto featuresDto = new GearUseFeaturesSeineDto(); + featuresDto.setId("gearUseFeatureSeineId"); + featuresDto.setNumber(28); + featuresDto.setUsedInTrip(true); + featuresDto.setGear(gearDto); + featuresDto.addGearUseFeaturesMeasurement(measurementDto); + + // transformation du DTO en entités + DtoToEntityBuilder<GearUseFeaturesSeineDto, GearUseFeaturesSeine> builder = DtoToEntityBuilder.create(GearUseFeaturesSeineDto.class, GearUseFeaturesSeine.class, service); + + GearUseFeaturesSeine features = service.newEntity(GearUseFeaturesSeine.class); + builder.build(featuresDto, features); + + // On vérife que l'entité a bien été copié + Assert.assertEquals(featuresDto.getId(), features.getTopiaId()); + Assert.assertEquals(featuresDto.getNumber(), features.getNumber()); + Assert.assertEquals(featuresDto.getUsedInTrip(), features.getUsedInTrip()); + + Assert.assertEquals(featuresDto.sizeGearUseFeaturesMeasurement(), features.sizeGearUseFeaturesMeasurement()); + GearUseFeaturesMeasurementSeine measurement = features.getGearUseFeaturesMeasurement().get(0); + Assert.assertEquals(measurementDto.getId(), measurement.getTopiaId()); + Assert.assertEquals(measurementDto.getMeasurementValue(), measurement.getMeasurementValue()); + Assert.assertNotNull(measurement.getGearCaracteristic()); + Assert.assertEquals(measurementDto.getGearCaracteristic().getId(), measurement.getGearCaracteristic().getTopiaId()); + + } + + class ObserveServiceTopiaMock extends ObserveServiceTopia { + + @Override + protected <D extends ReferentialDto, E extends TopiaEntity> E loadEntity(Class<D> dtoType, Class<E> entityType, String id) { + E e = newEntity(entityType); + e.setTopiaId(id); + return e; + } + + @Override + public <E extends TopiaEntity> E newEntity(Class<E> entityType) { + + try { + return (E) ObserveEntityEnum.valueOf(entityType).getImplementation().newInstance(); + } catch (InstantiationException | IllegalAccessException e) { + throw new IllegalStateException("could not create instance of " + entityType.getName()); + } + } + }; + } \ No newline at end of file -- 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/7464 deleted (was 9a2d465)
by codelutin.com scm 23 Aug '15

23 Aug '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7464 in repository observe. See http://git.codelutin.com/observe.git was 9a2d465 L'import d'une base fonctionne, mais pas encore la création d'une base vide (le mapping hibernate n'est pas correcte) (See #7464) This change permanently discards the following revisions: discards 9a2d465 L'import d'une base fonctionne, mais pas encore la création d'une base vide (le mapping hibernate n'est pas correcte) (See #7464) discards 9db7cfa Implantation de création d'une base (See #7464) discards 3d5c7da Utilisation de la tag value attributeType discards 38a2b78 Debut de boot avec topia 3.0, reste à écrire la logique d'ouverture ou création de base discards ed09986 Deplacement de constantes + utilisation du mode autoMigrate dans la migration discards 8905fce Suppresion de la dépendance sur observe-business dans le module d'implantation des services topia discards b086514 Ajout du nom de la base h2 à utiliser dans la configuration discards ac7942f Exposition des services utilisables sur le context applicatif de topia discards 04be14c Utilisation des bonnes tag values discards bd3a91f Ajout dépendances sur les drivers jdbc utilisés discards 7296ade Ajout d'une dépendance sur le service de replication dans le module entities discards 16579ad On passe sur topia 3.1-SNAPSHOT discards 5eaca28 mise en forme du service de migration + debut de migration des tag values discards 6df5da0 Portage des DAO dans fr.ird.observe.entities.seine vers ToPIA 3 discards 4054f01 Refacotr module entite discards e70c29c Taiste discards f6758c7 Suppression TopiaException discards 63aac5e Modification de la configuration du plugin eugene discards 68eb732 Dependance vers topia 3.0 -- 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/7458-3 deleted (was dda1a96)
by codelutin.com scm 23 Aug '15

23 Aug '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/7458-3 in repository observe. See http://git.codelutin.com/observe.git was dda1a96 add trip seine service topia implement and test (refs #7458). This change permanently discards the following revisions: discards dda1a96 add trip seine service topia implement and test (refs #7458). discards e5d026a use reference for section basket and branchline in catchLongline an Tdr (refs #7458). discards a1fea91 add DTo test and fix DtoToEntityBuilder (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