This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 72efaab Retour sur develop pour de nouvelles aventures... Merge branch 'feature/refactor_reference' into develop new 28f6a27 Mise à jour du driver postgresql new 67e1841 o Revue de la gestion des migrations pour la version 5.0 : chaque script de migration a une version, la 5.à aggrègera toutes les versions intermédiaires o Renommage de ReferenceEntity en ObserveReferentialEntity o Introduction de ObserveEntity et ObserveDataEntity o Début de suppression du code sur les FollowedEntity o Revue de l'api de test (so weak, so lame :( avec un héritage très douteux) o Écriture d'un test pour effectuer les migrations facilement des bases de [...] new 87c65fe Correction de la génération du mapping hibernate new 472642a Generation des bases de test pour la version 5.0-2 new 3a106d4 Amélioration de l'API de tests new 7b92724 Revue bis de la configuration des tests new e744c95 Ajout d'une table globale des dates de dernières mises à jour (utilisé pour les suppressions) (See #7470) new 2fd2971 Changement du niveau de log new d6fcd2b Ajout de la talbe LastupdateDate dans la synchronisation du référentiel new 8bd2466 Mise en place de la mise à jour de la date de dernière mise à jour lors de la sauvegarde ou suppression d'une entité (il faudra bien repasser sur chaque appel, car il me semble que cela n'est pas bien géré partout) (See #7470) new cde7c09 Utilisation de la dernière version du modèle de persistence new a97c28b Suppression d'un test inutile new e0e0eac Faire fonctionner les tests de suppression (mais ajout d'un fixme) new 8679f9c Amélioration du code de mise à jour new 6662c85 Renommage méthode de test new 824f7a2 Ajout de la base de test pour longline (migrée en plus de 3heures...) + utilisation (enfin) des bases à jour pour les tests new 46beb5b Amélioration de l'exception de concurrence new b6804fd o Introduction ObserveEntity et ObserveDataEntity o Mise en place de la date de dernière mise à jour sur toutes les entités o Alignement du code pour les dto o Optionmisation des dépendences new a736d26 Refactor des binders new 1fc64bb Implantation efficace de réplication de données new 4747da5 Ajout de fixtures new 026b9a6 Ajout d'un tes de replication de données new cec9b0b Correction de base de référentiels new 18717f0 Ajout d'une base vide pour les tests new 6100451 Utilisation du service topia pour la réplication new d051db8 Ajout de fixtures new 2eb350b Ajout de tests pour la réplication de données ng new 9cb09ec Configuration du nouveau service de réplication new f9c2470 Ajout méthode pour compter le nombre d'éléments d'une table new ca8daea Debut de correction de la javadoc new 49444e3 Ajout de la réplication au niveau du topia application context + suppression autoMigrate configuration new c361698 Ajout d'un nouveau service pour produire les script sql new 0221de9 Fix third parties new 87cbe4e Utilisation du nouveau moteur de requete sql de topia new cde7980 clean code new 22aa205 Ne plus utiliser l'ancien moteur de réplication de topia new 1f07a4c Rendre Closeable DataSourceService et bien fermer la base commune après sa création (cela était fait avant en utilisant la commande restore de H2) new d5d5d55 Retour sur develop, mais le ticket n'est pas fini (il faut voir dans les ui comment bien utiliser la date de dernière mise à jour) Merge branch 'feature/7470_mise_en_place_de_la_date_de_derniere_mise_a_jour' into develop The 38 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 d5d5d5536ec3a5ba35f9e90c321a997add449af7 Merge: 72efaab 1f07a4c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Jan 9 09:19:39 2016 +0100 Retour sur develop, mais le ticket n'est pas fini (il faut voir dans les ui comment bien utiliser la date de dernière mise à jour) Merge branch 'feature/7470_mise_en_place_de_la_date_de_derniere_mise_a_jour' into develop commit 1f07a4c195abc5e6b20cec85163eb12d3367b3f5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Jan 9 09:13:03 2016 +0100 Rendre Closeable DataSourceService et bien fermer la base commune après sa création (cela était fait avant en utilisant la commande restore de H2) commit 22aa205b2ad54e7bb850844a48c5dcdc2d0a1097 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Jan 9 08:41:46 2016 +0100 Ne plus utiliser l'ancien moteur de réplication de topia commit cde7980fbe0fa80be9fa07015fc82e4111c2058b Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Jan 8 20:03:08 2016 +0100 clean code commit 87cbe4e32bd581aabc64f64326c76062b18d7aba Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 5 08:50:47 2016 +0100 Utilisation du nouveau moteur de requete sql de topia commit 0221de9898135cac654b8552c4f09ed1507c0999 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jan 4 17:23:52 2016 +0100 Fix third parties commit c36169804dabc1098efa1fa1d531fda9e8649f3d Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 31 19:38:23 2015 +0100 Ajout d'un nouveau service pour produire les script sql commit 49444e38a2741dee5ab6e59af942cf9566f8fb0d Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 31 19:36:45 2015 +0100 Ajout de la réplication au niveau du topia application context + suppression autoMigrate configuration commit ca8daeafc9b350b6e51f97a7b90d4ffa49f267da Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 30 17:01:14 2015 +0100 Debut de correction de la javadoc commit f9c2470d6a7255d15537049b35d38d80c6700dd1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 30 16:58:24 2015 +0100 Ajout méthode pour compter le nombre d'éléments d'une table commit 9cb09ecd322da00eaf7f18f37178930dc3925fd1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 30 16:57:47 2015 +0100 Configuration du nouveau service de réplication commit 2eb350bde3c37e483d1827358f77102a34b16114 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 30 16:54:37 2015 +0100 Ajout de tests pour la réplication de données ng commit d051db817aea147d3f3497a9bc59a6af456aab75 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 30 16:54:05 2015 +0100 Ajout de fixtures commit 610045103383d7119aefebc690178f2a012fabc2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 30 16:53:25 2015 +0100 Utilisation du service topia pour la réplication commit 18717f0908d797e50d855b50938a78f465b8a7bc Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 29 21:48:48 2015 +0100 Ajout d'une base vide pour les tests commit cec9b0be626a0cb4ae451b3aa4714c4849584571 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 29 21:48:02 2015 +0100 Correction de base de référentiels commit 026b9a6b880b3776b33e313f3795d4d454162905 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 29 01:18:50 2015 +0100 Ajout d'un tes de replication de données commit 4747da54faf040e78ac3f464c1368c97cee26f7b Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 29 01:18:28 2015 +0100 Ajout de fixtures commit 1fc64bb2d669887492e84bf983ef42a192da667c Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 29 01:14:58 2015 +0100 Implantation efficace de réplication de données commit a736d267ac97730bbf50c8436cd1569a552144b2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 27 22:27:27 2015 +0100 Refactor des binders commit b6804fd6cf50bff2d7d2287b8a0cda6fda6933be Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 27 19:15:32 2015 +0100 o Introduction ObserveEntity et ObserveDataEntity o Mise en place de la date de dernière mise à jour sur toutes les entités o Alignement du code pour les dto o Optionmisation des dépendences commit 46beb5bc612fcfc15db8ebff5e20a4ee04cf6e93 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 27 10:58:00 2015 +0100 Amélioration de l'exception de concurrence commit 824f7a2b3025a183e80e74deea3db4b737a526fe Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 27 09:50:54 2015 +0100 Ajout de la base de test pour longline (migrée en plus de 3heures...) + utilisation (enfin) des bases à jour pour les tests commit 6662c85160020e6cd75049709eec1d20cbc6ee92 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 26 15:20:25 2015 +0100 Renommage méthode de test commit 8679f9c2dc89e1e15cd1edde92f3c3f34e155f1a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 26 15:18:45 2015 +0100 Amélioration du code de mise à jour commit e0e0eacaa0c7b4edecbab50ad5540c487682d9bc Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 26 15:17:11 2015 +0100 Faire fonctionner les tests de suppression (mais ajout d'un fixme) commit a97c28b20462334daaab8e5efedb97d4d2f9102e Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 26 15:16:19 2015 +0100 Suppression d'un test inutile commit cde7c09f0c3fb2bbb5b40e67a8f0eb873bc90e07 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 26 14:48:49 2015 +0100 Utilisation de la dernière version du modèle de persistence commit 8bd2466f6556559993b76de3f465460b4434c15d Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 26 14:48:08 2015 +0100 Mise en place de la mise à jour de la date de dernière mise à jour lors de la sauvegarde ou suppression d'une entité (il faudra bien repasser sur chaque appel, car il me semble que cela n'est pas bien géré partout) (See #7470) commit d6fcd2b1510741359981deec9793dd24eb23caed Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 26 14:46:46 2015 +0100 Ajout de la talbe LastupdateDate dans la synchronisation du référentiel commit 2fd2971d1f984d1d85e3bd239c5e4b89090824c7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 26 12:48:54 2015 +0100 Changement du niveau de log commit e744c95114d9d273575e4215ae0aedf091047608 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 26 12:48:32 2015 +0100 Ajout d'une table globale des dates de dernières mises à jour (utilisé pour les suppressions) (See #7470) commit 7b927249b2d1d04bbaf4bdf1772b2c2ecc636e11 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 26 12:01:41 2015 +0100 Revue bis de la configuration des tests commit 3a106d48370fa5e957bf5b255fb7c3d753f65d7c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 26 11:29:30 2015 +0100 Amélioration de l'API de tests commit 472642ac26abbb1cddfa7cfc412e51f318abed3e Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 26 11:28:49 2015 +0100 Generation des bases de test pour la version 5.0-2 commit 87c65feab17e6f8e491da90456cb4d86fd2febef Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 26 11:27:14 2015 +0100 Correction de la génération du mapping hibernate commit 67e18410e41275b3e4296a196efc7c9b57a8ef0e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 25 23:25:03 2015 +0100 o Revue de la gestion des migrations pour la version 5.0 : chaque script de migration a une version, la 5.à aggrègera toutes les versions intermédiaires o Renommage de ReferenceEntity en ObserveReferentialEntity o Introduction de ObserveEntity et ObserveDataEntity o Début de suppression du code sur les FollowedEntity o Revue de l'api de test (so weak, so lame :( avec un héritage très douteux) o Écriture d'un test pour effectuer les migrations facilement des bases de test (heu faire les migrations à chaque fois qu'on a besoin d'une base pour les test... so L-A-M-E) commit 28f6a271df7b03b34a75b4d3b3e018cded9ecc0f Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 25 18:38:58 2015 +0100 Mise à jour du driver postgresql Summary of changes: .../src/license/THIRD-PARTY.properties | 63 +- .../java/fr/ird/observe/ObserveActionExecutor.java | 2 +- .../main/java/fr/ird/observe/ObserveCLAction.java | 2 +- .../main/java/fr/ird/observe/ObserveRunner.java | 4 +- .../observe/ObserveSwingApplicationContext.java | 6 +- .../ObserveSwingApplicationConfig.java | 2 +- .../fr/ird/observe/db/ObserveSwingDataSource.java | 5 + .../ird/observe/db/constants/DataContextType.java | 2 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 6 +- .../java/fr/ird/observe/ui/admin/AdminStep.java | 2 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 6 +- .../fr/ird/observe/ui/admin/AdminUIHandler.java | 2 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 2 +- .../observe/ui/admin/save/SaveLocalUIHandler.java | 6 +- .../ird/observe/ui/content/ContentUIHandler.java | 2 +- .../ui/content/ref/ContentReferenceUIHandler.java | 4 +- .../ui/content/table/ContentTableModel.java | 12 +- .../ui/content/table/ContentTableUIModel.java | 8 +- .../impl/longline/CatchLonglineUIHandler.java | 2 +- .../longline/GearUseFeaturesLonglineUIModel.java | 2 +- .../impl/seine/GearUseFeaturesSeineUIModel.java | 2 +- .../impl/seine/ModeSaisieEchantillonEnum.java | 4 +- .../ird/observe/ui/storage/ObstunaAdminAction.java | 6 +- .../ird/observe/ui/storage/StorageUIHandler.java | 21 +- .../ird/observe/ui/storage/StorageUILauncher.java | 4 +- .../fr/ird/observe/ui/storage/StorageUIModel.java | 7 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 2 +- .../ui/tree/DataSelectionTreeSelectionModel.java | 14 +- .../java/fr/ird/observe/ui/tree/ObserveNode.java | 2 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 6 +- .../fr/ird/observe/ui/util/FloatConverter.java | 2 +- .../fr/ird/observe/ui/util/SpringUtilities.java | 8 +- .../ird/observe/validation/ValidationService.java | 2 +- .../dto/AbstractEspeceFieldDtoValidator.java | 8 +- .../dto/ActivityFinDeVeilleExistsDtoValidator.java | 12 +- .../dto/ActivitySimpleSpeedDtoValidator.java | 6 +- .../validator/dto/ActivitySpeedDtoValidator.java | 6 +- .../web/ObserveWebApplicationListener.java | 2 +- .../web/controller/ObserveWebMotionController.java | 2 +- .../DataSourceDumpProducerServiceController.java | 29 - .../entities/AbstractEspeceFieldValidator.java | 8 +- .../ActivityFinDeVeilleExistsValidator.java | 12 +- .../entities/ActivitySimpleSpeedValidator.java | 6 +- .../validator/entities/ActivitySpeedValidator.java | 6 +- observe-entities/pom.xml | 5 +- .../fr/ird/observe/AbstractObserveTopiaDao.java | 44 +- .../observe/ObserveTopiaApplicationContext.java | 351 +++++++++-- .../observe/ObserveTopiaConfigurationFactory.java | 24 +- .../observe/ObserveTopiaPersistenceContext.java | 83 ++- .../java/fr/ird/observe/entities/Activity.java | 2 +- .../java/fr/ird/observe/entities/Entities.java | 37 +- .../observe/entities/LastUpdateDateTopiaDao.java | 9 + .../java/fr/ird/observe/entities/ObserveSet.java | 2 +- .../main/java/fr/ird/observe/entities/Trip.java | 2 +- .../fr/ird/observe/entities/gps/GPSRouteImpl.java | 8 +- .../fr/ird/observe/entities/gps/GpsPoints.java | 12 +- .../migration/AbstractDataSourceMigration.java | 13 +- .../DataSourceMigrationForVersion_3_1.java | 2 +- .../DataSourceMigrationForVersion_5_0.java | 3 +- .../DataSourceMigrationForVersion_5_0_1.java | 8 +- ...va => DataSourceMigrationForVersion_5_0_2.java} | 12 +- ...va => DataSourceMigrationForVersion_5_0_3.java} | 14 +- .../referentiel/I18nReferenceEntities.java | 4 +- .../referentiel/LengthWeightParameters.java | 8 +- ...tities.java => ObserveReferentialEntities.java} | 26 +- ...Impl.java => ObserveReferentialEntityImpl.java} | 2 +- .../ird/observe/entities/referentiel/Programs.java | 2 +- .../ird/observe/entities/seine/ActivitySeines.java | 4 +- .../observe/entities/seine/NonTargetCatchImpl.java | 2 +- .../db/{5.0 => 5.0-1}/remove_open_field-H2.sql | 10 +- .../db/{5.0 => 5.0-1}/remove_open_field-PG.sql | 10 +- .../db/5.0-2/add_lastUpdateDate_field-H2.sql | 676 +++++++++++++++++++++ .../db/5.0-2/add_lastUpdateDate_field-PG.sql | 676 +++++++++++++++++++++ .../db/5.0-3/add_lastUpdateDate_table-H2.sql | 106 ++++ .../db/5.0-3/add_lastUpdateDate_table-PG.sql | 106 ++++ .../db/5.0.1/add_lastUpdate_field_2-H2.sql | 2 - .../db/5.0.1/add_lastUpdate_field_2-PG.sql | 2 - .../resources/db/5.0/add_lastUpdate_field-H2.sql | 153 ----- .../resources/db/5.0/add_lastUpdate_field-PG.sql | 154 ----- .../src/main/xmi/observe-common.properties | 1 + observe-entities/src/main/xmi/observe-common.zargo | Bin 37617 -> 37603 bytes .../src/main/xmi/observe-longline.zargo | Bin 96937 -> 93586 bytes observe-entities/src/main/xmi/observe-seine.zargo | Bin 85015 -> 84567 bytes .../ObserveTopiaApplicationContextTest.java | 20 +- .../service/ConcurrentModificationException.java | 31 +- .../service/DataSourceDumpProducerService.java | 41 -- .../services/service/DataSourceService.java | 4 +- .../services/service/SqlScriptProducerRequest.java | 74 +++ .../services/service/SqlScriptProducerService.java | 19 + observe-services-configuration-api/pom.xml | 5 - observe-services-configuration-rest/pom.xml | 26 - ...bserveDataSourceConfigurationRestConstants.java | 4 +- .../src/test/resources/log4j.properties | 32 - observe-services-configuration-topia/pom.xml | 48 -- .../src/test/resources/log4j.properties | 32 - .../observe/services/dto/AbstractReference.java | 12 + .../fr/ird/observe/services/dto/DataReference.java | 3 +- .../observe/services/dto/FollowedUpdateDto.java | 14 - .../java/fr/ird/observe/services/dto/IdDto.java | 5 +- .../services/dto/constants/ReferentialLocale.java | 4 +- .../services/dto/referential/ReferentialDto.java | 12 +- .../services/dto/referential/ReferentialDtos.java | 6 +- .../observe/services/dto/result/SaveResultDto.java | 5 +- .../services/dto/result/SaveResultDtos.java | 4 +- .../dto/result/TripChildSaveResultDtos.java | 12 + .../fr/ird/observe/util/gps/GPSFileReader.java | 10 +- .../java/fr/ird/observe/util/gps/GPSRouteImpl.java | 8 +- .../java/fr/ird/observe/util/gps/GPSService.java | 12 +- .../java/fr/ird/observe/util/gps/GpsPoints.java | 12 +- .../src/main/xmi/observe-services-dto-common.zargo | Bin 43178 -> 42022 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 64908 -> 63930 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 60150 -> 59464 bytes .../report/AbstractReportServiceRestTest.java | 4 +- observe-services-topia/pom.xml | 13 +- .../observe/services/ReplicationServiceImpl.java | 4 +- .../referential/ReferentialServiceImpl.java | 8 +- .../ird/observe/services/ObserveServiceTopia.java | 448 +++++--------- .../ObserveTopiaApplicationContextFactory.java | 3 - .../ird/observe/services/binder/BinderEngine.java | 54 +- .../services/binder/BinderEngineInitializer.java | 32 +- .../ird/observe/services/binder/BinderSupport.java | 14 +- .../binder/data/ActivityLonglineBinder.java | 9 +- .../data/ActivityLonglineEncouterDtoBinder.java | 8 +- .../data/ActivityLonglineSensorUsedDtoBinder.java | 8 +- .../binder/data/ActivityLonglineStubDtoBinder.java | 4 +- .../services/binder/data/ActivitySeineBinder.java | 9 +- .../data/ActivitySeineObservedSystemDtoBinder.java | 8 +- .../binder/data/ActivitySeineStubDtoBinder.java | 4 +- .../binder/data/BaitsCompositionBinder.java | 4 +- .../observe/services/binder/data/BasketBinder.java | 4 +- .../services/binder/data/BranchlineBinder.java | 6 +- .../binder/data/BranchlinesCompositionBinder.java | 4 +- .../services/binder/data/CatchLonglineBinder.java | 6 +- .../services/binder/data/DataBinderSupport.java | 38 +- .../services/binder/data/EncounterBinder.java | 5 +- .../services/binder/data/FloatingObjectBinder.java | 6 +- .../FloatingObjectObservedSpeciesDtoBinder.java | 6 +- .../FloatingObjectSchoolEstimateDtoBinder.java | 6 +- .../FloatingObjectTransmittingBuoyDtoBinder.java | 6 +- .../binder/data/FloatlinesCompositionBinder.java | 4 +- .../binder/data/GearUseFeaturesLonglineBinder.java | 6 +- .../GearUseFeaturesMeasurementLonglineBinder.java | 4 +- .../GearUseFeaturesMeasurementSeineBinder.java | 4 +- .../binder/data/GearUseFeaturesSeineBinder.java | 6 +- .../binder/data/HooksCompositionBinder.java | 4 +- .../services/binder/data/NonTargetCatchBinder.java | 6 +- .../binder/data/NonTargetLengthBinder.java | 4 +- .../binder/data/NonTargetSampleBinder.java | 6 +- .../binder/data/ObjectObservedSpeciesBinder.java | 6 +- .../binder/data/ObjectSchoolEstimateBinder.java | 4 +- .../observe/services/binder/data/RouteBinder.java | 12 +- .../services/binder/data/RouteStubDtoBinder.java | 4 +- .../services/binder/data/SchoolEstimateBinder.java | 4 +- .../services/binder/data/SectionBinder.java | 4 +- .../services/binder/data/SensorUsedBinder.java | 4 +- .../services/binder/data/SetLonglineBinder.java | 12 +- .../binder/data/SetLonglineCatchDtoBinder.java | 6 +- .../SetLonglineDetailCompositionDtoBinder.java | 6 +- .../SetLonglineGlobalCompositionDtoBinder.java | 8 +- .../binder/data/SetLonglineStubDtoBinder.java | 2 +- .../binder/data/SetLonglineTdrDtoBinder.java | 6 +- .../services/binder/data/SetSeineBinder.java | 12 +- .../data/SetSeineNonTargetCatchDtoBinder.java | 4 +- .../data/SetSeineSchoolEstimateDtoBinder.java | 8 +- .../binder/data/SetSeineTargetCatchDtoBinder.java | 6 +- .../services/binder/data/SizeMeasureBinder.java | 4 +- .../services/binder/data/TargetCatchBinder.java | 6 +- .../services/binder/data/TargetLengthBinder.java | 4 +- .../services/binder/data/TargetSampleBinder.java | 6 +- .../observe/services/binder/data/TdrBinder.java | 4 +- .../binder/data/TransmittingBuoyBinder.java | 4 +- .../binder/data/TripLonglineActivityDtoBinder.java | 4 +- .../services/binder/data/TripLonglineBinder.java | 8 +- .../binder/data/TripLonglineGearUseDtoBinder.java | 6 +- .../services/binder/data/TripSeineBinder.java | 8 +- .../binder/data/TripSeineGearUseDtoBinder.java | 6 +- .../services/binder/data/WeightMeasureBinder.java | 4 +- .../referential/ReferentialBinderSupport.java | 22 +- .../observe/services/entity/EntitiesExtractor.java | 4 +- .../services/entity/EntitiesSetFactory.java | 32 +- .../entity/SpeciesListEntitiesExtractor.java | 4 +- .../DataSourceDumpProducerServiceTopia.java | 150 ----- .../services/service/DataSourceServiceTopia.java | 98 ++- .../services/service/ReferentialServiceTopia.java | 48 +- .../service/SqlScriptProducerServiceTopia.java | 145 +++++ .../service/actions/report/ReportServiceTopia.java | 18 +- .../GenerateValidatorDescriptorsFileTool.java | 19 +- .../actions/validate/ValidateServiceTopia.java | 23 +- .../ActivityLongLineEncouterServiceTopia.java | 9 +- .../ActivityLongLineSensorUsedServiceTopia.java | 9 +- .../longline/ActivityLonglineServiceTopia.java | 13 +- .../service/longline/BranchlineServiceTopia.java | 9 +- .../longline/SetLonglineCatchServiceTopia.java | 9 +- .../SetLonglineDetailCompositionServiceTopia.java | 7 +- .../SetLonglineGlobalCompositionServiceTopia.java | 9 +- .../service/longline/SetLonglineServiceTopia.java | 7 +- .../services/service/longline/TdrServiceTopia.java | 9 +- .../longline/TripLonglineGearUseServiceTopia.java | 7 +- .../service/longline/TripLonglineServiceTopia.java | 9 +- .../ActivitySeineObservedSystemServiceTopia.java | 9 +- .../service/seine/ActivitySeineServiceTopia.java | 11 +- .../service/seine/FloatingObjectServiceTopia.java | 8 +- .../service/seine/NonTargetCatchServiceTopia.java | 6 +- .../service/seine/NonTargetSampleServiceTopia.java | 6 +- .../seine/ObjectObservedSpeciesServiceTopia.java | 9 +- .../seine/ObjectSchoolEstimateServiceTopia.java | 9 +- .../services/service/seine/RouteServiceTopia.java | 15 +- .../service/seine/SchoolEstimateServiceTopia.java | 6 +- .../service/seine/SetSeineServiceTopia.java | 5 +- .../service/seine/TargetCatchServiceTopia.java | 6 +- .../service/seine/TargetSampleServiceTopia.java | 6 +- .../TransmittingBuoyOperationServiceTopia.java | 9 +- .../seine/TripSeineGearUseServiceTopia.java | 13 +- .../service/seine/TripSeineServiceTopia.java | 9 +- .../referentiel/LengthWeightParemetersTest.java | 20 +- .../replication/ReplicateReferentialsTest.java | 32 + .../entities/replication/ReplicateTestSupport.java | 108 ++++ .../replication/ReplicateTripLonglineTest.java | 65 ++ .../replication/ReplicateTripSeineTest.java | 62 ++ .../services/ApplicationContextResource.java | 217 ++++--- .../ird/observe/services/DataSourceResource.java | 203 ++++--- .../services/ObserveServiceContextTopiaTaiste.java | 2 +- .../services/binder/BinderEngineMetadataTest.java | 49 +- .../observe/services/binder/BinderEngineTest.java | 29 +- .../services/service/AbstractServiceTopiaTest.java | 155 +---- .../DataSourceDumpProducerServiceTopiaTest.java | 85 --- .../service/DataSourceServiceTopiaTest.java | 43 +- .../services/service/MigrateTestsDatabases.java | 94 +++ .../service/ReferentialServiceTopiaTest.java | 37 +- .../service/SqlScriptProducerServiceTopiaTest.java | 81 +++ .../ConsolidateDataServiceTopiaTest.java | 23 +- .../report/AbstractReportServiceTopiaTest.java | 28 +- .../report/ReportSetByAssociation2Test.java | 50 -- .../actions/validate/ValidateServiceTopiaTest.java | 26 +- ...tLonglineDetailCompositionServiceTopiaTest.java | 35 +- .../service/seine/RouteServiceTopiaTest.java | 27 +- .../seine/TargetSampleServiceTopiaTest.java | 22 +- .../seine/TripSeineGearUseServiceTopiaTest.java | 37 +- .../service/seine/TripSeineServiceTopiaTest.java | 104 ++-- .../src/test/resources/log4j.properties | 2 + observe-test-data/pom.xml | 28 +- .../java/fr/ird/observe/test/DatabaseName.java | 13 + .../java/fr/ird/observe/test/ObserveFixtures.java | 311 ++++++++++ .../main/java/fr/ird/observe/test/TestHelper.java | 61 +- .../test/spi/CopyDatabaseConfiguration.java | 17 + .../test/spi/DatabaseNameConfiguration.java | 21 + .../test/spi/DatabaseVersionConfiguration.java | 19 + .../resources/db/5.0-3/dataForTestLongline.sql.gz | Bin 0 -> 1579146 bytes .../resources/db/5.0-3/dataForTestSeine.sql.gz | Bin 0 -> 439122 bytes .../src/main/resources/db/5.0-3/empty.sql.gz | Bin 0 -> 7858 bytes .../src/main/resources/db/5.0-3/referentiel.sql.gz | Bin 0 -> 162896 bytes .../main/resources/db/5.0/dataForTestSeine.sql.gz | Bin 0 -> 438481 bytes .../src/main/resources/db/5.0/referentiel.sql.gz | Bin 0 -> 142316 bytes pom.xml | 11 +- 254 files changed, 4523 insertions(+), 2665 deletions(-) delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceDumpProducerServiceController.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/LastUpdateDateTopiaDao.java copy observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/{DataSourceMigrationForVersion_5_0_1.java => DataSourceMigrationForVersion_5_0_2.java} (86%) copy observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/{DataSourceMigrationForVersion_5_0_1.java => DataSourceMigrationForVersion_5_0_3.java} (84%) rename observe-entities/src/main/java/fr/ird/observe/entities/referentiel/{ReferenceEntities.java => ObserveReferentialEntities.java} (76%) rename observe-entities/src/main/java/fr/ird/observe/entities/referentiel/{ReferenceEntityImpl.java => ObserveReferentialEntityImpl.java} (92%) rename observe-entities/src/main/resources/db/{5.0 => 5.0-1}/remove_open_field-H2.sql (71%) rename observe-entities/src/main/resources/db/{5.0 => 5.0-1}/remove_open_field-PG.sql (71%) create mode 100644 observe-entities/src/main/resources/db/5.0-2/add_lastUpdateDate_field-H2.sql create mode 100644 observe-entities/src/main/resources/db/5.0-2/add_lastUpdateDate_field-PG.sql create mode 100644 observe-entities/src/main/resources/db/5.0-3/add_lastUpdateDate_table-H2.sql create mode 100644 observe-entities/src/main/resources/db/5.0-3/add_lastUpdateDate_table-PG.sql delete mode 100644 observe-entities/src/main/resources/db/5.0.1/add_lastUpdate_field_2-H2.sql delete mode 100644 observe-entities/src/main/resources/db/5.0.1/add_lastUpdate_field_2-PG.sql delete mode 100644 observe-entities/src/main/resources/db/5.0/add_lastUpdate_field-H2.sql delete mode 100644 observe-entities/src/main/resources/db/5.0/add_lastUpdate_field-PG.sql delete 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/SqlScriptProducerRequest.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/SqlScriptProducerService.java delete mode 100644 observe-services-configuration-rest/src/test/resources/log4j.properties delete mode 100644 observe-services-configuration-topia/src/test/resources/log4j.properties delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/FollowedUpdateDto.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/result/TripChildSaveResultDtos.java delete 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/SqlScriptProducerServiceTopia.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateReferentialsTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateTestSupport.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateTripLonglineTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateTripSeineTest.java delete mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceDumpProducerServiceTopiaTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/SqlScriptProducerServiceTopiaTest.java delete mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportSetByAssociation2Test.java create mode 100644 observe-test-data/src/main/java/fr/ird/observe/test/DatabaseName.java create mode 100644 observe-test-data/src/main/java/fr/ird/observe/test/ObserveFixtures.java create mode 100644 observe-test-data/src/main/java/fr/ird/observe/test/spi/CopyDatabaseConfiguration.java create mode 100644 observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseNameConfiguration.java create mode 100644 observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfiguration.java create mode 100644 observe-test-data/src/main/resources/db/5.0-3/dataForTestLongline.sql.gz create mode 100644 observe-test-data/src/main/resources/db/5.0-3/dataForTestSeine.sql.gz create mode 100644 observe-test-data/src/main/resources/db/5.0-3/empty.sql.gz create mode 100644 observe-test-data/src/main/resources/db/5.0-3/referentiel.sql.gz create mode 100644 observe-test-data/src/main/resources/db/5.0/dataForTestSeine.sql.gz create mode 100644 observe-test-data/src/main/resources/db/5.0/referentiel.sql.gz -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.