May 2018 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] Ajout de la donnée observe_longline.SampleLogbook - See #913
by Tony CHEMIT 30 May '18

30 May '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f675e61a by Tony CHEMIT at 2018-05-30T08:38:47Z Ajout de la donnée observe_longline.SampleLogbook - See #913 Ajout de la donnée observe_longline.LandingLogbook - See #912 Amélioration nom des écrans de type List - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseAndCreateUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseOpenUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglineLogbooksUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglineObssUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivitySeinesUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveRoutesUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripLonglinesUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripSeinesUIAction.java - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ObserveFocusManager.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglinesUI.jaxx → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineListUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglinesUI.jcss → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineListUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglinesUIHandler.java → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineListUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglinesUIModel.java → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineListUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbooksUI.jaxx → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookListUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbooksUI.jcss → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookListUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbooksUIHandler.java → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookListUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbooksUIModel.java → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookListUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SampleLogbookUI.jaxx → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookSampleUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SampleLogbookUI.jcss → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookSampleUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SampleLogbookUIHandler.java → client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookSampleUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineLandingLogbookListUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineLandingLogbookListUI.jcss - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineLandingLogbookListUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineLandingLogbookListUIModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineSampleLogbookListUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineSampleLogbookListUI.jcss - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineSampleLogbookListUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/TripLonglineSampleLogbookListUIModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f675e61a11a2f6378d0ef22a03d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f675e61a11a2f6378d0ef22a03d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Ajout de la donnée observe_longline.LandingLogbook - See #912
by Tony CHEMIT 29 May '18

29 May '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: dfa4e682 by Tony CHEMIT at 2018-05-29T09:49:33Z Ajout de la donnée observe_longline.LandingLogbook - See #912 - - - - - ab8e2ace by Tony CHEMIT at 2018-05-29T13:40:48Z Ajout de la donnée observe_longline.SampleLogbook - See #913 - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/db/ClientDataContext.java - client/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client/src/main/java/fr/ird/observe/client/db/constants/DataContextType.java - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LandingLogbookUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LandingLogbookUI.jcss - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LandingLogbookUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LandingLogbookUIModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LandingPartLogbookUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LandingPartLogbookUI.jcss - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LandingPartLogbookUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/LandingPartLogbookUIModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SampleLogbookUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SampleLogbookUI.jcss - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SampleLogbookUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SampleLogbookUIModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUI.jcss - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/SamplePartLogbookUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/table/ContentTableModel.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTree.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/TripLonglineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/logbook/ActivityLonglineLogbookNavigationTreeNode.java - + client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/logbook/ActivitySampleLogbookLonglineNavigationTreeNode.java - + client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/logbook/LandingLonglineLogbookNavigationTreeNode.java - + client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/logbook/TripSampleLogbookLonglineNavigationTreeNode.java - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c66efd5384882c9bcbac024534… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c66efd5384882c9bcbac024534… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ajout de la donnée observe_longline.ActivityLogbook - See #907 \
by Tony CHEMIT 25 May '18

25 May '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c66efd53 by Tony CHEMIT at 2018-05-25T21:12:53Z Ajout de la donnée observe_longline.ActivityLogbook - See #907 \ Ajout de la donnée observe_longline.SetLogbook - See #909 \ Ajout de la donnée observe_longline.CatchLogbook - See #911 \ - - - - - 30 changed files: - client/src/main/assembly/dist/obstuna-admin/extra/04_create-postgis-4-activity-longine.sql - client/src/main/java/fr/ird/observe/client/ObserveOpenDataManager.java - client/src/main/java/fr/ird/observe/client/db/ClientDataContext.java - client/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client/src/main/java/fr/ird/observe/client/db/constants/DataContextType.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/AddActivityLonglineLogbookSetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddActivityLonglineSetUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/AddActivityLonglineObsSetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseAndCreateUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseOpenUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglineLogbookUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglineLogbooksUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglineUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglineObsUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglinesUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglineObssUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/GotoOpenActivityAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/GotoOpenSetAction.java - client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/content/ObserveFocusManager.java - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/longline/TripLonglineUI.jcss - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jcss - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUIModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbooksUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbooksUI.jcss - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbooksUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c66efd5384882c9bcbac024534c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c66efd5384882c9bcbac024534c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ajout de la donnée observe_longline.ActivityLogbook - See #907
by Tony CHEMIT 25 May '18

25 May '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4bc401f5 by Tony CHEMIT at 2018-05-25T13:38:45Z Ajout de la donnée observe_longline.ActivityLogbook - See #907 Ajout de la donnée observe_longline.SetLogbook - See #909 Ajout de la donnée observe_longline.CatchLogbook - See #911 - - - - - 30 changed files: - client/src/main/assembly/dist/obstuna-admin/extra/04_create-postgis-4-activity-longine.sql - client/src/main/java/fr/ird/observe/client/ObserveOpenDataManager.java - client/src/main/java/fr/ird/observe/client/db/ClientDataContext.java - client/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client/src/main/java/fr/ird/observe/client/db/constants/DataContextType.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/AddActivityLonglineLogbookSetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddActivityLonglineSetUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/AddActivityLonglineObsSetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseAndCreateUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseOpenUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglineLogbookUIAction.java - + client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglineLogbooksUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglineUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglineObsUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglinesUIAction.java → client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglineObssUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveTripUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/GotoOpenActivityAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/GotoOpenSetAction.java - client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ObserveFocusManager.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUI.jcss - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbookUIModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbooksUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbooksUI.jcss - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbooksUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/ActivityLonglineLogbooksUIModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BaitsCompositionLogbookUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/data/longline/logbook/BaitsCompositionLogbookUI.jcss The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4bc401f5a9d84c9bcd2bfcc3bb6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4bc401f5a9d84c9bcd2bfcc3bb6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Use exploded models (really easier to maintain)
by Tony CHEMIT 24 May '18

24 May '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f4d34d88 by Tony CHEMIT at 2018-05-24T14:56:00Z Use exploded models (really easier to maintain) - - - - - a094c540 by Tony CHEMIT at 2018-05-24T14:56:03Z Improve test API (adding more fixtures) + update pom - - - - - 18 changed files: - + dto/src/main/models/Observe-00-common.model - + dto/src/main/models/Observe-01-referential-common.model - + dto/src/main/models/Observe-02-referential-seine.model - + dto/src/main/models/Observe-03-referential-longline.model - + dto/src/main/models/Observe-04-data-seine.model - + dto/src/main/models/Observe-05-data-longline-obs.model - + dto/src/main/models/Observe-06-data-longline-logbook.model - + dto/src/main/models/Observe-07-data-longline.model - − dto/src/main/models/Observe.model - persistence/pom.xml - + persistence/src/main/models/Observe-00-common.model - + persistence/src/main/models/Observe-01-referential-common.model - + persistence/src/main/models/Observe-02-referential-seine.model - + persistence/src/main/models/Observe-03-referential-longline.model - + persistence/src/main/models/Observe-04-data-seine.model - + persistence/src/main/models/Observe-05-data-longline-obs.model - + persistence/src/main/models/Observe-06-data-longline-logbook.model - + persistence/src/main/models/Observe-07-data-longline.model The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7d79fb2a1f73cc85d9f3eaafa1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7d79fb2a1f73cc85d9f3eaafa1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 33 commits: Ajout de nouvelles entrées dans le référentiel observe_common.VesselType - Closes #889
by Tony CHEMIT 24 May '18

24 May '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 11c0ea66 by Tony CHEMIT at 2018-05-24T14:11:57Z Ajout de nouvelles entrées dans le référentiel observe_common.VesselType - Closes #889 - - - - - 7d387fcc by Tony CHEMIT at 2018-05-24T14:12:02Z Modification du référentiel Person - Closes #890 - - - - - 7a73dd33 by Tony CHEMIT at 2018-05-24T14:12:04Z Renommage du référentiel observe_longline.TripType - Closes #919 - - - - - 1201f48d by Tony CHEMIT at 2018-05-24T14:12:29Z Ajout de nouvelles entrées au référentiel observe_longline.VesselActivity - Closes #891 - - - - - c99b0e30 by Tony CHEMIT at 2018-05-24T14:12:31Z Ajout du référentiel observe_longline.WeightDeterminationMethod - Closes #921 - - - - - 69143ab1 by Tony CHEMIT at 2018-05-24T14:12:32Z Ajout du référentiel observe_longline.WeightCategory - Closes #920 - - - - - ea9397e6 by Tony CHEMIT at 2018-05-24T14:12:34Z Ajout du référentiel observe_common.Compagnies - Closes #896 - - - - - 89a8dd97 by Tony CHEMIT at 2018-05-24T14:12:35Z Ajout du référentiel observe_common.WeightMeasureMethod - Clses #899 Ajout du référentiel observe_common.LengthMeasureMethod - Closes #900 - - - - - ea656b28 by Tony CHEMIT at 2018-05-24T14:12:37Z Ajout du référentiel observe_longline.Conservation - Close #898 Ajout du référentiel observe_longline.OnBoardProcessing - Closes #897 Ajout du référentiel observe_longline.DataSource - Closes #894 Ajout du référentiel observe_longline.LogbookTripType - Clses #893 - - - - - 332ef74f by Tony CHEMIT at 2018-05-24T14:12:37Z use last stable of toolkit - - - - - de778697 by Tony CHEMIT at 2018-05-24T14:12:37Z add missing license headers - - - - - fb49290d by Tony CHEMIT at 2018-05-24T14:12:38Z Renommage de la classe seine.WeightCategory en seine.WeightCategorySeine - Closes #950 - - - - - db328868 by Tony CHEMIT at 2018-05-24T14:12:39Z [jgitflow-maven-plugin]updating poms for 8.0-alpha-2-SNAPSHOT development[skip ci] - - - - - 4a06ce41 by Tony CHEMIT at 2018-05-24T14:12:39Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 784610ce by Tony CHEMIT at 2018-05-24T14:13:20Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-alpha-1' with non-snapshot versions[skip ci] - - - - - ac9fcdaa by Tony CHEMIT at 2018-05-24T14:13:24Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - a2bafc8c by Tony CHEMIT at 2018-05-24T14:13:25Z let build on develop branches [skip ci] - - - - - 918c8cf2 by Tony CHEMIT at 2018-05-24T14:13:25Z update changelog after release 8.0-alpha-1 [skip ci] - - - - - ba855483 by Tony CHEMIT at 2018-05-24T14:13:25Z Renommage des « données observateurs » du modèle Palangre - Closes #903 - - - - - 58c44a31 by Tony CHEMIT at 2018-05-24T14:16:12Z Ajout du référentiel observe_longline.TripType - Closes #951 - - - - - 1c8b4220 by Tony CHEMIT at 2018-05-24T14:16:16Z Réusinage de la donnée observe_longline.Trip - Closes #904 - - - - - 2aadd299 by Tony CHEMIT at 2018-05-24T14:16:17Z use topia extension - - - - - cb01134b by Tony CHEMIT at 2018-05-24T14:16:17Z Tableaux de synthèse - Closes #916 - - - - - 5b631564 by Tony CHEMIT at 2018-05-24T14:16:17Z Correction des variables dans les rapports - - - - - a9e1a4a1 by Tony CHEMIT at 2018-05-24T14:16:18Z Gestion des méthodes de mesure sur les formulaires existants - Closes #917 - - - - - 26403c36 by Tony CHEMIT at 2018-05-24T14:16:19Z Update toolkit and topia-extension - - - - - 4a24fae4 by Tony CHEMIT at 2018-05-24T14:16:19Z update gitlab cache and changelog of release 8.0-alpha-2 - - - - - 7faa0b45 by Tony CHEMIT at 2018-05-24T14:16:19Z [jgitflow-maven-plugin]updating poms for 8.0-alpha-3-SNAPSHOT development[skip ci] - - - - - ef91eaea by Tony CHEMIT at 2018-05-24T14:16:19Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 807338a3 by Tony CHEMIT at 2018-05-24T14:16:19Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - fda4d1cb by Tony CHEMIT at 2018-05-24T14:16:19Z suppression des enumerations pour generer les constantes - - - - - 6cda09ce by Tony CHEMIT at 2018-05-24T14:16:20Z Use exploded models (really easier to maintain) - - - - - 7d79fb2a by Tony CHEMIT at 2018-05-24T14:16:20Z Improve test API (adding more fixtures) + update pom - - - - - 30 changed files: - .gitlab-ci.yml - + .mvn/gitlab-cache/milestones/528849-artifacts.json - + .mvn/gitlab-cache/milestones/528849-issues.json - + .mvn/gitlab-cache/milestones/528849.json - + .mvn/gitlab-cache/milestones/529485-artifacts.json - + .mvn/gitlab-cache/milestones/529485-issues.json - + .mvn/gitlab-cache/milestones/529485.json - + .mvn/gitlab-cache/milestones/532584-issues.json - + .mvn/gitlab-cache/milestones/532584.json - − .mvn/jvm.config - − .mvn/maven.config - CHANGELOG.md - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties - client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties - client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties - client/pom.xml - client/src/main/assembly/dist/obstuna-admin/extra/04_create-postgis-4-activity-longine.sql - client/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client/src/main/java/fr/ird/observe/client/db/constants/DataContextType.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/AddActivityLonglineSetUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseAndCreateUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/CloseOpenUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglineUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/content/MoveActivityLonglinesUIAction.java - client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/report/ReportUI.jcss - client/src/main/java/fr/ird/observe/client/ui/admin/report/ReportUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/266d7bebf0b23091a6ec07c92e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/266d7bebf0b23091a6ec07c92e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Use exploded models (really easier to maintain)
by Tony CHEMIT 24 May '18

24 May '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 578b9bb7 by Tony CHEMIT at 2018-05-24T14:08:10Z Use exploded models (really easier to maintain) - - - - - 266d7beb by Tony CHEMIT at 2018-05-24T14:08:12Z Improve test API (adding more fixtures) + update pom - - - - - 18 changed files: - + dto/src/main/models/Observe-00-common.model - + dto/src/main/models/Observe-01-referential-common.model - + dto/src/main/models/Observe-02-referential-seine.model - + dto/src/main/models/Observe-03-referential-longline.model - + dto/src/main/models/Observe-04-data-seine.model - + dto/src/main/models/Observe-05-data-longline-obs.model - + dto/src/main/models/Observe-06-data-longline-logbook.model - + dto/src/main/models/Observe-07-data-longline.model - − dto/src/main/models/Observe.model - persistence/pom.xml - + persistence/src/main/models/Observe-00-common.model - + persistence/src/main/models/Observe-01-referential-common.model - + persistence/src/main/models/Observe-02-referential-seine.model - + persistence/src/main/models/Observe-03-referential-longline.model - + persistence/src/main/models/Observe-04-data-seine.model - + persistence/src/main/models/Observe-05-data-longline-obs.model - + persistence/src/main/models/Observe-06-data-longline-logbook.model - + persistence/src/main/models/Observe-07-data-longline.model The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/bc8d6251bd16f93b2b80dd45cf… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/bc8d6251bd16f93b2b80dd45cf… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Improve test API (adding more fixtures) + update pom
by Tony CHEMIT 24 May '18

24 May '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bc8d6251 by Tony CHEMIT at 2018-05-24T13:46:14Z Improve test API (adding more fixtures) + update pom - - - - - 18 changed files: - pom.xml - services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java - test/src/main/java/fr/ird/observe/test/ObserveFixtures.java - + test/src/main/resources/fixtures/bean-validator-detector-n1-create.list - + test/src/main/resources/fixtures/bean-validator-detector-n1-update.list - + test/src/main/resources/fixtures/count-data-longline-1.properties - + test/src/main/resources/fixtures/count-data-longline-2.properties - + test/src/main/resources/fixtures/count-data-longline-3.properties - + test/src/main/resources/fixtures/count-data-seine-1.properties - + test/src/main/resources/fixtures/count-data-seine-2.properties - + test/src/main/resources/fixtures/count-data-seine-3.properties - + test/src/main/resources/fixtures/count-referential-common.properties - + test/src/main/resources/fixtures/count-referential-longline.properties - + test/src/main/resources/fixtures/count-referential-seine.properties - + test/src/main/resources/fixtures/global.properties - + test/src/main/resources/fixtures/validate-service-referential.properties - + test/src/main/resources/fixtures/validate-service-seine-trips.properties - validation/src/test/java/fr/ird/observe/client/validation/BeanValidatorDetectorTest.java Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2018.37</version> + <version>2018.38</version> </parent> <groupId>fr.ird.observe</groupId> @@ -138,8 +138,6 @@ <properties> - <lib.version.java4all.eugene>3.0-alpha-22-SNAPSHOT</lib.version.java4all.eugene> - <organizationId>ultreiaio</organizationId> <projectId>ird-observe</projectId> <stageId>frirdobserve</stageId> @@ -154,9 +152,10 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <lib.version.java4all.topia>1.1</lib.version.java4all.topia> <observeToolkitVersion>4.0</observeToolkitVersion> +  +    <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation> ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java +++ b/services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java @@ -23,89 +23,9 @@ package fr.ird.observe.services.local.service.actions.validate; */ import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import fr.ird.observe.dto.IdDto; -import fr.ird.observe.dto.data.seine.ActivitySeineDto; -import fr.ird.observe.dto.data.seine.FloatingObjectDto; -import fr.ird.observe.dto.data.seine.NonTargetCatchDto; -import fr.ird.observe.dto.data.seine.NonTargetLengthDto; -import fr.ird.observe.dto.data.seine.RouteDto; -import fr.ird.observe.dto.data.seine.SetSeineDto; -import fr.ird.observe.dto.data.seine.TargetLengthDto; -import fr.ird.observe.dto.data.seine.TransmittingBuoyDto; -import fr.ird.observe.dto.data.seine.TripSeineDto; -import fr.ird.observe.dto.referential.CountryDto; -import fr.ird.observe.dto.referential.DataQualityDto; -import fr.ird.observe.dto.referential.FpaZoneDto; -import fr.ird.observe.dto.referential.GearCaracteristicDto; -import fr.ird.observe.dto.referential.GearCaracteristicTypeDto; -import fr.ird.observe.dto.referential.GearDto; -import fr.ird.observe.dto.referential.HarbourDto; -import fr.ird.observe.dto.referential.LengthMeasureMethodDto; -import fr.ird.observe.dto.referential.LengthWeightParameterDto; -import fr.ird.observe.dto.referential.OceanDto; -import fr.ird.observe.dto.referential.OrganismDto; -import fr.ird.observe.dto.referential.PersonDto; -import fr.ird.observe.dto.referential.ProgramDto; -import fr.ird.observe.dto.referential.SexDto; -import fr.ird.observe.dto.referential.ShipOwnerDto; -import fr.ird.observe.dto.referential.SizeMeasureTypeDto; -import fr.ird.observe.dto.referential.SpeciesDto; -import fr.ird.observe.dto.referential.SpeciesGroupDto; -import fr.ird.observe.dto.referential.SpeciesGroupReleaseModeDto; -import fr.ird.observe.dto.referential.SpeciesListDto; -import fr.ird.observe.dto.referential.VesselDto; -import fr.ird.observe.dto.referential.VesselSizeCategoryDto; -import fr.ird.observe.dto.referential.VesselTypeDto; -import fr.ird.observe.dto.referential.WeightMeasureMethodDto; -import fr.ird.observe.dto.referential.WeightMeasureTypeDto; -import fr.ird.observe.dto.referential.WindDto; -import fr.ird.observe.dto.referential.longline.BaitHaulingStatusDto; -import fr.ird.observe.dto.referential.longline.BaitSettingStatusDto; -import fr.ird.observe.dto.referential.longline.BaitTypeDto; -import fr.ird.observe.dto.referential.longline.CatchFateLonglineDto; -import fr.ird.observe.dto.referential.longline.ConservationDto; -import fr.ird.observe.dto.referential.longline.DataSourceDto; -import fr.ird.observe.dto.referential.longline.EncounterTypeDto; -import fr.ird.observe.dto.referential.longline.HealthnessDto; -import fr.ird.observe.dto.referential.longline.HookPositionDto; -import fr.ird.observe.dto.referential.longline.HookSizeDto; -import fr.ird.observe.dto.referential.longline.HookTypeDto; -import fr.ird.observe.dto.referential.longline.ItemHorizontalPositionDto; -import fr.ird.observe.dto.referential.longline.ItemVerticalPositionDto; -import fr.ird.observe.dto.referential.longline.LightsticksColorDto; -import fr.ird.observe.dto.referential.longline.LightsticksTypeDto; -import fr.ird.observe.dto.referential.longline.LineTypeDto; -import fr.ird.observe.dto.referential.longline.LogbookTripTypeDto; -import fr.ird.observe.dto.referential.longline.MaturityStatusDto; -import fr.ird.observe.dto.referential.longline.MitigationTypeDto; -import fr.ird.observe.dto.referential.longline.ObservationTripTypeDto; -import fr.ird.observe.dto.referential.longline.OnBoardProcessingDto; -import fr.ird.observe.dto.referential.longline.SensorBrandDto; -import fr.ird.observe.dto.referential.longline.SensorDataFormatDto; -import fr.ird.observe.dto.referential.longline.SensorTypeDto; -import fr.ird.observe.dto.referential.longline.SettingShapeDto; -import fr.ird.observe.dto.referential.longline.StomacFullnessDto; -import fr.ird.observe.dto.referential.longline.TripTypeDto; -import fr.ird.observe.dto.referential.longline.VesselActivityLonglineDto; -import fr.ird.observe.dto.referential.seine.DetectionModeDto; -import fr.ird.observe.dto.referential.seine.NonTargetCatchReleaseConformityDto; -import fr.ird.observe.dto.referential.seine.NonTargetCatchReleaseStatusDto; -import fr.ird.observe.dto.referential.seine.NonTargetCatchReleasingTimeDto; -import fr.ird.observe.dto.referential.seine.ObjectMaterialDto; -import fr.ird.observe.dto.referential.seine.ObjectMaterialTypeDto; -import fr.ird.observe.dto.referential.seine.ObjectOperationDto; -import fr.ird.observe.dto.referential.seine.ObservedSystemDto; -import fr.ird.observe.dto.referential.seine.ReasonForDiscardDto; -import fr.ird.observe.dto.referential.seine.ReasonForNoFishingDto; -import fr.ird.observe.dto.referential.seine.ReasonForNullSetDto; -import fr.ird.observe.dto.referential.seine.SpeciesFateDto; -import fr.ird.observe.dto.referential.seine.SpeciesStatusDto; -import fr.ird.observe.dto.referential.seine.SurroundingActivityDto; -import fr.ird.observe.dto.referential.seine.TransmittingBuoyOperationDto; -import fr.ird.observe.dto.referential.seine.TransmittingBuoyTypeDto; -import fr.ird.observe.dto.referential.seine.VesselActivitySeineDto; -import fr.ird.observe.dto.referential.seine.WeightCategorySeineDto; import fr.ird.observe.services.local.service.ServiceLocalTestSupport; import fr.ird.observe.services.service.actions.validate.DataValidationRequest; import fr.ird.observe.services.service.actions.validate.ReferentialValidationRequest; @@ -122,6 +42,8 @@ import org.junit.Before; import org.junit.Test; import org.nuiton.validator.NuitonValidatorScope; +import java.util.Map; + /** * @author Tony Chemit - dev(a)tchemit.fr */ @@ -135,6 +57,7 @@ public class ValidateServiceLocalTest extends ServiceLocalTestSupport { service = localTestMethodResource.newService(ValidateService.class); } + @SuppressWarnings("unchecked") @Test public void testValidateReferential() { @@ -153,151 +76,15 @@ public class ValidateServiceLocalTest extends ServiceLocalTestSupport { ImmutableSet<ValidationResultDtoMessage> messages = result.getMessagesForType(type); System.out.println("assertValidateResult(result, " + type.getSimpleName() + ".class, " + messages.size() + ");"); } - // no data of LengthLegnthParameter, WeightDeterminationMethod, WeightCategoryLongline, Compagnies - Assert.assertEquals(DtoModelClasses.REFERENTIAL_TYPES.size() - 4, types.size()); - - assertValidateResult(result, DataQualityDto.class, 1); - assertValidateResult(result, SpeciesGroupReleaseModeDto.class, 2); - assertValidateResult(result, SettingShapeDto.class, 3); - assertValidateResult(result, BaitHaulingStatusDto.class, 3); - assertValidateResult(result, ObservationTripTypeDto.class, 1); - assertValidateResult(result, TransmittingBuoyOperationDto.class, 3); - assertValidateResult(result, WeightCategorySeineDto.class, 3); - assertValidateResult(result, LengthMeasureMethodDto.class, 2); - assertValidateResult(result, WeightMeasureMethodDto.class, 3); - assertValidateResult(result, ReasonForNoFishingDto.class, 3); - assertValidateResult(result, ObservedSystemDto.class, 4); - assertValidateResult(result, SpeciesDto.class, 13); - assertValidateResult(result, PersonDto.class, 4); - assertValidateResult(result, HookPositionDto.class, 1); - assertValidateResult(result, HookTypeDto.class, 1); - assertValidateResult(result, SpeciesListDto.class, 2); - assertValidateResult(result, LightsticksColorDto.class, 2); - assertValidateResult(result, BaitSettingStatusDto.class, 1); - assertValidateResult(result, VesselTypeDto.class, 4); - assertValidateResult(result, SexDto.class, 2); - assertValidateResult(result, NonTargetCatchReleaseConformityDto.class, 2); - - assertValidateResult(result, MaturityStatusDto.class, 3); - assertValidateResult(result, LengthWeightParameterDto.class, 7); - assertValidateResult(result, NonTargetCatchReleaseStatusDto.class, 2); - assertValidateResult(result, SurroundingActivityDto.class, 3); - assertValidateResult(result, ItemVerticalPositionDto.class, 1); - assertValidateResult(result, OceanDto.class, 3); - assertValidateResult(result, VesselActivitySeineDto.class, 4); - assertValidateResult(result, HarbourDto.class, 5); - assertValidateResult(result, HealthnessDto.class, 1); - assertValidateResult(result, ObjectOperationDto.class, 2); - assertValidateResult(result, SensorDataFormatDto.class, 2); - assertValidateResult(result, ObjectMaterialTypeDto.class, 2); - assertValidateResult(result, CountryDto.class, 5); - assertValidateResult(result, ReasonForNullSetDto.class, 3); - assertValidateResult(result, FpaZoneDto.class, 5); - assertValidateResult(result, NonTargetCatchReleasingTimeDto.class, 1); - - assertValidateResult(result, EncounterTypeDto.class, 1); - assertValidateResult(result, VesselDto.class, 10); - assertValidateResult(result, MitigationTypeDto.class, 1); - assertValidateResult(result, VesselSizeCategoryDto.class, 1); - assertValidateResult(result, SizeMeasureTypeDto.class, 3); - assertValidateResult(result, ShipOwnerDto.class, 1); - assertValidateResult(result, CatchFateLonglineDto.class, 1); - assertValidateResult(result, GearCaracteristicTypeDto.class, 3); - assertValidateResult(result, GearCaracteristicDto.class, 2); - assertValidateResult(result, ReasonForDiscardDto.class, 3); - assertValidateResult(result, WeightMeasureTypeDto.class, 1); - assertValidateResult(result, LightsticksTypeDto.class, 1); - assertValidateResult(result, ItemHorizontalPositionDto.class, 3); - assertValidateResult(result, OrganismDto.class, 4); - assertValidateResult(result, GearDto.class, 3); - assertValidateResult(result, DetectionModeDto.class, 3); - assertValidateResult(result, HookSizeDto.class, 3); - assertValidateResult(result, SensorBrandDto.class, 1); - assertValidateResult(result, SensorTypeDto.class, 3); - assertValidateResult(result, TransmittingBuoyTypeDto.class, 3); - assertValidateResult(result, SpeciesFateDto.class, 3); - assertValidateResult(result, WindDto.class, 1); - assertValidateResult(result, SpeciesStatusDto.class, 3); - assertValidateResult(result, VesselActivityLonglineDto.class, 1); - assertValidateResult(result, ObjectMaterialDto.class, 10); - assertValidateResult(result, LineTypeDto.class, 2); - assertValidateResult(result, ProgramDto.class, 9); - assertValidateResult(result, BaitTypeDto.class, 3); - assertValidateResult(result, SpeciesGroupDto.class, 2); - assertValidateResult(result, StomacFullnessDto.class, 3); - assertValidateResult(result, ConservationDto.class, 2); - assertValidateResult(result, OnBoardProcessingDto.class, 1); - assertValidateResult(result, DataSourceDto.class, 3); - assertValidateResult(result, LogbookTripTypeDto.class, 3); - assertValidateResult(result, TripTypeDto.class, 2); - -// assertValidateResult(result, CountryDto.class, 53); -// assertValidateResult(result, FpaZoneDto.class, 41); -// assertValidateResult(result, GearCaracteristicDto.class, 22); -// assertValidateResult(result, GearCaracteristicTypeDto.class, 6); -// assertValidateResult(result, GearDto.class, 26); -// assertValidateResult(result, HarbourDto.class, 74); -// assertValidateResult(result, LengthWeightParameterDto.class, 352); -// assertValidateResult(result, OceanDto.class, 3); -// assertValidateResult(result, OrganismDto.class, 8); -// assertValidateResult(result, PersonDto.class, 390); -// assertValidateResult(result, ProgramDto.class, 27); -// assertValidateResult(result, SexDto.class, 5); -// assertValidateResult(result, ShipOwnerDto.class, 27); -// assertValidateResult(result, SizeMeasureTypeDto.class, 17); -// assertValidateResult(result, SpeciesDto.class, 275); -// assertValidateResult(result, SpeciesGroupDto.class, 10); -// assertValidateResult(result, SpeciesGroupReleaseModeDto.class, 10); -// assertValidateResult(result, SpeciesListDto.class, 5); -// assertValidateResult(result, VesselDto.class, 977); -// assertValidateResult(result, VesselSizeCategoryDto.class, 13); -// assertValidateResult(result, VesselTypeDto.class, 14); -// assertValidateResult(result, WeightMeasureTypeDto.class, 3); -// -// assertValidateResult(result, BaitHaulingStatusDto.class, 5); -// assertValidateResult(result, BaitSettingStatusDto.class, 5); -// assertValidateResult(result, BaitTypeDto.class, 16); -// assertValidateResult(result, CatchFateLonglineDto.class, 5); -// assertValidateResult(result, EncounterTypeDto.class, 12); -// assertValidateResult(result, HealthnessDto.class, 6); -// assertValidateResult(result, HookPositionDto.class, 13); -// assertValidateResult(result, HookSizeDto.class, 22); -// assertValidateResult(result, HookTypeDto.class, 13); -// assertValidateResult(result, ItemHorizontalPositionDto.class, 3); -// assertValidateResult(result, ItemVerticalPositionDto.class, 3); -// assertValidateResult(result, LightsticksColorDto.class, 7); -// assertValidateResult(result, LightsticksTypeDto.class, 2); -// assertValidateResult(result, LineTypeDto.class, 8); -// assertValidateResult(result, MaturityStatusDto.class, 12); -// assertValidateResult(result, MitigationTypeDto.class, 15); -// assertValidateResult(result, SensorBrandDto.class, 4); -// assertValidateResult(result, SensorDataFormatDto.class, 2); -// assertValidateResult(result, SensorTypeDto.class, 4); -// assertValidateResult(result, SettingShapeDto.class, 6); -// assertValidateResult(result, StomacFullnessDto.class, 7); -// assertValidateResult(result, ObservationTripTypeDto.class, 3); -// assertValidateResult(result, VesselActivityLonglineDto.class, 5); -// -// assertValidateResult(result, DetectionModeDto.class, 10); -// assertValidateResult(result, ObjectOperationDto.class, 10); -// assertValidateResult(result, ObjectMaterialTypeDto.class, 4); -// assertValidateResult(result, ObjectMaterialDto.class, 86); -// assertValidateResult(result, ObservedSystemDto.class, 21); -// assertValidateResult(result, ReasonForDiscardDto.class, 5); -// assertValidateResult(result, ReasonForNoFishingDto.class, 13); -// assertValidateResult(result, ReasonForNullSetDto.class, 10); -// assertValidateResult(result, SpeciesFateDto.class, 9); -// assertValidateResult(result, SpeciesStatusDto.class, 3); -// assertValidateResult(result, SurroundingActivityDto.class, 8); -// assertValidateResult(result, TransmittingBuoyOperationDto.class, 3); -// assertValidateResult(result, TransmittingBuoyTypeDto.class, 12); -// assertValidateResult(result, VesselActivitySeineDto.class, 23); -// assertValidateResult(result, WeightCategorySeineDto.class, 101); -// assertValidateResult(result, WindDto.class, 13); - + ImmutableMap<Class<?>, Long> fixtures = ObserveFixtures.loadFixturesMapDtoCount("validate-service-referential"); + Assert.assertEquals(fixtures.size(), types.size()); + for (Map.Entry<Class<?>, Long> entry : fixtures.entrySet()) { + assertValidateResult(result, (Class) entry.getKey(), entry.getValue().intValue()); + } } + @SuppressWarnings("unchecked") @Test public void testValidateTripSeines() { @@ -323,26 +110,17 @@ public class ValidateServiceLocalTest extends ServiceLocalTestSupport { ImmutableSet<ValidationResultDtoMessage> messages = result.getMessagesForType(type); System.out.println("assertValidateResult(result, " + type.getSimpleName() + ".class, " + messages.size() + ");"); } - Assert.assertEquals(9, types.size()); - - assertValidateResult(result, TripSeineDto.class, 4); - assertValidateResult(result, RouteDto.class, 38); // 55 - assertValidateResult(result, ActivitySeineDto.class, 68); // 1516 - assertValidateResult(result, TransmittingBuoyDto.class, 1); - assertValidateResult(result, SetSeineDto.class, 3); - assertValidateResult(result, NonTargetCatchDto.class, 3); - assertValidateResult(result, NonTargetLengthDto.class, 6); // 1009 !!! - assertValidateResult(result, TargetLengthDto.class, 1); // 85 !!! - assertValidateResult(result, FloatingObjectDto.class, 1); + ImmutableMap<Class<?>, Long> fixtures = ObserveFixtures.loadFixturesMapDtoCount("validate-service-seine-trips"); + Assert.assertEquals(fixtures.size(), types.size()); + for (Map.Entry<Class<?>, Long> entry : fixtures.entrySet()) { + assertValidateResult(result, (Class) entry.getKey(), entry.getValue().intValue()); + } } private <D extends IdDto> void assertValidateResult(ValidationResult<?> result, Class<D> dtoType, int expectedCount) { - ImmutableSet<ValidationResultDtoMessage> messages = result.getMessagesForType(dtoType); Assert.assertEquals("For type:" + dtoType, expectedCount, messages.size()); - } - } ===================================== test/src/main/java/fr/ird/observe/test/ObserveFixtures.java ===================================== --- a/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java +++ b/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java @@ -22,11 +22,22 @@ package fr.ird.observe.test; * #L% */ +import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import org.apache.commons.lang3.mutable.MutableLong; - +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.URL; +import java.util.Collection; import java.util.Map; +import java.util.Objects; +import java.util.Properties; import java.util.TreeMap; /** @@ -35,313 +46,53 @@ import java.util.TreeMap; * @author Tony Chemit - dev(a)tchemit.fr */ public class ObserveFixtures { - - public static final String TRIP_SEINE_ID_1 = "fr.ird.observe.entities.seine.TripSeine#1359167789871#0.6765335978809843"; - public static final String TRIP_SEINE_ID_2 = "fr.ird.observe.entities.seine.TripSeine#1359280279156#0.41771067982188215"; - public static final String TRIP_SEINE_ID_3 = "fr.ird.observe.entities.seine.TripSeine#1360156698296#0.6097793743126777"; - - public static final ImmutableSet<String> TRIP_SEINE_IDS = ImmutableSet.of( - TRIP_SEINE_ID_1, - TRIP_SEINE_ID_2, - TRIP_SEINE_ID_3 - ); - - public static final String PROGRAM_ID = "fr.ird.observe.entities.referentiel.Program#1239832686262#0.31033946454061234"; - - public static final String TRIP_LONGLINE_ID_1 = "fr.ird.observe.entities.longline.TripLongline#1429538088091#0.763886003987864"; - - public static final String TRIP_LONGLINE_ID_2 = "fr.ird.observe.entities.longline.TripLongline#1429540363472#0.517173705156893"; - - public static final String TRIP_LONGLINE_ID_3 = "fr.ird.observe.entities.longline.TripLongline#1429537115030#0.493692863034084"; - -// public static final ImmutableSet<String> TRIP_LONGLINE_IDS = ImmutableSet.of( -// TRIP_LONGLINE_ID_1, -// TRIP_LONGLINE_ID_2, -// TRIP_LONGLINE_ID_3 -// ); - - public static final String SET_LONGLINE_ID_1 = "fr.ird.observe.entities.longline.SetLonglineObs#1429538714446#0.0876020351424813"; - - private static final int ENTITY_BINDER_REFERENTIAL_COUNT = 76; - public static final int REFERENCE_DATA_COUNT = 33; + private static final Log log = LogFactory.getLog(ObserveFixtures.class); + private static final ImmutableMap<String, String> GLOBAL = loadFixturesMap("global"); + + public static final String TRIP_SEINE_ID_1 = GLOBAL.get("TRIP_SEINE_ID_1"); + public static final String TRIP_SEINE_ID_2 = GLOBAL.get("TRIP_SEINE_ID_2"); + public static final String TRIP_SEINE_ID_3 = GLOBAL.get("TRIP_SEINE_ID_3"); + public static final String PROGRAM_ID = GLOBAL.get("PROGRAM_ID"); + public static final String TRIP_LONGLINE_ID_1 = GLOBAL.get("TRIP_LONGLINE_ID_1"); + public static final String TRIP_LONGLINE_ID_2 = GLOBAL.get("TRIP_LONGLINE_ID_2"); + public static final String TRIP_LONGLINE_ID_3 = GLOBAL.get("TRIP_LONGLINE_ID_3"); + public static final String SET_LONGLINE_ID_1 = GLOBAL.get("SET_LONGLINE_ID_1"); + public static final String GEAR_USE_FEATURES_SEINE_ID = GLOBAL.get("GEAR_USE_FEATURES_SEINE_ID"); + public static final String GEAR_USE_FEATURES_SEINE_ID_1 = GLOBAL.get("GEAR_USE_FEATURES_SEINE_ID_1"); + public static final String SPECIES_GROUP_ID = GLOBAL.get("SPECIES_GROUP_ID"); + public static final String SET_SEINE_ID = GLOBAL.get("SET_SEINE_ID"); + public static final int REFERENCE_DATA_COUNT = Integer.valueOf(GLOBAL.get("REFERENCE_DATA_COUNT")); + public static final int DATA_FORM_COUNT = Integer.valueOf(GLOBAL.get("DATA_FORM_COUNT")); + public static final int VALIDATORS_COUNT = Integer.valueOf(GLOBAL.get("VALIDATORS_COUNT")); + public static final int VALIDATOR_CREATE_DATA_COUNT = Integer.valueOf(GLOBAL.get("VALIDATOR_CREATE_DATA_COUNT")); + public static final int VALIDATOR_UPDATE_DATA_COUNT = Integer.valueOf(GLOBAL.get("VALIDATOR_UPDATE_DATA_COUNT")); + public static final int VALIDATOR_UPDATE_ENTITY_DATA_COUNT = Integer.valueOf(GLOBAL.get("VALIDATOR_UPDATE_ENTITY_DATA_COUNT")); + public static final int VALIDATOR_UPDATE_EXTRA_CREATE_DATA_COUNT = Integer.valueOf(GLOBAL.get("VALIDATOR_UPDATE_EXTRA_CREATE_DATA_COUNT")); + public static final int ENTITIES_LIMIT_SIZE = Integer.valueOf(GLOBAL.get("ENTITIES_LIMIT_SIZE")); + private static final int ENTITY_BINDER_REFERENTIAL_COUNT = Integer.valueOf(GLOBAL.get("ENTITY_BINDER_REFERENTIAL_COUNT")); + + public static final ImmutableMap<String, Long> TRIP_SEINE_1_TABLES_COUNT = loadFixturesMapCount("count-data-seine-1"); + public static final ImmutableMap<String, Long> TRIP_SEINE_2_TABLES_COUNT = loadFixturesMapCount("count-data-seine-2"); + public static final ImmutableMap<String, Long> TRIP_SEINE_3_TABLES_COUNT = loadFixturesMapCount("count-data-seine-3"); + public static final ImmutableMap<String, Long> TRIP_LONGLINE_1_TABLES_COUNT = loadFixturesMapCount("count-data-longline-1"); + public static final ImmutableMap<String, Long> TRIP_LONGLINE_2_TABLES_COUNT = loadFixturesMapCount("count-data-longline-2"); + public static final ImmutableMap<String, Long> TRIP_LONGLINE_3_TABLES_COUNT = loadFixturesMapCount("count-data-longline-3"); + public static final ImmutableSet<String> TRIP_SEINE_IDS = ImmutableSet.of(TRIP_SEINE_ID_1, TRIP_SEINE_ID_2, TRIP_SEINE_ID_3); + public static final ImmutableMap<String, Long> ALL_TRIP_SEINE_COUNT = mergeResults(TRIP_SEINE_1_TABLES_COUNT, TRIP_SEINE_2_TABLES_COUNT, TRIP_SEINE_3_TABLES_COUNT); + public static final ImmutableMap<String, Long> ALL_TRIP_LONGLINE_COUNT = mergeResults(TRIP_LONGLINE_1_TABLES_COUNT, TRIP_LONGLINE_2_TABLES_COUNT, TRIP_LONGLINE_3_TABLES_COUNT); public static final int REFERENTIAL_FORM_COUNT = ENTITY_BINDER_REFERENTIAL_COUNT; - public static final int DATA_FORM_COUNT = 48; - - public static final int VALIDATORS_COUNT = 210; - public static final int VALIDATOR_CREATE_DATA_COUNT = 8; - public static final int VALIDATOR_UPDATE_DATA_COUNT = 37; - public static final int VALIDATOR_UPDATE_ENTITY_DATA_COUNT = 29; public static final int VALIDATOR_UPDATE_REFERENTIAL_COUNT = ENTITY_BINDER_REFERENTIAL_COUNT; public static final int VALIDATOR_CREATE_REFERENTIAL_COUNT = ENTITY_BINDER_REFERENTIAL_COUNT; - public static final int VALIDATOR_UPDATE_EXTRA_CREATE_DATA_COUNT = 13; - - public static final ImmutableMap<String, Long> TRIP_SEINE_1_TABLES_COUNT = ImmutableMap - .<String, Long>builder() - .put("observe_seine.trip", 1L) - .put("observe_seine.gearusefeatures", 2L) - .put("observe_seine.gearusefeaturesmeasurement", 4L) - .put("observe_seine.route", 34L) - .put("observe_seine.set", 35L) - .put("observe_seine.activity", 862L) - .put("observe_seine.floatingobject", 54L) - .put("observe_seine.schoolestimate", 27L) - .put("observe_seine.nontargetcatch", 109L) - .put("observe_seine.nontargetsample", 20L) - .put("observe_seine.nontargetlength", 767L) - .put("observe_seine.targetcatch", 73L) - .put("observe_seine.targetsample", 10L) - .put("observe_seine.targetlength", 85L) - .put("observe_seine.objectobservedspecies", 3L) - .put("observe_seine.objectschoolestimate", 1L) - .put("observe_seine.transmittingbuoy", 62L) - .put("observe_seine.activity_observedsystem", 1182L) - .put("observe_seine.nontargetcatchrelease", 0L) - .put("observe_seine.floatingobjectpart", 58L) - .build(); - public static final ImmutableMap<String, Long> TRIP_SEINE_2_TABLES_COUNT = ImmutableMap - .<String, Long>builder() - .put("observe_seine.trip", 1L) - .put("observe_seine.gearusefeatures", 0L) - .put("observe_seine.gearusefeaturesmeasurement", 0L) - .put("observe_seine.route", 46L) - .put("observe_seine.set", 42L) - .put("observe_seine.activity", 657L) - .put("observe_seine.activity_observedsystem", 652L) - .put("observe_seine.floatingobject", 50L) - .put("observe_seine.schoolestimate", 10L) - .put("observe_seine.nontargetcatch", 112L) - .put("observe_seine.nontargetcatchrelease", 0L) - .put("observe_seine.floatingobjectpart", 53L) - .put("observe_seine.nontargetsample", 19L) - .put("observe_seine.nontargetlength", 242L) - .put("observe_seine.targetcatch", 73L) - .put("observe_seine.targetsample", 0L) - .put("observe_seine.targetlength", 0L) - .put("observe_seine.objectobservedspecies", 2L) - .put("observe_seine.objectschoolestimate", 3L) - .put("observe_seine.transmittingbuoy", 68L) - .build(); - public static final ImmutableMap<String, Long> TRIP_SEINE_3_TABLES_COUNT = ImmutableMap - .<String, Long>builder() - .put("observe_seine.trip", 1L) - .put("observe_seine.gearusefeatures", 0L) - .put("observe_seine.gearusefeaturesmeasurement", 0L) - .put("observe_seine.route", 45L) - .put("observe_seine.set", 35L) - .put("observe_seine.activity", 816L) - .put("observe_seine.floatingobject", 41L) - .put("observe_seine.schoolestimate", 35L) - .put("observe_seine.nontargetcatch", 104L) - .put("observe_seine.nontargetsample", 16L) - .put("observe_seine.nontargetlength", 1193L) - .put("observe_seine.targetcatch", 118L) - .put("observe_seine.targetsample", 14L) - .put("observe_seine.targetlength", 53L) - .put("observe_seine.objectobservedspecies", 0L) - .put("observe_seine.objectschoolestimate", 24L) - .put("observe_seine.transmittingbuoy", 39L) - .put("observe_seine.activity_observedsystem", 321L) - .put("observe_seine.nontargetcatchrelease", 0L) - .put("observe_seine.floatingobjectpart", 42L) - .build(); + private static final ImmutableMap<String, Long> REFERENTIAL_COMMON_TABLES_COUNT = loadFixturesMapCount("count-referential-common"); - public static final ImmutableMap<String, Long> ALL_TRIP_SEINE_COUNT = mergeResults( - TRIP_SEINE_1_TABLES_COUNT, - TRIP_SEINE_2_TABLES_COUNT, - TRIP_SEINE_3_TABLES_COUNT - ); + private static final ImmutableMap<String, Long> REFERENTIAL_SEINE_TABLES_COUNT = loadFixturesMapCount("count-referential-seine"); - public static final ImmutableMap<String, Long> TRIP_LONGLINE_1_TABLES_COUNT = ImmutableMap - .<String, Long>builder() - .put("observe_longline.trip", 1L) - .put("observe_longline.setObs", 13L) - .put("observe_longline.activityObs", 13L) - .put("observe_longline.gearusefeatures", 0L) - .put("observe_longline.gearusefeaturesmeasurement", 0L) - .put("observe_longline.encounterObs", 27L) - .put("observe_longline.sensorusedObs", 0L) - .put("observe_longline.tdrObs", 0L) - .put("observe_longline.baitscompositionObs", 13L) - .put("observe_longline.floatlinescompositionObs", 65L) - .put("observe_longline.hookscompositionObs", 39L) - .put("observe_longline.branchlinescompositionObs", 13L) - .put("observe_longline.sectionObs", 234L) - .put("observe_longline.basketObs", 3042L) - .put("observe_longline.branchlineObs", 18252L) - .put("observe_longline.catchObs", 435L) - .put("observe_longline.catchObs_predator", 49L) - .put("observe_longline.sizemeasureObs", 340L) - .put("observe_longline.weightmeasureObs", 0L) - .put("observe_longline.tdrrecordObs", 0L) - .put("observe_longline.species_tdrObs", 0L) - .put("observe_longline.mitigationtype_setObs", 0L) - .build(); + private static final ImmutableMap<String, Long> REFERENTIAL_LONGLINE_TABLES_COUNT = loadFixturesMapCount("count-referential-longline"); - public static final ImmutableMap<String, Long> TRIP_LONGLINE_2_TABLES_COUNT = ImmutableMap - .<String, Long>builder() - .put("observe_longline.trip", 1L) - .put("observe_longline.setObs", 5L) - .put("observe_longline.activityObs", 5L) - .put("observe_longline.gearusefeatures", 0L) - .put("observe_longline.gearusefeaturesmeasurement", 0L) - .put("observe_longline.encounterObs", 3L) - .put("observe_longline.sensorusedObs", 0L) - .put("observe_longline.tdrObs", 0L) - .put("observe_longline.baitscompositionObs", 10L) - .put("observe_longline.floatlinescompositionObs", 0L) - .put("observe_longline.hookscompositionObs", 10L) - .put("observe_longline.branchlinescompositionObs", 2L) - .put("observe_longline.sectionObs", 95L) - .put("observe_longline.basketObs", 1140L) - .put("observe_longline.branchlineObs", 6840L) - .put("observe_longline.catchObs", 152L) - .put("observe_longline.sizemeasureObs", 116L) - .put("observe_longline.weightmeasureObs", 0L) - .put("observe_longline.tdrrecordObs", 0L) - .put("observe_longline.species_tdrObs", 0L) - .put("observe_longline.mitigationtype_setObs", 0L) - .put("observe_longline.catchObs_predator", 9L) - .build(); + public static final ImmutableMap<String, Long> REFERENTIAL_TABLES_COUNT = mergeResults(REFERENTIAL_COMMON_TABLES_COUNT, REFERENTIAL_LONGLINE_TABLES_COUNT, REFERENTIAL_SEINE_TABLES_COUNT); - public static final ImmutableMap<String, Long> TRIP_LONGLINE_3_TABLES_COUNT = ImmutableMap - .<String, Long>builder() - .put("observe_longline.trip", 1L) - .put("observe_longline.setObs", 14L) - .put("observe_longline.activityObs", 14L) - .put("observe_longline.gearusefeatures", 0L) - .put("observe_longline.gearusefeaturesmeasurement", 0L) - .put("observe_longline.encounterObs", 12L) - .put("observe_longline.sensorusedObs", 0L) - .put("observe_longline.tdrObs", 0L) - .put("observe_longline.baitscompositionObs", 14L) - .put("observe_longline.floatlinescompositionObs", 36L) - .put("observe_longline.hookscompositionObs", 42L) - .put("observe_longline.branchlinescompositionObs", 14L) - .put("observe_longline.sectionObs", 243L) - .put("observe_longline.basketObs", 3229L) - .put("observe_longline.branchlineObs", 19374L) - .put("observe_longline.catchObs", 677L) - .put("observe_longline.mitigationtype_setObs", 0L) - .put("observe_longline.sizemeasureObs", 647L) - .put("observe_longline.weightmeasureObs", 0L) - .put("observe_longline.catchObs_predator", 25L) - .put("observe_longline.tdrrecordObs", 0L) - .put("observe_longline.species_tdrObs", 0L) - .build(); - - public static final ImmutableMap<String, Long> ALL_TRIP_LONGLINE_COUNT = mergeResults( - TRIP_LONGLINE_1_TABLES_COUNT, - TRIP_LONGLINE_2_TABLES_COUNT, - TRIP_LONGLINE_3_TABLES_COUNT - ); - - public static final String GEAR_USE_FEATURES_SEINE_ID = "fr.ird.observe.entities.seine.GearUseFeaturesSeine#1440486230661#0.42614931015885216"; - public static final String GEAR_USE_FEATURES_SEINE_ID_1 = "fr.ird.observe.entities.seine.GearUseFeaturesSeine#1440486230661#0.42614931015885216"; - public static final String SPECIES_GROUP_ID = "fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683689#0.7120116158620075"; - public static final int ENTITIES_LIMIT_SIZE = 100; - - private static final ImmutableMap<String, Long> REFERENTIAL_COMMON_TABLES_COUNT = ImmutableMap - .<String, Long>builder() - .put("observe_common.country", 72L) - .put("observe_common.compagnies", 0L) - .put("observe_common.dataquality", 5L) - .put("observe_common.fpazone", 42L) - .put("observe_common.gear", 26L) - .put("observe_common.gear_gearcaracteristic", 29L) - .put("observe_common.gearcaracteristic", 22L) - .put("observe_common.gearcaracteristictype", 6L) - .put("observe_common.harbour", 74L) - .put("observe_common.lastupdatedate", 114L) - .put("observe_common.lengthlengthparameter", 0L) - .put("observe_common.lengthmeasuremethod", 4L) - .put("observe_common.lengthweightparameter", 365L) - .put("observe_common.ocean", 3L) - .put("observe_common.ocean_species", 500L) - .put("observe_common.organism", 9L) - .put("observe_common.person", 537L) - .put("observe_common.program", 27L) - .put("observe_common.shipowner", 27L) - .put("observe_common.sex", 5L) - .put("observe_common.sizemeasuretype", 17L) - .put("observe_common.species", 285L) - .put("observe_common.species_specieslist", 401L) - .put("observe_common.speciesgroup", 11L) - .put("observe_common.speciesgroupreleasemode", 9L) - .put("observe_common.speciesgroup_speciesgroupreleasemode", 19L) - .put("observe_common.specieslist", 7L) - .put("observe_common.vessel", 1172L) - .put("observe_common.vesselsizecategory", 13L) - .put("observe_common.vesseltype", 16L) - .put("observe_common.weightmeasuremethod", 3L) - .put("observe_common.weightmeasuretype", 3L) - .put("observe_common.wind", 13L) - .build(); - - private static final ImmutableMap<String, Long> REFERENTIAL_SEINE_TABLES_COUNT = ImmutableMap - .<String, Long>builder() - .put("observe_seine.detectionmode", 11L) - .put("observe_seine.nontargetcatchreleaseconformity", 5L) - .put("observe_seine.nontargetcatchreleasestatus", 5L) - .put("observe_seine.nontargetcatchreleasingtime", 4L) - .put("observe_seine.objectoperation", 10L) - .put("observe_seine.objectmaterial", 77L) - .put("observe_seine.objectmaterialtype", 4L) - .put("observe_seine.observedsystem", 24L) - .put("observe_seine.reasonfordiscard", 5L) - .put("observe_seine.reasonfornofishing", 13L) - .put("observe_seine.reasonfornullset", 10L) - .put("observe_seine.speciesfate", 10L) - .put("observe_seine.speciesstatus", 4L) - .put("observe_seine.surroundingactivity", 8L) - .put("observe_seine.transmittingbuoyoperation", 3L) - .put("observe_seine.transmittingbuoytype", 12L) - .put("observe_seine.vesselactivity", 23L) - .put("observe_seine.weightcategory", 110L) - .build(); - - private static final ImmutableMap<String, Long> REFERENTIAL_LONGLINE_TABLES_COUNT = ImmutableMap - .<String, Long>builder() - .put("observe_longline.baithaulingstatus", 5L) - .put("observe_longline.baitsettingstatus", 5L) - .put("observe_longline.baittype", 16L) - .put("observe_longline.catchfate", 5L) - .put("observe_longline.encountertype", 12L) - .put("observe_longline.healthness", 6L) - .put("observe_longline.hookposition", 13L) - .put("observe_longline.hooksize", 22L) - .put("observe_longline.hooktype", 13L) - .put("observe_longline.itemverticalposition", 3L) - .put("observe_longline.itemhorizontalposition", 3L) - .put("observe_longline.lightstickscolor", 7L) - .put("observe_longline.lightstickstype", 2L) - .put("observe_longline.linetype", 8L) - .put("observe_longline.maturitystatus", 12L) - .put("observe_longline.mitigationtype", 15L) - .put("observe_longline.observationtriptype", 3L) - .put("observe_longline.sensorbrand", 4L) - .put("observe_longline.sensordataformat", 2L) - .put("observe_longline.sensortype", 4L) - .put("observe_longline.settingshape", 6L) - .put("observe_longline.stomacfullness", 7L) - .put("observe_longline.vesselactivity", 12L) - .put("observe_longline.weightcategory", 0L) - .put("observe_longline.datasource", 20L) - .put("observe_longline.logbooktriptype", 3L) - .put("observe_longline.triptype", 3L) - .put("observe_longline.onboardprocessing", 5L) - .put("observe_longline.conservation", 2L) - .put("observe_longline.weightdeterminationmethod", 0L) - .build(); - - public static final ImmutableMap<String, Long> REFERENTIAL_TABLES_COUNT = mergeResults( - REFERENTIAL_COMMON_TABLES_COUNT, - REFERENTIAL_LONGLINE_TABLES_COUNT, - REFERENTIAL_SEINE_TABLES_COUNT - ); - - public static String SET_SEINE_ID = "fr.ird.observe.entities.seine.SetSeine#1359573677233#0.016313003525718517"; @SafeVarargs private static ImmutableMap<String, Long> mergeResults(ImmutableMap<String, Long>... expectedTablesCounts) { @@ -375,4 +126,95 @@ public class ObserveFixtures { return String.format("Will %s %d out of %d object(s) for %s", action, ENTITIES_LIMIT_SIZE, size, typeName); } } + + public static ImmutableMap<String, String> loadFixturesMap(String name) { + URL url = Objects.requireNonNull(ObserveFixtures.class.getClassLoader().getResource("fixtures/" + name + ".properties")); + try (InputStream inputStream = url.openStream()) { + log.debug(String.format("Fixture [%s] - Loading...", url)); + Properties p = new Properties(); + p.load(inputStream); + log.debug(String.format("Fixture [%s] - Loaded %d properties.", url, p.size())); + ImmutableMap.Builder<String, String> builder = ImmutableMap.builder(); + for (Map.Entry<Object, Object> entry : p.entrySet()) { + builder.put(entry.getKey().toString(), entry.getValue().toString()); + } + return builder.build(); + } catch (IOException e) { + throw new IllegalArgumentException("Can't load fixtures " + name, e); + } + } + + public static ImmutableList<String> loadFixturesList(String name) { + URL url = Objects.requireNonNull(ObserveFixtures.class.getClassLoader().getResource("fixtures/" + name + ".list")); + try (BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream()))) { + log.debug(String.format("Fixture [%s] - Loading...", url)); + ImmutableList.Builder<String> builder = ImmutableList.builder(); + String line; + while ((line = reader.readLine()) != null) { + builder.add(line); + } + ImmutableList<String> list = builder.build(); + log.debug(String.format("Fixture [%s] - Loaded %d elements.", url, list.size())); + return list; + } catch (IOException e) { + throw new IllegalArgumentException("Can't load fixtures " + name, e); + } + } + + public static ImmutableMap<String, Long> loadFixturesMapCount(String name) { + ImmutableMap.Builder<String, Long> builder = ImmutableMap.builder(); + for (Map.Entry<String, String> entry : loadFixturesMap(name).entrySet()) { + builder.put(entry.getKey(), Long.valueOf(entry.getValue())); + } + return builder.build(); + } + + public static ImmutableMap<Class<?>, Long> loadFixturesMapDtoCount(String name) { + ImmutableMap.Builder<Class<?>, Long> builder = ImmutableMap.builder(); + for (Map.Entry<String, String> entry : loadFixturesMap(name).entrySet()) { + builder.put(toDtoClass(entry.getKey()), Long.valueOf(entry.getValue())); + } + return builder.build(); + } + + public static ImmutableList<Class<?>> toClass(Collection<String> names, String... packageCandidates) { + ImmutableList.Builder<Class<?>> builder = ImmutableList.builder(); + for (String name : names) { + builder.add(Objects.requireNonNull(toClass(name, packageCandidates))); + } + return builder.build(); + } + + public static Class<?> toClass(String name, String... packageCandidates) { + for (String packageCandidate : packageCandidates) { + String fqn = packageCandidate + name; + try { + return Class.forName(fqn); + } catch (ClassNotFoundException ignored) { + } + } + + return null; + } + + public static final String[] dtoPackageCandidates = { + "fr.ird.observe.dto.referential.", + "fr.ird.observe.dto.referential.seine.", + "fr.ird.observe.dto.referential.longline.", + "fr.ird.observe.dto.data.", + "fr.ird.observe.dto.data.seine.", + "fr.ird.observe.dto.data.longline." + }; + + public static Class<?> toDtoClass(String name) { + return toClass(name,dtoPackageCandidates); + } + + public static ImmutableList<Class<?>> toDtoClass(Collection<String> names) { + return toClass(names, dtoPackageCandidates); + } + + public static ImmutableList<Class<?>> loadFixtureDtoList(String name) { + return toDtoClass(loadFixturesList(name)); + } } ===================================== test/src/main/resources/fixtures/bean-validator-detector-n1-create.list ===================================== --- /dev/null +++ b/test/src/main/resources/fixtures/bean-validator-detector-n1-create.list @@ -0,0 +1,84 @@ +ActivityLonglineObsDto +ActivitySeineDto +BaitHaulingStatusDto +BaitSettingStatusDto +BaitTypeDto +CatchFateLonglineDto +CompagniesDto +ConservationDto +CountryDto +DataQualityDto +DataSourceDto +DetectionModeDto +EncounterTypeDto +FloatingObjectDto +FpaZoneDto +GearCaracteristicDto +GearCaracteristicTypeDto +GearDto +HarbourDto +HealthnessDto +HookPositionDto +HookSizeDto +HookTypeDto +ItemHorizontalPositionDto +ItemVerticalPositionDto +LengthLengthParameterDto +LengthMeasureMethodDto +LengthWeightParameterDto +LightsticksColorDto +LightsticksTypeDto +LineTypeDto +LogbookTripTypeDto +MaturityStatusDto +MitigationTypeDto +NonTargetCatchReleaseConformityDto +NonTargetCatchReleaseStatusDto +NonTargetCatchReleasingTimeDto +ObjectMaterialDto +ObjectMaterialTypeDto +ObjectOperationDto +ObservationTripTypeDto +ObservedSystemDto +OceanDto +OnBoardProcessingDto +OrganismDto +PersonDto +ProgramDto +ReasonForDiscardDto +ReasonForNoFishingDto +ReasonForNullSetDto +RouteDto +SensorBrandDto +SensorDataFormatDto +SensorTypeDto +SetLonglineObsDto +SetSeineDto +SettingShapeDto +SexDto +ShipOwnerDto +SizeMeasureTypeDto +SpeciesDto +SpeciesFateDto +SpeciesGroupDto +SpeciesGroupReleaseModeDto +SpeciesListDto +SpeciesStatusDto +StomacFullnessDto +SurroundingActivityDto +TransmittingBuoyOperationDto +TransmittingBuoyTypeDto +TripLonglineDto +TripSeineDto +TripTypeDto +VesselActivityLonglineDto +VesselActivitySeineDto +VesselDto +VesselSizeCategoryDto +VesselTypeDto +WeightCategoryLonglineDto +WeightCategorySeineDto +WeightDeterminationMethodDto +WeightMeasureMethodDto +WeightMeasureTypeDto +WindDto \ No newline at end of file ===================================== test/src/main/resources/fixtures/bean-validator-detector-n1-update.list ===================================== --- /dev/null +++ b/test/src/main/resources/fixtures/bean-validator-detector-n1-update.list @@ -0,0 +1,113 @@ +ActivityLonglineObsDto +ActivityLonglineObsEncounterDto +ActivityLonglineObsSensorUsedDto +ActivitySeineDto +BaitHaulingStatusDto +BaitSettingStatusDto +BaitTypeDto +BaitsCompositionObsDto +BranchlineObsDto +BranchlinesCompositionObsDto +CatchFateLonglineDto +CatchLonglineObsDto +CompagniesDto +ConservationDto +CountryDto +DataQualityDto +DataSourceDto +DetectionModeDto +EncounterObsDto +EncounterTypeDto +FloatingObjectDto +FloatingObjectSchoolEstimateDto +FloatingObjectTransmittingBuoyDto +FloatlinesCompositionObsDto +FpaZoneDto +GearCaracteristicDto +GearCaracteristicTypeDto +GearDto +GearUseFeaturesLonglineDto +GearUseFeaturesSeineDto +HarbourDto +HealthnessDto +HookPositionDto +HookSizeDto +HookTypeDto +HooksCompositionObsDto +ItemHorizontalPositionDto +ItemVerticalPositionDto +LengthLengthParameterDto +LengthMeasureMethodDto +LengthWeightParameterDto +LightsticksColorDto +LightsticksTypeDto +LineTypeDto +LogbookTripTypeDto +MaturityStatusDto +MitigationTypeDto +NonTargetCatchDto +NonTargetCatchReleaseConformityDto +NonTargetCatchReleaseDto +NonTargetCatchReleaseStatusDto +NonTargetCatchReleasingTimeDto +NonTargetLengthDto +NonTargetSampleDto +ObjectMaterialDto +ObjectMaterialTypeDto +ObjectObservedSpeciesDto +ObjectOperationDto +ObjectSchoolEstimateDto +ObservationTripTypeDto +ObservedSystemDto +OceanDto +OnBoardProcessingDto +OrganismDto +PersonDto +ProgramDto +ReasonForDiscardDto +ReasonForNoFishingDto +ReasonForNullSetDto +RouteDto +SchoolEstimateDto +SensorBrandDto +SensorDataFormatDto +SensorTypeDto +SensorUsedObsDto +SetLonglineObsDto +SetSeineDto +SetSeineNonTargetCatchDto +SetSeineSchoolEstimateDto +SettingShapeDto +SexDto +ShipOwnerDto +SizeMeasureTypeDto +SpeciesDto +SpeciesFateDto +SpeciesGroupDto +SpeciesGroupReleaseModeDto +SpeciesListDto +SpeciesStatusDto +StomacFullnessDto +SurroundingActivityDto +TargetLengthDto +TargetSampleDto +TdrObsDto +TransmittingBuoyDto +TransmittingBuoyOperationDto +TransmittingBuoyTypeDto +TripLonglineDto +TripLonglineGearUseDto +TripSeineDto +TripSeineGearUseDto +TripTypeDto +VesselActivityLonglineDto +VesselActivitySeineDto +VesselDto +VesselSizeCategoryDto +VesselTypeDto +WeightCategoryLonglineDto +WeightCategorySeineDto +WeightDeterminationMethodDto +WeightMeasureMethodDto +WeightMeasureTypeDto +WindDto \ No newline at end of file ===================================== test/src/main/resources/fixtures/count-data-longline-1.properties ===================================== --- /dev/null +++ b/test/src/main/resources/fixtures/count-data-longline-1.properties @@ -0,0 +1,22 @@ +observe_longline.trip=1 +observe_longline.setObs=13 +observe_longline.activityObs=13 +observe_longline.gearusefeatures=0 +observe_longline.gearusefeaturesmeasurement=0 +observe_longline.encounterObs=27 +observe_longline.sensorusedObs=0 +observe_longline.tdrObs=0 +observe_longline.baitscompositionObs=13 +observe_longline.floatlinescompositionObs=65 +observe_longline.hookscompositionObs=39 +observe_longline.branchlinescompositionObs=13 +observe_longline.sectionObs=234 +observe_longline.basketObs=3042 +observe_longline.branchlineObs=18252 +observe_longline.catchObs=435 +observe_longline.catchObs_predator=49 +observe_longline.sizemeasureObs=340 +observe_longline.weightmeasureObs=0 +observe_longline.tdrrecordObs=0 +observe_longline.species_tdrObs=0 +observe_longline.mitigationtype_setObs=0 \ No newline at end of file ===================================== test/src/main/resources/fixtures/count-data-longline-2.properties ===================================== --- /dev/null +++ b/test/src/main/resources/fixtures/count-data-longline-2.properties @@ -0,0 +1,22 @@ +observe_longline.trip=1 +observe_longline.setObs=5 +observe_longline.activityObs=5 +observe_longline.gearusefeatures=0 +observe_longline.gearusefeaturesmeasurement=0 +observe_longline.encounterObs=3 +observe_longline.sensorusedObs=0 +observe_longline.tdrObs=0 +observe_longline.baitscompositionObs=10 +observe_longline.floatlinescompositionObs=0 +observe_longline.hookscompositionObs=10 +observe_longline.branchlinescompositionObs=2 +observe_longline.sectionObs=95 +observe_longline.basketObs=1140 +observe_longline.branchlineObs=6840 +observe_longline.catchObs=152 +observe_longline.sizemeasureObs=116 +observe_longline.weightmeasureObs=0 +observe_longline.tdrrecordObs=0 +observe_longline.species_tdrObs=0 +observe_longline.mitigationtype_setObs=0 +observe_longline.catchObs_predator=9 \ No newline at end of file ===================================== test/src/main/resources/fixtures/count-data-longline-3.properties ===================================== --- /dev/null +++ b/test/src/main/resources/fixtures/count-data-longline-3.properties @@ -0,0 +1,22 @@ +observe_longline.trip=1 +observe_longline.setObs=14 +observe_longline.activityObs=14 +observe_longline.gearusefeatures=0 +observe_longline.gearusefeaturesmeasurement=0 +observe_longline.encounterObs=12 +observe_longline.sensorusedObs=0 +observe_longline.tdrObs=0 +observe_longline.baitscompositionObs=14 +observe_longline.floatlinescompositionObs=36 +observe_longline.hookscompositionObs=42 +observe_longline.branchlinescompositionObs=14 +observe_longline.sectionObs=243 +observe_longline.basketObs=3229 +observe_longline.branchlineObs=19374 +observe_longline.catchObs=677 +observe_longline.mitigationtype_setObs=0 +observe_longline.sizemeasureObs=647 +observe_longline.weightmeasureObs=0 +observe_longline.catchObs_predator=25 +observe_longline.tdrrecordObs=0 +observe_longline.species_tdrObs=0 \ No newline at end of file ===================================== test/src/main/resources/fixtures/count-data-seine-1.properties ===================================== --- /dev/null +++ b/test/src/main/resources/fixtures/count-data-seine-1.properties @@ -0,0 +1,20 @@ +observe_seine.trip=1 +observe_seine.gearusefeatures=2 +observe_seine.gearusefeaturesmeasurement=4 +observe_seine.route=34 +observe_seine.set=35 +observe_seine.activity=862 +observe_seine.floatingobject=54 +observe_seine.schoolestimate=27 +observe_seine.nontargetcatch=109 +observe_seine.nontargetsample=20 +observe_seine.nontargetlength=767 +observe_seine.targetcatch=73 +observe_seine.targetsample=10 +observe_seine.targetlength=85 +observe_seine.objectobservedspecies=3 +observe_seine.objectschoolestimate=1 +observe_seine.transmittingbuoy=62 +observe_seine.activity_observedsystem=1182 +observe_seine.nontargetcatchrelease=0 +observe_seine.floatingobjectpart=58 \ No newline at end of file ===================================== test/src/main/resources/fixtures/count-data-seine-2.properties ===================================== --- /dev/null +++ b/test/src/main/resources/fixtures/count-data-seine-2.properties @@ -0,0 +1,20 @@ +observe_seine.trip=1 +observe_seine.gearusefeatures=0 +observe_seine.gearusefeaturesmeasurement=0 +observe_seine.route=46 +observe_seine.set=42 +observe_seine.activity=657 +observe_seine.activity_observedsystem=652 +observe_seine.floatingobject=50 +observe_seine.schoolestimate=10 +observe_seine.nontargetcatch=112 +observe_seine.nontargetcatchrelease=0 +observe_seine.floatingobjectpart=53 +observe_seine.nontargetsample=19 +observe_seine.nontargetlength=242 +observe_seine.targetcatch=73 +observe_seine.targetsample=0 +observe_seine.targetlength=0 +observe_seine.objectobservedspecies=2 +observe_seine.objectschoolestimate=3 +observe_seine.transmittingbuoy=68 \ No newline at end of file ===================================== test/src/main/resources/fixtures/count-data-seine-3.properties ===================================== --- /dev/null +++ b/test/src/main/resources/fixtures/count-data-seine-3.properties @@ -0,0 +1,20 @@ +observe_seine.trip=1 +observe_seine.gearusefeatures=0 +observe_seine.gearusefeaturesmeasurement=0 +observe_seine.route=45 +observe_seine.set=35 +observe_seine.activity=816 +observe_seine.floatingobject=41 +observe_seine.schoolestimate=35 +observe_seine.nontargetcatch=104 +observe_seine.nontargetsample=16 +observe_seine.nontargetlength=1193 +observe_seine.targetcatch=118 +observe_seine.targetsample=14 +observe_seine.targetlength=53 +observe_seine.objectobservedspecies=0 +observe_seine.objectschoolestimate=24 +observe_seine.transmittingbuoy=39 +observe_seine.activity_observedsystem=321 +observe_seine.nontargetcatchrelease=0 +observe_seine.floatingobjectpart=42 \ No newline at end of file ===================================== test/src/main/resources/fixtures/count-referential-common.properties ===================================== --- /dev/null +++ b/test/src/main/resources/fixtures/count-referential-common.properties @@ -0,0 +1,33 @@ +observe_common.country=72 +observe_common.compagnies=0 +observe_common.dataquality=5 +observe_common.fpazone=42 +observe_common.gear=26 +observe_common.gear_gearcaracteristic=29 +observe_common.gearcaracteristic=22 +observe_common.gearcaracteristictype=6 +observe_common.harbour=74 +observe_common.lastupdatedate=114 +observe_common.lengthlengthparameter=0 +observe_common.lengthmeasuremethod=4 +observe_common.lengthweightparameter=365 +observe_common.ocean=3 +observe_common.ocean_species=500 +observe_common.organism=9 +observe_common.person=537 +observe_common.program=27 +observe_common.shipowner=27 +observe_common.sex=5 +observe_common.sizemeasuretype=17 +observe_common.species=285 +observe_common.species_specieslist=401 +observe_common.speciesgroup=11 +observe_common.speciesgroupreleasemode=9 +observe_common.speciesgroup_speciesgroupreleasemode=19 +observe_common.specieslist=7 +observe_common.vessel=1172 +observe_common.vesselsizecategory=13 +observe_common.vesseltype=16 +observe_common.weightmeasuremethod=3 +observe_common.weightmeasuretype=3 +observe_common.wind=13 \ No newline at end of file ===================================== test/src/main/resources/fixtures/count-referential-longline.properties ===================================== --- /dev/null +++ b/test/src/main/resources/fixtures/count-referential-longline.properties @@ -0,0 +1,30 @@ +observe_longline.baithaulingstatus=5 +observe_longline.baitsettingstatus=5 +observe_longline.baittype=16 +observe_longline.catchfate=5 +observe_longline.encountertype=12 +observe_longline.healthness=6 +observe_longline.hookposition=13 +observe_longline.hooksize=22 +observe_longline.hooktype=13 +observe_longline.itemverticalposition=3 +observe_longline.itemhorizontalposition=3 +observe_longline.lightstickscolor=7 +observe_longline.lightstickstype=2 +observe_longline.linetype=8 +observe_longline.maturitystatus=12 +observe_longline.mitigationtype=15 +observe_longline.observationtriptype=3 +observe_longline.sensorbrand=4 +observe_longline.sensordataformat=2 +observe_longline.sensortype=4 +observe_longline.settingshape=6 +observe_longline.stomacfullness=7 +observe_longline.vesselactivity=12 +observe_longline.weightcategory=0 +observe_longline.datasource=20 +observe_longline.logbooktriptype=3 +observe_longline.triptype=3 +observe_longline.onboardprocessing=5 +observe_longline.conservation=2 +observe_longline.weightdeterminationmethod=0 \ No newline at end of file ===================================== test/src/main/resources/fixtures/count-referential-seine.properties ===================================== --- /dev/null +++ b/test/src/main/resources/fixtures/count-referential-seine.properties @@ -0,0 +1,18 @@ +observe_seine.detectionmode=11 +observe_seine.nontargetcatchreleaseconformity=5 +observe_seine.nontargetcatchreleasestatus=5 +observe_seine.nontargetcatchreleasingtime=4 +observe_seine.objectoperation=10 +observe_seine.objectmaterial=77 +observe_seine.objectmaterialtype=4 +observe_seine.observedsystem=24 +observe_seine.reasonfordiscard=5 +observe_seine.reasonfornofishing=13 +observe_seine.reasonfornullset=10 +observe_seine.speciesfate=10 +observe_seine.speciesstatus=4 +observe_seine.surroundingactivity=8 +observe_seine.transmittingbuoyoperation=3 +observe_seine.transmittingbuoytype=12 +observe_seine.vesselactivity=23 +observe_seine.weightcategory=110 \ No newline at end of file ===================================== test/src/main/resources/fixtures/global.properties ===================================== --- /dev/null +++ b/test/src/main/resources/fixtures/global.properties @@ -0,0 +1,21 @@ +TRIP_SEINE_ID_1=fr.ird.observe.entities.seine.TripSeine#1359167789871#0.6765335978809843 +TRIP_SEINE_ID_2=fr.ird.observe.entities.seine.TripSeine#1359280279156#0.41771067982188215 +TRIP_SEINE_ID_3=fr.ird.observe.entities.seine.TripSeine#1360156698296#0.6097793743126777 +PROGRAM_ID=fr.ird.observe.entities.referentiel.Program#1239832686262#0.31033946454061234 +TRIP_LONGLINE_ID_1=fr.ird.observe.entities.longline.TripLongline#1429538088091#0.763886003987864 +TRIP_LONGLINE_ID_2=fr.ird.observe.entities.longline.TripLongline#1429540363472#0.517173705156893 +TRIP_LONGLINE_ID_3=fr.ird.observe.entities.longline.TripLongline#1429537115030#0.493692863034084 +SET_LONGLINE_ID_1=fr.ird.observe.entities.longline.SetLonglineObs#1429538714446#0.0876020351424813 +SET_SEINE_ID=fr.ird.observe.entities.seine.SetSeine#1359573677233#0.016313003525718517 +GEAR_USE_FEATURES_SEINE_ID=fr.ird.observe.entities.seine.GearUseFeaturesSeine#1440486230661#0.42614931015885216 +GEAR_USE_FEATURES_SEINE_ID_1=fr.ird.observe.entities.seine.GearUseFeaturesSeine#1440486230661#0.42614931015885216 +SPECIES_GROUP_ID=fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683689#0.7120116158620075 +REFERENCE_DATA_COUNT=33 +DATA_FORM_COUNT=48 +VALIDATORS_COUNT=210 +VALIDATOR_CREATE_DATA_COUNT=8 +VALIDATOR_UPDATE_DATA_COUNT=37 +VALIDATOR_UPDATE_ENTITY_DATA_COUNT=29 +VALIDATOR_UPDATE_EXTRA_CREATE_DATA_COUNT=13 +ENTITIES_LIMIT_SIZE=100 +ENTITY_BINDER_REFERENTIAL_COUNT=76 \ No newline at end of file ===================================== test/src/main/resources/fixtures/validate-service-referential.properties ===================================== --- /dev/null +++ b/test/src/main/resources/fixtures/validate-service-referential.properties @@ -0,0 +1,72 @@ +DataQualityDto=1 +SpeciesGroupReleaseModeDto=2 +SettingShapeDto=3 +BaitHaulingStatusDto=3 +ObservationTripTypeDto=1 +TransmittingBuoyOperationDto=3 +WeightCategorySeineDto=3 +LengthMeasureMethodDto=2 +WeightMeasureMethodDto=3 +ReasonForNoFishingDto=3 +ObservedSystemDto=4 +SpeciesDto=13 +PersonDto=4 +HookPositionDto=1 +HookTypeDto=1 +SpeciesListDto=2 +LightsticksColorDto=2 +BaitSettingStatusDto=1 +VesselTypeDto=4 +SexDto=2 +NonTargetCatchReleaseConformityDto=2 +MaturityStatusDto=3 +LengthWeightParameterDto=7 +NonTargetCatchReleaseStatusDto=2 +SurroundingActivityDto=3 +ItemVerticalPositionDto=1 +OceanDto=3 +VesselActivitySeineDto=4 +HarbourDto=5 +HealthnessDto=1 +ObjectOperationDto=2 +SensorDataFormatDto=2 +ObjectMaterialTypeDto=2 +CountryDto=5 +ReasonForNullSetDto=3 +FpaZoneDto=5 +NonTargetCatchReleasingTimeDto=1 +EncounterTypeDto=1 +VesselDto=10 +MitigationTypeDto=1 +VesselSizeCategoryDto=1 +SizeMeasureTypeDto=3 +ShipOwnerDto=1 +CatchFateLonglineDto=1 +GearCaracteristicTypeDto=3 +GearCaracteristicDto=2 +ReasonForDiscardDto=3 +WeightMeasureTypeDto=1 +LightsticksTypeDto=1 +ItemHorizontalPositionDto=3 +OrganismDto=4 +GearDto=3 +DetectionModeDto=3 +HookSizeDto=3 +SensorBrandDto=1 +SensorTypeDto=3 +TransmittingBuoyTypeDto=3 +SpeciesFateDto=3 +WindDto=1 +SpeciesStatusDto=3 +VesselActivityLonglineDto=1 +ObjectMaterialDto=10 +LineTypeDto=2 +ProgramDto=9 +BaitTypeDto=3 +SpeciesGroupDto=2 +StomacFullnessDto=3 +ConservationDto=2 +OnBoardProcessingDto=1 +DataSourceDto=3 +LogbookTripTypeDto=3 +TripTypeDto=2 \ No newline at end of file ===================================== test/src/main/resources/fixtures/validate-service-seine-trips.properties ===================================== --- /dev/null +++ b/test/src/main/resources/fixtures/validate-service-seine-trips.properties @@ -0,0 +1,9 @@ +TripSeineDto=4 +RouteDto=38 +ActivitySeineDto=68 +TransmittingBuoyDto=1 +SetSeineDto=3 +NonTargetCatchDto=3 +NonTargetLengthDto=6 +TargetLengthDto=1 +FloatingObjectDto=1 \ No newline at end of file ===================================== validation/src/test/java/fr/ird/observe/client/validation/BeanValidatorDetectorTest.java ===================================== --- a/validation/src/test/java/fr/ird/observe/client/validation/BeanValidatorDetectorTest.java +++ b/validation/src/test/java/fr/ird/observe/client/validation/BeanValidatorDetectorTest.java @@ -22,6 +22,7 @@ package fr.ird.observe.client.validation; * #L% */ +import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import fr.ird.observe.dto.data.longline.ActivityLonglineObsDto; import fr.ird.observe.dto.data.longline.ActivityLonglineObsEncounterDto; @@ -207,91 +208,9 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { assertEquals(ObserveFixtures.VALIDATOR_CREATE_DATA_COUNT + ObserveFixtures.VALIDATOR_CREATE_REFERENTIAL_COUNT, validators.size()); - assertValidatorSetWithSameContextName(validators, contextName, - ActivityLonglineObsDto.class, - ActivitySeineDto.class, - BaitHaulingStatusDto.class, - BaitSettingStatusDto.class, - BaitTypeDto.class, - CatchFateLonglineDto.class, - CompagniesDto.class, - ConservationDto.class, - CountryDto.class, - DataQualityDto.class, - DataSourceDto.class, - DetectionModeDto.class, - EncounterTypeDto.class, - FloatingObjectDto.class, - FpaZoneDto.class, - GearCaracteristicDto.class, - GearCaracteristicTypeDto.class, - GearDto.class, - HarbourDto.class, - HealthnessDto.class, - HookPositionDto.class, - HookSizeDto.class, - HookTypeDto.class, - ItemHorizontalPositionDto.class, - ItemVerticalPositionDto.class, - LengthLengthParameterDto.class, - LengthMeasureMethodDto.class, - LengthWeightParameterDto.class, - LightsticksColorDto.class, - LightsticksTypeDto.class, - LineTypeDto.class, - LogbookTripTypeDto.class, - MaturityStatusDto.class, - MitigationTypeDto.class, - NonTargetCatchReleaseConformityDto.class, - NonTargetCatchReleaseStatusDto.class, - NonTargetCatchReleasingTimeDto.class, - ObjectMaterialDto.class, - ObjectMaterialTypeDto.class, - ObjectOperationDto.class, - ObservationTripTypeDto.class, - ObservedSystemDto.class, - OceanDto.class, - OnBoardProcessingDto.class, - OrganismDto.class, - PersonDto.class, - ProgramDto.class, - ReasonForDiscardDto.class, - ReasonForNoFishingDto.class, - ReasonForNullSetDto.class, - RouteDto.class, - SensorBrandDto.class, - SensorDataFormatDto.class, - SensorTypeDto.class, - SetLonglineObsDto.class, - SetSeineDto.class, - SettingShapeDto.class, - SexDto.class, - ShipOwnerDto.class, - SizeMeasureTypeDto.class, - SpeciesDto.class, - SpeciesFateDto.class, - SpeciesGroupDto.class, - SpeciesGroupReleaseModeDto.class, - SpeciesListDto.class, - SpeciesStatusDto.class, - StomacFullnessDto.class, - SurroundingActivityDto.class, - TransmittingBuoyOperationDto.class, - TransmittingBuoyTypeDto.class, - TripLonglineDto.class, - TripSeineDto.class, - TripTypeDto.class, - VesselActivityLonglineDto.class, - VesselActivitySeineDto.class, - VesselDto.class, - VesselSizeCategoryDto.class, - VesselTypeDto.class, - WeightCategoryLonglineDto.class, - WeightCategorySeineDto.class, - WeightDeterminationMethodDto.class, - WeightMeasureMethodDto.class, - WeightMeasureTypeDto.class, - WindDto.class); + ImmutableList<Class<?>> dtoNames = ObserveFixtures.loadFixtureDtoList("bean-validator-detector-n1-create"); + + assertValidatorSetWithSameContextName(validators, contextName, dtoNames.toArray(new Class<?>[0])); } @Test @@ -303,121 +222,9 @@ public class BeanValidatorDetectorTest extends AbstractValidatorDetectorTest { //FIXME We miss 2 validators (if we use a validador map for all types, we got 2 more validators, find out which ones...) assertEquals(ObserveFixtures.VALIDATOR_UPDATE_DATA_COUNT + ObserveFixtures.VALIDATOR_UPDATE_REFERENTIAL_COUNT, validators.size()); - assertValidatorSetWithSameContextName2(validators, - contextName, - ActivityLonglineObsDto.class, - ActivityLonglineObsEncounterDto.class, - ActivityLonglineObsSensorUsedDto.class, - ActivitySeineDto.class, - BaitHaulingStatusDto.class, - BaitSettingStatusDto.class, - BaitTypeDto.class, - BaitsCompositionObsDto.class, - BranchlineObsDto.class, - BranchlinesCompositionObsDto.class, - CatchFateLonglineDto.class, - CatchLonglineObsDto.class, - CompagniesDto.class, - ConservationDto.class, - CountryDto.class, - DataQualityDto.class, - DataSourceDto.class, - DetectionModeDto.class, - EncounterObsDto.class, - EncounterTypeDto.class, - FloatingObjectDto.class, - FloatingObjectSchoolEstimateDto.class, - FloatingObjectTransmittingBuoyDto.class, - FloatlinesCompositionObsDto.class, - FpaZoneDto.class, - GearCaracteristicDto.class, - GearCaracteristicTypeDto.class, - GearDto.class, - GearUseFeaturesLonglineDto.class, - GearUseFeaturesSeineDto.class, - HarbourDto.class, - HealthnessDto.class, - HookPositionDto.class, - HookSizeDto.class, - HookTypeDto.class, - HooksCompositionObsDto.class, - ItemHorizontalPositionDto.class, - ItemVerticalPositionDto.class, - LengthLengthParameterDto.class, - LengthMeasureMethodDto.class, - LengthWeightParameterDto.class, - LightsticksColorDto.class, - LightsticksTypeDto.class, - LineTypeDto.class, - LogbookTripTypeDto.class, - MaturityStatusDto.class, - MitigationTypeDto.class, - NonTargetCatchDto.class, - NonTargetCatchReleaseConformityDto.class, - NonTargetCatchReleaseDto.class, - NonTargetCatchReleaseStatusDto.class, - NonTargetCatchReleasingTimeDto.class, - NonTargetLengthDto.class, - NonTargetSampleDto.class, - ObjectMaterialDto.class, - ObjectMaterialTypeDto.class, - ObjectObservedSpeciesDto.class, - ObjectOperationDto.class, - ObjectSchoolEstimateDto.class, - ObservationTripTypeDto.class, - ObservedSystemDto.class, - OceanDto.class, - OnBoardProcessingDto.class, - OrganismDto.class, - PersonDto.class, - ProgramDto.class, - ReasonForDiscardDto.class, - ReasonForNoFishingDto.class, - ReasonForNullSetDto.class, - RouteDto.class, - SchoolEstimateDto.class, - SensorBrandDto.class, - SensorDataFormatDto.class, - SensorTypeDto.class, - SensorUsedObsDto.class, - SetLonglineObsDto.class, - SetSeineDto.class, - SetSeineNonTargetCatchDto.class, - SetSeineSchoolEstimateDto.class, - SettingShapeDto.class, - SexDto.class, - ShipOwnerDto.class, - SizeMeasureTypeDto.class, - SpeciesDto.class, - SpeciesFateDto.class, - SpeciesGroupDto.class, - SpeciesGroupReleaseModeDto.class, - SpeciesListDto.class, - SpeciesStatusDto.class, - StomacFullnessDto.class, - SurroundingActivityDto.class, - TargetLengthDto.class, - TargetSampleDto.class, - TdrObsDto.class, - TransmittingBuoyDto.class, - TransmittingBuoyOperationDto.class, - TransmittingBuoyTypeDto.class, - TripLonglineDto.class, - TripLonglineGearUseDto.class, - TripSeineDto.class, - TripSeineGearUseDto.class, - TripTypeDto.class, - VesselActivityLonglineDto.class, - VesselActivitySeineDto.class, - VesselDto.class, - VesselSizeCategoryDto.class, - VesselTypeDto.class, - WeightCategoryLonglineDto.class, - WeightCategorySeineDto.class, - WeightDeterminationMethodDto.class, - WeightMeasureMethodDto.class, - WeightMeasureTypeDto.class, - WindDto.class); + ImmutableList<Class<?>> dtoNames = ObserveFixtures.loadFixtureDtoList("bean-validator-detector-n1-update"); + + assertValidatorSetWithSameContextName2(validators, contextName, dtoNames.toArray(new Class<?>[0])); } @Test View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bc8d6251bd16f93b2b80dd45cf3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bc8d6251bd16f93b2b80dd45cf3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Use exploded models (really easier to maintain)
by Tony CHEMIT 24 May '18

24 May '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 42e354d6 by Tony CHEMIT at 2018-05-24T11:44:55Z Use exploded models (really easier to maintain) - - - - - 14 changed files: - + dto/src/main/models/Observe-00-common.model - + dto/src/main/models/Observe-01-referential-common.model - + dto/src/main/models/Observe-02-referential-seine.model - + dto/src/main/models/Observe-03-referential-longline.model - + dto/src/main/models/Observe-04-data-seine.model - + dto/src/main/models/Observe-05-data-longline.model - − dto/src/main/models/Observe.model - persistence/pom.xml - + persistence/src/main/models/Observe-00-common.model - + persistence/src/main/models/Observe-01-referential-common.model - + persistence/src/main/models/Observe-02-referential-seine.model - + persistence/src/main/models/Observe-03-referential-longline.model - + persistence/src/main/models/Observe-04-data-seine.model - + persistence/src/main/models/Observe-05-data-longline.model The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/42e354d606d37946377c95d16b2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/42e354d606d37946377c95d16b2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] suppression des enumerations pour generer les constantes
by Tony CHEMIT 24 May '18

24 May '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: edf005ef by Tony CHEMIT at 2018-05-24T09:57:18Z suppression des enumerations pour generer les constantes - - - - - 3 changed files: - dto/src/main/models/Observe.model - persistence/src/main/models/Observe.model - pom.xml Changes: ===================================== dto/src/main/models/Observe.model ===================================== --- a/dto/src/main/models/Observe.model +++ b/dto/src/main/models/Observe.model @@ -12,16 +12,6 @@ package fr.ird.observe.dto.form enum constants.ObserveDbRole -enum data.seine.SetSeineConstants -targetSampleCapture -endSetDate -endPursingDate -endSetTime -endPursingTime - -enum data.seine.TargetLengthConstants -totalWeight - interface ObserveDto interface WithComment @@ -791,7 +781,7 @@ meanWeight + {*:1} Integer species {*:1} fr.ird.observe.dto.referential.SpeciesReference weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.WeightMeasureMethodReference -data.seine.SetSeine > data.Commentable | references=comment +data.seine.SetSeine > data.Commentable | references=comment constants=targetSampleCapture,endSetDate,endPursingDate,endSetTime,endPursingTime startTime + {*:1} Date endPursingTimeStamp + {*:1} Date endSetTimeStamp + {*:1} Date @@ -837,7 +827,7 @@ reasonForDiscard {*:0..1} fr.ird.observe.dto.referential.seine.ReasonForDiscardR species {*:1} fr.ird.observe.dto.referential.SpeciesReference weightMeasureMethod {*:0..1} fr.ird.observe.dto.referential.WeightMeasureMethodReference -data.seine.TargetLength > data.Data | references=speciesLabel,length,count +data.seine.TargetLength > data.Data | references=speciesLabel,length,count constants=totalWeight length + {*:1} Float isLengthComputed + {*:1} boolean count + {*:1} Integer ===================================== persistence/src/main/models/Observe.model ===================================== --- a/persistence/src/main/models/Observe.model +++ b/persistence/src/main/models/Observe.model @@ -25,62 +25,6 @@ enum !fr.ird.observe.dto.data.seine.TypeTransmittingBuoyOperation enum !fr.ird.observe.dto.data.seine.DcpComputedValue -enum longline.ActivityLonglineObsConstants -date -time - -enum longline.BranchlineObsConstants -timerTimeOnBoardDate -timerTimeOnBoardTime - -enum longline.SetLonglineObsConstants -settingStartDate -settingStartTime -settingStartQuadrant -settingEndDate -settingEndTime -settingEndQuadrant -haulingStartDate -haulingStartTime -haulingStartQuadrant -haulingEndDate -haulingEndTime -haulingEndQuadrant -floatlinesCompositionProportionSum -branchlinesCompositionProportionSum -hooksCompositionProportionSum -baitsCompositionProportionSum - -enum longline.TdrObsConstants -deployementStartDate -deployementStartTime -deployementEndDate -deployementEndTime -fishingStartDate -fishingStartTime -fishingEndDate -fishingEndTime - -enum referentiel.FormulaSupportConstants -formulaOneValid -formulaTwoValid - -enum referentiel.HarbourConstants -quadrant - -enum referentiel.ProgramConstants -gearTypePrefix - -enum seine.SetConstants -targetSampleCapture -endSetDate -endPursingDate -endSetTime -endPursingTime - -enum seine.TargetLengthConstants -totalWeight - interface Activity interface LengthWeightComputable @@ -119,7 +63,7 @@ abstract ObserveDataEntity > ObserveEntity | entity abstract ObserveEntity >> fr.ird.observe.dto.reference.DtoReferenceAware | entity lastUpdateDate + {*:1} Date | notNull -longline.ActivityLonglineObs > ObserveDataEntity >> Activity | entity dbName=ActivityObs +longline.ActivityLonglineObs > ObserveDataEntity >> Activity | entity dbName=ActivityObs constants=date,time comment + {*:1} String | hibernateAttributeType=text timeStamp + {*:1} Date latitude + {*:1} Float @@ -154,7 +98,7 @@ catchLongline {*} longline.CatchLonglineObs | reverseDbName=basket tdr {*} longline.TdrObs | reverseDbName=basket setLongline {*:1} longline.SetLonglineObs | dbName=set -longline.BranchlineObs > ObserveDataEntity >> longline.LonglineCompositionEntity | entity +longline.BranchlineObs > ObserveDataEntity >> longline.LonglineCompositionEntity | entity constants=timerTimeOnBoardDate,timerTimeOnBoardTime comment + {*:1} String | hibernateAttributeType=text settingIdentifier + {*:1} Integer | notNull haulingIdentifier + {*:1} Integer @@ -267,7 +211,7 @@ sensorType {*:1} referentiel.longline.SensorType sensorDataFormat {*:0..1} referentiel.longline.SensorDataFormat sensorBrand {*:1} referentiel.longline.SensorBrand -longline.SetLonglineObs > ObserveDataEntity >> ObserveSet | entity dbName=SetObs +longline.SetLonglineObs > ObserveDataEntity >> ObserveSet | entity dbName=SetObs constants=settingStartDate,settingStartTime,settingStartQuadrant,settingEndDate,settingEndTime,settingEndQuadrant,haulingStartDate,haulingStartTime,haulingStartQuadrant,haulingEndDate,haulingEndTime,haulingEndQuadrant,floatlinesCompositionProportionSum,branchlinesCompositionProportionSum,hooksCompositionProportionSum,baitsCompositionProportionSum comment + {*:1} String | hibernateAttributeType=text homeId + {*:1} String number + {*:1} Integer @@ -351,7 +295,7 @@ size + {*:1} Float | sqlType=numeric sizeMeasureType {*:1} referentiel.SizeMeasureType lengthMeasureMethod {*:0..1} referentiel.LengthMeasureMethod -longline.TdrObs > ObserveDataEntity >> longline.LonglinePositionAware | entity +longline.TdrObs > ObserveDataEntity >> longline.LonglinePositionAware | entity constants=deployementStartDate,deployementStartTime,deployementEndDate,deployementEndTime,fishingStartDate,fishingStartTime,fishingEndDate,fishingEndTime homeId + {*:1} String floatline1Length + {*:1} Float | sqlType=numeric floatline2Length + {*:1} Float | sqlType=numeric @@ -447,7 +391,7 @@ iso3Code + {*:1} String referentiel.DataQuality > referentiel.I18nReferentialEntity | entity -abstract referentiel.FormulaSupport > referentiel.ObserveReferentialEntity | entity +abstract referentiel.FormulaSupport > referentiel.ObserveReferentialEntity | entity constants=formulaOneValid,formulaTwoValid coefficients + {*:1} String source + {*:1} String | hibernateAttributeType=text getCoefficientNames() Set<String> @@ -477,7 +421,7 @@ gearCaracteristicType {*:1} referentiel.GearCaracteristicType | lazy=false referentiel.GearCaracteristicType > referentiel.I18nReferentialEntity | entity -referentiel.Harbour > referentiel.ObserveReferentialEntity | entity +referentiel.Harbour > referentiel.ObserveReferentialEntity | entity constants=quadrant country {*:1} referentiel.Country locode + {*:1} String name + {*:1} String @@ -544,7 +488,7 @@ dataEntryOperator + {*:1} boolean dataSource + {*:1} boolean country {*:0..1} referentiel.Country -referentiel.Program > referentiel.I18nReferentialEntity | entity +referentiel.Program > referentiel.I18nReferentialEntity | entity constants=gearTypePrefix organism {*:1} referentiel.Organism | lazy=false nonTargetObservation + {*:1} int targetDiscardsObservation + {*:1} int @@ -891,7 +835,7 @@ setSeine {*:1} seine.SetSeine | naturalId dbName=set species {*:1} referentiel.Species | naturalId weightMeasureMethod {*:0..1} referentiel.WeightMeasureMethod -seine.SetSeine > ObserveDataEntity >> ObserveSet | entity dbName=Set +seine.SetSeine > ObserveDataEntity >> ObserveSet | entity dbName=Set constants=targetSampleCapture,endSetDate,endPursingDate,endSetTime,endPursingTime comment + {*:1} String | hibernateAttributeType=text startTime + {*:1} Date | hibernateAttributeType.java.util.Date=time endPursingTimeStamp + {*:1} Date @@ -946,7 +890,7 @@ weightMeasureMethod {*:0..1} referentiel.WeightMeasureMethod getSpecies() referentiel.Species setSpecies(species referentiel.Species) -seine.TargetLength > ObserveDataEntity >> LengthWeightComputable | entity +seine.TargetLength > ObserveDataEntity >> LengthWeightComputable | entity constants=totalWeight length + {*:1} Float | sqlType=numeric isLengthComputed + {*:1} boolean count + {*:1} Integer ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -138,6 +138,8 @@ <properties> + <lib.version.java4all.eugene>3.0-alpha-22-SNAPSHOT</lib.version.java4all.eugene> + <organizationId>ultreiaio</organizationId> <projectId>ird-observe</projectId> <stageId>frirdobserve</stageId> @@ -163,7 +165,6 @@   <lib.version.h2>1.4.196</lib.version.h2> - <lib.version.java4all.eugene>3.0-alpha-21</lib.version.java4all.eugene>  <license.licenseName>gpl_v3</license.licenseName> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/edf005efb73ca005e700844cfc7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/edf005efb73ca005e700844cfc7… You're receiving this email because of your account on gitlab.com.

1 0