[Observe-commits] branch develop updated (611d2dc -> 47d4edb)

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 611d2dc Merge branch 'feature/4309_refactoring_correction_synchro_ref_avancee_serveur_distant' into 'develop' new 823c049 Improve test configurations + rename module new 2066676 Review package of services-topia and services-rest new 0ba3ed8 clean code new ac15a06 Use reflections insted of service loader + clean code new 003c0b9 clean code new ed52a97 remove guava :) new 6426c79 use fixtures... new 47d4edb Stop using ServiceLoader but Reflections The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 47d4edbb1ef92622b3e1207a2afa322ba6d6b4d1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 30 15:22:52 2016 +0200 Stop using ServiceLoader but Reflections commit 6426c79f57e21f88a4d2108ce24966ea6f1498ef Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 30 15:11:44 2016 +0200 use fixtures... commit ed52a977090fbe5adbc74c4291db737131ab053c Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 30 13:18:59 2016 +0200 remove guava :) commit 003c0b91f6a4128ede4d506ffd496ab80f0aaf1d Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 30 13:12:33 2016 +0200 clean code commit ac15a064813ed7a2d0e33d6ed4616df2aeec9db3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 30 13:01:36 2016 +0200 Use reflections insted of service loader + clean code commit 0ba3ed836f518ff0f9507beb53aa695feb3a421f Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 30 13:00:34 2016 +0200 clean code commit 20666762883014f15f7fcbe8ad2b159a5faa4cb1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 30 12:57:52 2016 +0200 Review package of services-topia and services-rest commit 823c049f73edea2d5485b2d77d8c49e1dfb8522f Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 30 12:57:15 2016 +0200 Improve test configurations + rename module Summary of changes: .../swing/decoration/DecoratorService.java | 15 +- .../decoration/decorators/ObserveDecorator.java | 3 +- application-swing-validation/pom.xml | 4 - .../ActivityFinDeVeilleExistsDtoValidator.java | 2 +- .../validators/ActivitySpeedDtoValidator.java | 3 +- .../CollectionUniqueKeyDtoValidator.java | 3 +- .../ObserveCollectionUniqueKeyDtoValidator.java | 7 +- .../observe/application/swing/ObserveCLAction.java | 3 +- .../application/swing/ObserveOpenDataManager.java | 49 +-- .../application/swing/ObserveResourceManager.java | 10 +- .../swing/ObserveSwingApplicationContext.java | 8 +- .../ObserveSwingApplicationConfig.java | 186 ++++------ .../swing/db/ObserveSwingDataSource.java | 29 +- .../application/swing/ui/ObserveMainUIHandler.java | 3 +- .../application/swing/ui/ObserveUICallback.java | 4 +- .../ird/observe/application/swing/ui/UIHelper.java | 6 +- .../swing/ui/actions/ShowConfigAction.java | 3 +- .../swing/ui/actions/shared/AbstractUIAction.java | 3 +- .../application/swing/ui/admin/AdminUIHandler.java | 6 +- .../application/swing/ui/admin/AdminUIModel.java | 5 +- .../swing/ui/admin/export/ExportUIHandler.java | 11 - .../swing/ui/admin/report/ReportModel.java | 3 +- .../swing/ui/admin/report/ResultTableModel.java | 3 +- .../data/task/DataSynchronizeTaskSupport.java | 6 +- .../swing/ui/content/ContentUIHandler.java | 31 +- .../swing/ui/content/ContentUIInitializer.java | 6 +- .../swing/ui/content/ContentUIManager.java | 12 +- .../swing/ui/content/ContentUIModel.java | 12 +- .../LonglineDetailCompositionUIHandler.java | 9 +- ...onglineDetailCompositionUIValidationHelper.java | 3 +- .../impl/longline/ActivityLonglineUIHandler.java | 6 +- .../open/impl/longline/TripLonglineUIHandler.java | 4 +- .../open/impl/seine/ActivitySeineUIHandler.java | 12 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 6 +- .../open/impl/seine/TripSeineUIHandler.java | 4 +- .../swing/ui/content/table/ContentTableModel.java | 3 +- .../ui/content/table/ContentTableUIHandler.java | 4 +- .../ui/content/table/ContentTableUIModel.java | 10 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 4 +- .../impl/longline/LonglinePositionHelper.java | 52 ++- .../seine/GearUseFeatureMeasurementCellEditor.java | 3 +- .../GearUseFeatureMeasurementCellRenderer.java | 3 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 4 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 3 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 3 +- .../table/impl/seine/TargetSampleUIHandler.java | 3 +- .../swing/ui/storage/StorageUIHandler.java | 7 +- .../swing/ui/storage/StorageUILauncher.java | 4 +- .../swing/ui/storage/StorageUIModel.java | 11 +- .../swing/ui/storage/tabs/DataSelectionModel.java | 8 +- .../swing/ui/storage/tabs/RolesTableModel.java | 3 +- .../swing/ui/storage/tabs/SecurityModel.java | 3 +- .../swing/ui/storage/tabs/StorageTabUIHandler.java | 12 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 49 ++- .../swing/ui/tree/ActivityLonglineNode.java | 3 +- .../swing/ui/tree/ActivitySeineNode.java | 3 +- .../swing/ui/tree/FloatingObjectSeineNode.java | 3 +- .../swing/ui/tree/ObserveTreeHelper.java | 55 ++- .../swing/ui/tree/ProgramLonglineNode.java | 3 +- .../swing/ui/tree/ProgramSeineNode.java | 3 +- .../application/swing/ui/tree/RouteSeineNode.java | 3 +- .../application/swing/ui/tree/SetLonglineNode.java | 3 +- .../application/swing/ui/tree/SetSeineNode.java | 3 +- .../swing/ui/tree/TripLonglineNode.java | 3 +- .../application/swing/ui/tree/TripSeineNode.java | 3 +- .../actions/ChangeActivityRouteActionListener.java | 3 +- .../actions/ChangeActivityTripActionListener.java | 3 +- .../actions/ChangeRouteTripActionListener.java | 3 +- .../ui/tree/loadors/AbstractNodeChildLoador.java | 6 +- .../loadors/ActivityLonglineNodeChildLoador.java | 6 +- .../loadors/ActivityLonglinesNodeChildLoador.java | 3 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 6 +- .../loadors/ActivitySeinesNodeChildLoador.java | 3 +- .../loadors/FloatingObjectNodeChildLoador.java | 3 +- .../loadors/ReferenceCommonNodeChildLoador.java | 3 +- .../loadors/ReferenceLonglineNodeChildLoador.java | 3 +- .../loadors/ReferenceSeineNodeChildLoador.java | 3 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 3 +- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 3 +- .../swing/ui/util/DecoratedNodeEntity.java | 9 +- .../swing/ui/util/JVetoableTabbedPane.java | 2 +- .../ObserveValidationMessageTableRenderer.java | 6 +- .../ui/util/table/AbstractSelectTableAction.java | 9 +- .../EditableTableWithCacheTableModelSupport.java | 3 +- .../swing/ui/util/tripMap/ObserveMapPane.java | 7 +- .../ui/util/tripMap/ObserveMapPaneLegendItem.java | 3 +- .../swing/validation/ValidationContext.java | 30 +- .../swing/validation/ValidationService.java | 6 +- .../swing/validation/ValidatorsMap.java | 3 +- .../web/ObserveWebApplicationContext.java | 2 +- .../ObserveWebApplicationConfiguration.java | 3 +- .../db/ObserveWebDatabasesHelper.java | 3 +- .../configuration/user/ObserveWebUsersHelper.java | 3 +- .../controller/v1/DataSourceServiceController.java | 20 +- .../v1/ObserveServiceControllerSupport.java | 7 +- .../controller/v1/ObserveWebErrorController.java | 10 +- .../web/controller/v1/PingServiceController.java | 4 +- .../web/injector/ImmutableSetInjector.java | 6 +- .../web/injector/ObserveClassInjector.java | 4 +- .../ObserveDataSourceConfigurationInjector.java | 4 +- .../ObserveReferenceSetRequestInjector.java | 4 +- .../injector/SqlScriptProducerRequestInjector.java | 4 +- .../web/request/ObserveWebRequestContext.java | 9 +- .../ObserveWebSecurityApplicationContext.java | 10 +- ...ObserveWebSecurityAuthenticationTokenCache.java | 4 +- .../entities/migration/H2DataSourceMigration.java | 6 +- .../entities/migration/PGDataSourceMigration.java | 6 +- .../DataSourceMigrationForVersion_3_1.java | 7 +- ...migration.ObserveMigrationConfigurationProvider | 1 - entities/pom.xml | 12 +- .../fr/ird/observe/AbstractObserveTopiaDao.java | 3 +- .../observe/ObserveTopiaPersistenceContext.java | 10 +- .../longline/ActivityLonglineTopiaDao.java | 6 +- .../observe/entities/longline/SectionTemplate.java | 11 +- .../fr/ird/observe/entities/longline/Sections.java | 6 +- .../ird/observe/entities/longline/TdrTopiaDao.java | 3 +- .../entities/longline/TripLonglineTopiaDao.java | 9 +- .../ObserveMigrationConfigurationProvider.java | 19 +- .../observe/entities/referentiel/HarbourImpl.java | 5 +- .../referentiel/LengthWeightParameters.java | 28 +- .../referentiel/LengthWeightParemeterHelper.java | 14 +- .../observe/entities/referentiel/ProgramImpl.java | 3 +- .../entities/referentiel/ProgramTopiaDao.java | 3 +- .../observe/entities/seine/ActivitySeineImpl.java | 3 +- .../entities/seine/ActivitySeineTopiaDao.java | 6 +- .../entities/seine/FloatingObjectTopiaDao.java | 6 +- .../ird/observe/entities/seine/RouteTopiaDao.java | 11 +- .../ird/observe/entities/seine/TargetCatchs.java | 7 +- .../observe/entities/seine/TripSeineTopiaDao.java | 9 +- pom.xml | 28 +- services-api/pom.xml | 5 + .../services/ObserveServiceFactorySupport.java | 21 +- .../services/ObserveServiceInitializer.java | 4 +- .../ConsolidateActivitySeineDataResult.java | 57 ++- .../service/actions/report/ReportBuilder.java | 23 +- .../diff/ReferentialDataSourceState.java | 2 +- .../diff/ReferentialDataSourceStates.java | 2 +- ...UnidirectionalReferentialSynchronizeEngine.java | 4 +- .../actions/validate/ValidateResultForDtos.java | 8 +- services-model/pom.xml | 5 + .../observe/services/dto/AbstractReferenceSet.java | 6 +- .../ird/observe/services/dto/DataReferenceSet.java | 3 +- .../dto/DataSourceCreateConfigurationDto.java | 11 +- .../java/fr/ird/observe/services/dto/Form.java | 3 +- .../services/dto/actions/report/DataMatrix.java | 3 +- .../services/dto/constants/ReferentialLocale.java | 3 +- .../ird/observe/services/dto/gson/BlobAdapter.java | 3 +- .../observe/services/dto/gson/ClassAdapter.java | 3 +- .../dto/gson/ImmutableMultimapAdapter.java | 3 +- .../services/dto/gson/ObserveDtoGsonSupplier.java | 4 +- .../observe/services/dto/gson/VersionAdapter.java | 8 +- .../gson/reference/AbstractReferenceAdapter.java | 4 +- .../reference/AbstractReferenceSetAdapter.java | 3 +- .../gson/reference/DataReferenceSetAdapter.java | 3 +- .../reference/ReferentialReferenceSetAdapter.java | 7 +- .../services/dto/longline/SectionTemplate.java | 11 +- .../dto/reference/DataReferenceSetDefinitions.java | 8 +- .../reference/ReferenceBinderEngineSupplier.java | 37 +- .../ReferentialReferenceSetDefinitions.java | 6 +- .../services/dto/referential/ProgramDto.java | 3 +- .../dto/referential/ReferentialMultimap.java | 4 +- .../dto/referential/ReferentialReferenceSet.java | 3 +- .../dto/referential/ReferentialReferences.java | 9 +- .../services/dto/seine/TargetCatchDtos.java | 7 +- .../main/java/fr/ird/observe/util/GPSPoint.java | 6 +- services-rest/pom.xml | 38 +- .../ObserveDataSourceConnectionAdapter.java | 2 +- .../{ => rest}/ObserveHttpErrorAdapter.java | 2 +- .../{ => rest}/ObserveServiceFactoryRest.java | 53 +-- .../ObserveServiceRestErrorException.java | 2 +- .../ObserveServiceRestNotAvailableException.java | 2 +- .../services/{ => rest}/http/ObserveRequest.java | 2 +- .../{ => rest}/http/ObserveRequestBuilder.java | 14 +- .../{ => rest}/http/ObserveRequestMethod.java | 2 +- .../services/{ => rest}/http/ObserveResponse.java | 5 +- .../{ => rest}/http/ObserveResponseBuilder.java | 25 +- .../fr.ird.observe.services.ObserveServiceFactory | 1 - .../fr/ird/observe/services/TestClassResource.java | 197 ----------- .../ird/observe/services/TestMethodResource.java | 161 --------- .../services/rest/RestTestClassResource.java | 106 ++++++ .../services/rest/RestTestMethodResource.java | 109 ++++++ .../service/AbstractServiceRestTest.java | 31 +- .../service/DataSourceServiceRestTest.java | 32 +- .../{ => rest}/service/PingServiceRestTest.java | 25 +- .../service/ReferenceValuesSetServiceRestTest.java | 24 +- .../service/ReferentialServiceRestTest.java | 25 +- .../ConsolidateDataServiceRestTest.java | 10 +- .../report/AbstractReportServiceRestTest.java | 11 +- .../report/ReportAccessoryCatchRestTest.java | 5 +- .../actions/validate/ValidateServiceRestTest.java | 16 +- .../seine/TripSeineGearUseServiceRestTest.java | 30 +- .../service/seine/TripSeineServiceRestTest.java | 34 +- services-runner/pom.xml | 4 +- .../ObserveDataSourceConfigurationMainFactory.java | 2 +- .../{ => runner}/ObserveServiceMainFactory.java | 73 ++-- .../src/test/resources/log4j.properties | 32 -- services-topia-validation/pom.xml | 4 - .../ActivityFinDeVeilleExistsValidator.java | 2 +- .../validators/ActivitySpeedValidator.java | 3 +- .../validators/CollectionUniqueKeyValidator2.java | 3 +- .../ObserveCollectionUniqueKeyValidator.java | 7 +- .../SetLonglineUniqueHomeIdValidator.java | 4 +- .../SetLonglineUniqueNumberValidator.java | 4 +- services-topia/pom.xml | 35 +- .../services/{ => topia}/ObserveJdbcHelper.java | 9 +- .../{ => topia}/ObserveSecurityHelper.java | 33 +- .../{ => topia}/ObserveServiceContextTopia.java | 15 +- .../{ => topia}/ObserveServiceFactoryTopia.java | 47 ++- .../services/{ => topia}/ObserveServiceTopia.java | 66 ++-- .../ObserveTopiaApplicationContextFactory.java | 26 +- .../services/{ => topia}/binder/BinderEngine.java | 32 +- .../binder/BinderEngineInitializer.java | 230 ++++++------ .../services/{ => topia}/binder/BinderSupport.java | 10 +- .../binder/ReferenceBinderEngineSupplierTopia.java | 4 +- .../binder/data/ActivityLonglineBinder.java | 2 +- .../data/ActivityLonglineEncouterDtoBinder.java | 2 +- .../data/ActivityLonglineSensorUsedDtoBinder.java | 2 +- .../binder/data/ActivityLonglineStubDtoBinder.java | 2 +- .../binder/data/ActivitySeineBinder.java | 2 +- .../data/ActivitySeineObservedSystemDtoBinder.java | 2 +- .../binder/data/ActivitySeineStubDtoBinder.java | 4 +- .../binder/data/BaitsCompositionBinder.java | 2 +- .../{ => topia}/binder/data/BasketBinder.java | 2 +- .../{ => topia}/binder/data/BranchlineBinder.java | 2 +- .../binder/data/BranchlinesCompositionBinder.java | 2 +- .../binder/data/CatchLonglineBinder.java | 2 +- .../{ => topia}/binder/data/DataBinderSupport.java | 6 +- .../{ => topia}/binder/data/EncounterBinder.java | 2 +- .../binder/data/FloatingObjectBinder.java | 2 +- .../FloatingObjectObservedSpeciesDtoBinder.java | 2 +- .../FloatingObjectSchoolEstimateDtoBinder.java | 2 +- .../FloatingObjectTransmittingBuoyDtoBinder.java | 2 +- .../binder/data/FloatlinesCompositionBinder.java | 2 +- .../binder/data/GearUseFeaturesLonglineBinder.java | 2 +- .../GearUseFeaturesMeasurementLonglineBinder.java | 2 +- .../GearUseFeaturesMeasurementSeineBinder.java | 2 +- .../binder/data/GearUseFeaturesSeineBinder.java | 2 +- .../binder/data/HooksCompositionBinder.java | 2 +- .../binder/data/NonTargetCatchBinder.java | 2 +- .../binder/data/NonTargetLengthBinder.java | 2 +- .../binder/data/NonTargetSampleBinder.java | 2 +- .../binder/data/ObjectObservedSpeciesBinder.java | 2 +- .../binder/data/ObjectSchoolEstimateBinder.java | 2 +- .../{ => topia}/binder/data/RouteBinder.java | 2 +- .../binder/data/RouteStubDtoBinder.java | 2 +- .../binder/data/SchoolEstimateBinder.java | 2 +- .../{ => topia}/binder/data/SectionBinder.java | 2 +- .../{ => topia}/binder/data/SensorUsedBinder.java | 2 +- .../{ => topia}/binder/data/SetLonglineBinder.java | 2 +- .../binder/data/SetLonglineCatchDtoBinder.java | 2 +- .../SetLonglineDetailCompositionDtoBinder.java | 2 +- .../SetLonglineGlobalCompositionDtoBinder.java | 2 +- .../binder/data/SetLonglineStubDtoBinder.java | 4 +- .../binder/data/SetLonglineTdrDtoBinder.java | 2 +- .../{ => topia}/binder/data/SetSeineBinder.java | 4 +- .../data/SetSeineNonTargetCatchDtoBinder.java | 2 +- .../data/SetSeineSchoolEstimateDtoBinder.java | 2 +- .../binder/data/SetSeineTargetCatchDtoBinder.java | 2 +- .../{ => topia}/binder/data/SizeMeasureBinder.java | 2 +- .../{ => topia}/binder/data/TargetCatchBinder.java | 2 +- .../binder/data/TargetLengthBinder.java | 2 +- .../binder/data/TargetSampleBinder.java | 2 +- .../{ => topia}/binder/data/TdrBinder.java | 2 +- .../binder/data/TransmittingBuoyBinder.java | 10 +- .../binder/data/TripLonglineActivityDtoBinder.java | 2 +- .../binder/data/TripLonglineBinder.java | 2 +- .../binder/data/TripLonglineGearUseDtoBinder.java | 2 +- .../{ => topia}/binder/data/TripSeineBinder.java | 2 +- .../binder/data/TripSeineGearUseDtoBinder.java | 2 +- .../binder/data/WeightMeasureBinder.java | 2 +- .../referential/BaitHaulingStatusBinder.java | 2 +- .../referential/BaitSettingStatusBinder.java | 2 +- .../binder/referential/BaitTypeBinder.java | 2 +- .../referential/CatchFateLonglineBinder.java | 2 +- .../binder/referential/CountryBinder.java | 2 +- .../binder/referential/DetectionModeBinder.java | 2 +- .../binder/referential/EncounterTypeBinder.java | 2 +- .../binder/referential/FpaZoneBinder.java | 2 +- .../{ => topia}/binder/referential/GearBinder.java | 2 +- .../referential/GearCaracteristicBinder.java | 2 +- .../referential/GearCaracteristicTypeBinder.java | 2 +- .../binder/referential/HarbourBinder.java | 2 +- .../binder/referential/HealthnessBinder.java | 2 +- .../binder/referential/HookPositionBinder.java | 2 +- .../binder/referential/HookSizeBinder.java | 4 +- .../binder/referential/HookTypeBinder.java | 2 +- .../referential/ItemHorizontalPositionBinder.java | 4 +- .../referential/ItemVerticalPositionBinder.java | 4 +- .../referential/LengthWeightParameterBinder.java | 2 +- .../binder/referential/LightsticksColorBinder.java | 2 +- .../binder/referential/LightsticksTypeBinder.java | 2 +- .../binder/referential/LineTypeBinder.java | 2 +- .../binder/referential/MaturityStatusBinder.java | 2 +- .../binder/referential/MitigationTypeBinder.java | 2 +- .../binder/referential/ObjectFateBinder.java | 2 +- .../binder/referential/ObjectOperationBinder.java | 2 +- .../binder/referential/ObjectTypeBinder.java | 2 +- .../binder/referential/ObservedSystemBinder.java | 4 +- .../binder/referential/OceanBinder.java | 2 +- .../binder/referential/OrganismBinder.java | 4 +- .../binder/referential/PersonBinder.java | 2 +- .../binder/referential/ProgramBinder.java | 2 +- .../binder/referential/ReasonForDiscardBinder.java | 4 +- .../referential/ReasonForNoFishingBinder.java | 4 +- .../binder/referential/ReasonForNullSetBinder.java | 4 +- .../referential/ReferentialBinderSupport.java | 4 +- .../binder/referential/SensorBrandBinder.java | 4 +- .../binder/referential/SensorDataFormatBinder.java | 4 +- .../binder/referential/SensorTypeBinder.java | 4 +- .../binder/referential/SettingShapeBinder.java | 4 +- .../{ => topia}/binder/referential/SexBinder.java | 4 +- .../binder/referential/SizeMeasureTypeBinder.java | 4 +- .../binder/referential/SpeciesBinder.java | 2 +- .../binder/referential/SpeciesFateBinder.java | 4 +- .../binder/referential/SpeciesGroupBinder.java | 4 +- .../binder/referential/SpeciesListBinder.java | 2 +- .../binder/referential/SpeciesStatusBinder.java | 4 +- .../binder/referential/StomacFullnessBinder.java | 4 +- .../referential/SurroundingActivityBinder.java | 4 +- .../TransmittingBuoyOperationBinder.java | 4 +- .../referential/TransmittingBuoyTypeBinder.java | 4 +- .../binder/referential/TripTypeBinder.java | 4 +- .../referential/VesselActivityLonglineBinder.java | 4 +- .../referential/VesselActivitySeineBinder.java | 4 +- .../binder/referential/VesselBinder.java | 4 +- .../referential/VesselSizeCategoryBinder.java | 4 +- .../binder/referential/VesselTypeBinder.java | 4 +- .../binder/referential/WeightCategoryBinder.java | 4 +- .../referential/WeightMeasureTypeBinder.java | 4 +- .../{ => topia}/binder/referential/WindBinder.java | 2 +- .../entity/BasketEntitiesExtractor.java | 2 +- .../entity/BranchlineEntitiesExtractor.java | 2 +- .../{ => topia}/entity/EntitiesExtractor.java | 12 +- .../{ => topia}/entity/EntitiesSetFactory.java | 12 +- .../entity/SectionEntitiesExtractor.java | 2 +- .../entity/SpeciesListEntitiesExtractor.java | 2 +- .../entity/SpeciesListOceanEntitiesExtractor.java | 2 +- .../{ => topia}/entity/TripMapDtoFactory.java | 18 +- .../service/DataSourceServiceTopia.java | 53 +-- .../service}/ImportTripScriptTopiaSqlWork.java | 2 +- .../service/ReferentialServiceTopia.java | 24 +- .../service/SqlScriptProducerServiceTopia.java | 9 +- .../service}/TripManagementServiceTopia.java | 13 +- .../ConsolidateActivitySeineDataResultBuilder.java | 106 +++--- .../consolidate/ConsolidateDataServiceTopia.java | 193 ++++++----- .../service/actions/report/ReportServiceTopia.java | 19 +- .../ReferentialSynchronizeDiffServiceTopia.java | 14 +- ...nalReferentialSynchronizeLocalServiceTopia.java | 20 +- .../ng/ReferentialSynchronizeServiceTopia.java | 9 +- .../ReferentialSynchronizeSqlsRequestBuilder.java | 25 +- .../referential/sql/ApplySqlRequestWork.java | 2 +- .../sql/DeleteSqlStatementGenerator.java | 2 +- .../sql/DesactivateSqlStatementGenerator.java | 2 +- .../sql/InsertSqlStatementGenerator.java | 63 ++-- .../InsertSqlWithCascadeStatementGenerator.java | 6 +- .../sql/ReplaceSqlStatementGenerator.java | 30 +- .../sql/UpdateSqlStatementGenerator.java | 54 +-- .../UpdateSqlWithCascadeStatementGenerator.java | 6 +- .../GenerateValidatorDescriptorsFileTool.java | 5 +- .../service/actions/validate/ObserveValidator.java | 74 ++-- .../actions/validate/ValidateServiceTopia.java | 21 +- .../actions/validate/ValidationDataContext.java | 70 ++-- .../validate/ValidationMessageDetector.java | 5 +- .../service/actions/validate/ValidatorsMap.java | 5 +- .../ActivityLongLineEncounterServiceTopia.java | 9 +- .../ActivityLongLineSensorUsedServiceTopia.java | 13 +- .../longline/ActivityLonglineServiceTopia.java | 22 +- .../service/longline/BranchlineServiceTopia.java | 5 +- .../longline/LonglinePositionSetDtoHelper.java | 38 +- .../longline/SetLonglineCatchServiceTopia.java | 9 +- .../SetLonglineDetailCompositionServiceTopia.java | 21 +- .../SetLonglineGlobalCompositionServiceTopia.java | 13 +- .../service/longline/SetLonglineServiceTopia.java | 10 +- .../service/longline/TdrServiceTopia.java | 9 +- .../longline/TripLonglineGearUseServiceTopia.java | 11 +- .../service/longline/TripLonglineServiceTopia.java | 33 +- .../ActivitySeineObservedSystemServiceTopia.java | 13 +- .../service/seine/ActivitySeineServiceTopia.java | 15 +- .../service/seine/FloatingObjectServiceTopia.java | 21 +- .../service/seine/NonTargetCatchServiceTopia.java | 5 +- .../service/seine/NonTargetSampleServiceTopia.java | 29 +- .../seine/ObjectObservedSpeciesServiceTopia.java | 16 +- .../seine/ObjectSchoolEstimateServiceTopia.java | 20 +- .../service/seine/RouteServiceTopia.java | 22 +- .../service/seine/SchoolEstimateServiceTopia.java | 11 +- .../service/seine/SetSeineServiceTopia.java | 27 +- .../service/seine/TargetCatchServiceTopia.java | 5 +- .../service/seine/TargetSampleServiceTopia.java | 13 +- .../TransmittingBuoyOperationServiceTopia.java | 16 +- .../seine/TripSeineGearUseServiceTopia.java | 11 +- .../service/seine/TripSeineServiceTopia.java | 37 +- .../fr.ird.observe.services.ObserveServiceFactory | 1 - ...ces.dto.reference.ReferenceBinderEngineSupplier | 1 - .../services/ApplicationContextResource.java | 385 --------------------- .../ird/observe/services/DataSourceResource.java | 347 ------------------- .../services/topia/DataSourcesForTestManager.java | 82 +++++ .../ObserveDataSourceConnectionTopiaTaiste.java | 2 +- .../ObserveServiceContextTopiaTaiste.java | 5 +- .../services/topia/TopiaTestClassResource.java | 179 ++++++++++ .../services/topia/TopiaTestMethodResource.java | 177 ++++++++++ .../binder/BinderEngineMetadataTest.java | 6 +- .../{ => topia}/binder/BinderEngineTest.java | 8 +- .../binder/ReferenceBinderEngineTest.java | 2 +- .../topia/entity}/LengthWeightParemetersTest.java | 15 +- .../topia/entity}/ReplicateReferentialsTest.java | 4 +- .../topia/entity}/ReplicateTestSupport.java | 28 +- .../topia/entity}/ReplicateTripLonglineTest.java | 4 +- .../topia/entity}/ReplicateTripSeineTest.java | 10 +- .../service/AbstractServiceTopiaTest.java | 33 +- .../AddSqlScriptProducerServiceTopiaTest.java | 8 +- .../service/DataSourceServiceTopiaTest.java | 127 +++++-- .../{ => topia}/service/MigrateTestsDatabases.java | 20 +- .../service/ReferentialServiceTopiaTest.java | 12 +- .../services/{ => topia}/service/RigthTest.java | 152 +++----- .../ConsolidateDataServiceTopiaTest.java | 11 +- .../report/AbstractReportServiceTopiaTest.java | 8 +- .../actions/report/ReportAccessoryCatch2Test.java | 2 +- .../report/ReportAccessoryCatchByGroup2Test.java | 2 +- .../report/ReportAccessoryCatchByGroupTest.java | 2 +- .../actions/report/ReportAccessoryCatchTest.java | 2 +- .../report/ReportActivityWithCommentTest.java | 2 +- .../actions/report/ReportAllActivitysTest.java | 2 +- .../actions/report/ReportDailySetAndCatchTest.java | 2 +- .../service/actions/report/ReportDcpUsageTest.java | 2 +- .../actions/report/ReportSetByAssociationTest.java | 2 +- .../report/ReportTargetCatchByAssociationTest.java | 2 +- .../ReportTargetDiscardedByAssociationTest.java | 2 +- .../UnidirectionalSynchronizeReferentialTest.java | 28 +- .../actions/validate/ValidateServiceTopiaTest.java | 15 +- ...tLonglineDetailCompositionServiceTopiaTest.java | 9 +- .../service/seine/RouteServiceTopiaTest.java | 7 +- .../seine/TargetSampleServiceTopiaTest.java | 26 +- .../seine/TripSeineGearUseServiceTopiaTest.java | 21 +- .../service/seine/TripSeineServiceTopiaTest.java | 25 +- .../main/java/fr/ird/observe/test/TestHelper.java | 189 ---------- {test-data => test}/LICENSE.txt | 0 {test-data => test}/README.md | 0 {test-data => test}/pom.xml | 14 +- .../src/license/THIRD-PARTY.properties | 0 .../java/fr/ird/observe/test/DatabaseName.java | 0 .../java/fr/ird/observe/test/ObserveFixtures.java | 31 +- .../ird/observe/test/ObserveTestConfiguration.java | 186 ++++++++++ .../fr/ird/observe/test/ObserveTestResources.java | 62 ++++ .../ird/observe/test/TestClassResourceSupport.java | 156 +++++++++ .../main/java/fr/ird/observe/test/TestHelper.java | 62 ++++ .../observe/test/TestMethodResourceSupport.java | 178 ++++++++++ .../test/spi/CopyDatabaseConfiguration.java | 0 .../test/spi/CopyDatabaseConfigurations.java | 0 .../ird/observe/test/spi/DatabaseClassifier.java | 0 .../test/spi/DatabaseLoginConfiguration.java | 23 ++ .../test/spi/DatabaseNameConfiguration.java | 0 .../test/spi/DatabaseNameConfigurations.java | 0 .../test/spi/DatabasePasswordConfiguration.java | 23 ++ .../observe/test/spi/DatabaseUrlConfiguration.java | 23 ++ .../test/spi/DatabaseVersionConfiguration.java | 0 .../test/spi/DatabaseVersionConfigurations.java | 0 .../resources/db/4.0.1/dataForTestLongline.sql.gz | Bin .../resources/db/4.0.1/dataForTestSeine.sql.gz | Bin .../src/main/resources/db/4.0.1/empty_h2.sql.gz | Bin .../src/main/resources/db/4.0.1/empty_pg.sql.gz | Bin .../src/main/resources/db/4.0.1/referentiel.sql.gz | Bin .../src/main/resources/db/4.0/referentiel.sql.gz | Bin .../resources/db/4.902/dataForTestLongline.sql.gz | Bin .../resources/db/4.902/dataForTestSeine.sql.gz | Bin .../src/main/resources/db/4.902}/empty_h2.sql.gz | Bin .../src/main/resources/db/4.902}/empty_pg.sql.gz | Bin .../src/main/resources/db/4.902/referentiel.sql.gz | Bin .../resources/db/4.903/dataForTestLongline.sql.gz | Bin .../resources/db/4.903/dataForTestSeine.sql.gz | Bin ...aForTestUnidirectionalReferentialSynchro.sql.gz | Bin .../src/main/resources/db/4.903}/empty_h2.sql.gz | Bin .../src/main/resources/db/4.903}/empty_pg.sql.gz | Bin .../src/main/resources/db/4.903/referentiel.sql.gz | Bin .../resources/db/4.904/dataForTestLongline.sql.gz | Bin .../resources/db/4.904/dataForTestSeine.sql.gz | Bin ...aForTestUnidirectionalReferentialSynchro.sql.gz | Bin .../src/main/resources/db/4.904/empty_h2.sql.gz | Bin .../src/main/resources/db/4.904/empty_pg.sql.gz | Bin .../src/main/resources/db/4.904/referentiel.sql.gz | Bin .../src/main/resources/db/replication/data.sql.gz | Bin .../src/main/resources/observetest.properties | 14 + .../persistence/metadata/TopiaMetadataModel.java | 3 +- 482 files changed, 3647 insertions(+), 3848 deletions(-) delete mode 100644 entities-migration/src/main/resources/META-INF/services/fr.ird.observe.entities.migration.ObserveMigrationConfigurationProvider rename services-rest/src/main/java/fr/ird/observe/services/{ => rest}/ObserveDataSourceConnectionAdapter.java (97%) rename services-rest/src/main/java/fr/ird/observe/services/{ => rest}/ObserveHttpErrorAdapter.java (98%) rename services-rest/src/main/java/fr/ird/observe/services/{ => rest}/ObserveServiceFactoryRest.java (87%) rename services-rest/src/main/java/fr/ird/observe/services/{ => rest}/ObserveServiceRestErrorException.java (96%) rename services-rest/src/main/java/fr/ird/observe/services/{ => rest}/ObserveServiceRestNotAvailableException.java (97%) rename services-rest/src/main/java/fr/ird/observe/services/{ => rest}/http/ObserveRequest.java (98%) rename services-rest/src/main/java/fr/ird/observe/services/{ => rest}/http/ObserveRequestBuilder.java (93%) rename services-rest/src/main/java/fr/ird/observe/services/{ => rest}/http/ObserveRequestMethod.java (95%) rename services-rest/src/main/java/fr/ird/observe/services/{ => rest}/http/ObserveResponse.java (96%) rename services-rest/src/main/java/fr/ird/observe/services/{ => rest}/http/ObserveResponseBuilder.java (95%) delete mode 100644 services-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory delete mode 100644 services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java delete mode 100644 services-rest/src/test/java/fr/ird/observe/services/TestMethodResource.java create mode 100644 services-rest/src/test/java/fr/ird/observe/services/rest/RestTestClassResource.java create mode 100644 services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java rename services-rest/src/test/java/fr/ird/observe/services/{ => rest}/service/AbstractServiceRestTest.java (74%) rename services-rest/src/test/java/fr/ird/observe/services/{ => rest}/service/DataSourceServiceRestTest.java (75%) rename services-rest/src/test/java/fr/ird/observe/services/{ => rest}/service/PingServiceRestTest.java (66%) rename services-rest/src/test/java/fr/ird/observe/services/{ => rest}/service/ReferenceValuesSetServiceRestTest.java (82%) rename services-rest/src/test/java/fr/ird/observe/services/{ => rest}/service/ReferentialServiceRestTest.java (78%) rename services-rest/src/test/java/fr/ird/observe/services/{ => rest}/service/actions/consolidate/ConsolidateDataServiceRestTest.java (75%) rename services-rest/src/test/java/fr/ird/observe/services/{ => rest}/service/actions/report/AbstractReportServiceRestTest.java (93%) rename services-rest/src/test/java/fr/ird/observe/services/{ => rest}/service/actions/report/ReportAccessoryCatchRestTest.java (97%) rename services-rest/src/test/java/fr/ird/observe/services/{ => rest}/service/actions/validate/ValidateServiceRestTest.java (94%) rename services-rest/src/test/java/fr/ird/observe/services/{ => rest}/service/seine/TripSeineGearUseServiceRestTest.java (90%) rename services-rest/src/test/java/fr/ird/observe/services/{ => rest}/service/seine/TripSeineServiceRestTest.java (88%) rename services-runner/src/main/java/fr/ird/observe/services/{ => runner}/ObserveDataSourceConfigurationMainFactory.java (99%) rename services-runner/src/main/java/fr/ird/observe/services/{ => runner}/ObserveServiceMainFactory.java (59%) delete mode 100644 services-runner/src/test/resources/log4j.properties rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/ObserveJdbcHelper.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/ObserveSecurityHelper.java (99%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/ObserveServiceContextTopia.java (96%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/ObserveServiceFactoryTopia.java (85%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/ObserveServiceTopia.java (89%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/ObserveTopiaApplicationContextFactory.java (90%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/BinderEngine.java (91%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/BinderEngineInitializer.java (84%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/BinderSupport.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/ReferenceBinderEngineSupplierTopia.java (96%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/ActivityLonglineBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/ActivityLonglineEncouterDtoBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/ActivityLonglineSensorUsedDtoBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/ActivityLonglineStubDtoBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/ActivitySeineBinder.java (99%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/ActivitySeineObservedSystemDtoBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/ActivitySeineStubDtoBinder.java (92%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/BaitsCompositionBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/BasketBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/BranchlineBinder.java (99%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/BranchlinesCompositionBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/CatchLonglineBinder.java (99%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/DataBinderSupport.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/EncounterBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/FloatingObjectBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/FloatingObjectObservedSpeciesDtoBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/FloatingObjectSchoolEstimateDtoBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/FloatingObjectTransmittingBuoyDtoBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/FloatlinesCompositionBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/GearUseFeaturesLonglineBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/GearUseFeaturesMeasurementLonglineBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/GearUseFeaturesMeasurementSeineBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/GearUseFeaturesSeineBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/HooksCompositionBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/NonTargetCatchBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/NonTargetLengthBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/NonTargetSampleBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/ObjectObservedSpeciesBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/ObjectSchoolEstimateBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/RouteBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/RouteStubDtoBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/SchoolEstimateBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/SectionBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/SensorUsedBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/SetLonglineBinder.java (99%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/SetLonglineCatchDtoBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/SetLonglineDetailCompositionDtoBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/SetLonglineGlobalCompositionDtoBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/SetLonglineStubDtoBinder.java (95%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/SetLonglineTdrDtoBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/SetSeineBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/SetSeineNonTargetCatchDtoBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/SetSeineSchoolEstimateDtoBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/SetSeineTargetCatchDtoBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/SizeMeasureBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/TargetCatchBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/TargetLengthBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/TargetSampleBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/TdrBinder.java (99%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/TransmittingBuoyBinder.java (89%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/TripLonglineActivityDtoBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/TripLonglineBinder.java (99%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/TripLonglineGearUseDtoBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/TripSeineBinder.java (99%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/TripSeineGearUseDtoBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/data/WeightMeasureBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/BaitHaulingStatusBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/BaitSettingStatusBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/BaitTypeBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/CatchFateLonglineBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/CountryBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/DetectionModeBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/EncounterTypeBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/FpaZoneBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/GearBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/GearCaracteristicBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/GearCaracteristicTypeBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/HarbourBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/HealthnessBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/HookPositionBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/HookSizeBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/HookTypeBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/ItemHorizontalPositionBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/ItemVerticalPositionBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/LengthWeightParameterBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/LightsticksColorBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/LightsticksTypeBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/LineTypeBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/MaturityStatusBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/MitigationTypeBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/ObjectFateBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/ObjectOperationBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/ObjectTypeBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/ObservedSystemBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/OceanBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/OrganismBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/PersonBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/ProgramBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/ReasonForDiscardBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/ReasonForNoFishingBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/ReasonForNullSetBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/ReferentialBinderSupport.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/SensorBrandBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/SensorDataFormatBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/SensorTypeBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/SettingShapeBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/SexBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/SizeMeasureTypeBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/SpeciesBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/SpeciesFateBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/SpeciesGroupBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/SpeciesListBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/SpeciesStatusBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/StomacFullnessBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/SurroundingActivityBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/TransmittingBuoyOperationBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/TransmittingBuoyTypeBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/TripTypeBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/VesselActivityLonglineBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/VesselActivitySeineBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/VesselBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/VesselSizeCategoryBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/VesselTypeBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/WeightCategoryBinder.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/WeightMeasureTypeBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/binder/referential/WindBinder.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/entity/BasketEntitiesExtractor.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/entity/BranchlineEntitiesExtractor.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/entity/EntitiesExtractor.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/entity/EntitiesSetFactory.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/entity/SectionEntitiesExtractor.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/entity/SpeciesListEntitiesExtractor.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/entity/SpeciesListOceanEntitiesExtractor.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/entity/TripMapDtoFactory.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/DataSourceServiceTopia.java (96%) rename services-topia/src/main/java/fr/ird/observe/services/{service/trip => topia/service}/ImportTripScriptTopiaSqlWork.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/ReferentialServiceTopia.java (93%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/SqlScriptProducerServiceTopia.java (95%) rename services-topia/src/main/java/fr/ird/observe/services/{service/trip => topia/service}/TripManagementServiceTopia.java (91%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java (79%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/actions/consolidate/ConsolidateDataServiceTopia.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/actions/report/ReportServiceTopia.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java (91%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java (88%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/actions/synchro/referential/ng/ReferentialSynchronizeServiceTopia.java (84%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java (92%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/actions/synchro/referential/sql/ApplySqlRequestWork.java (95%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java (96%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/actions/synchro/referential/sql/DesactivateSqlStatementGenerator.java (96%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java (99%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/actions/synchro/referential/sql/ReplaceSqlStatementGenerator.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java (99%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/actions/validate/GenerateValidatorDescriptorsFileTool.java (96%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/actions/validate/ObserveValidator.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/actions/validate/ValidateServiceTopia.java (92%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/actions/validate/ValidationDataContext.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/actions/validate/ValidationMessageDetector.java (98%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/actions/validate/ValidatorsMap.java (94%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/longline/ActivityLongLineEncounterServiceTopia.java (91%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/longline/ActivityLongLineSensorUsedServiceTopia.java (86%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/longline/ActivityLonglineServiceTopia.java (93%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/longline/BranchlineServiceTopia.java (92%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/longline/LonglinePositionSetDtoHelper.java (78%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/longline/SetLonglineCatchServiceTopia.java (93%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/longline/SetLonglineDetailCompositionServiceTopia.java (88%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/longline/SetLonglineGlobalCompositionServiceTopia.java (82%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/longline/SetLonglineServiceTopia.java (96%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/longline/TdrServiceTopia.java (94%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/longline/TripLonglineGearUseServiceTopia.java (91%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/longline/TripLonglineServiceTopia.java (90%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/seine/ActivitySeineObservedSystemServiceTopia.java (82%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/seine/ActivitySeineServiceTopia.java (95%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/seine/FloatingObjectServiceTopia.java (88%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/seine/NonTargetCatchServiceTopia.java (96%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/seine/NonTargetSampleServiceTopia.java (84%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/seine/ObjectObservedSpeciesServiceTopia.java (84%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/seine/ObjectSchoolEstimateServiceTopia.java (83%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/seine/RouteServiceTopia.java (94%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/seine/SchoolEstimateServiceTopia.java (91%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/seine/SetSeineServiceTopia.java (87%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/seine/TargetCatchServiceTopia.java (97%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/seine/TargetSampleServiceTopia.java (94%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/seine/TransmittingBuoyOperationServiceTopia.java (84%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/seine/TripSeineGearUseServiceTopia.java (91%) rename services-topia/src/main/java/fr/ird/observe/services/{ => topia}/service/seine/TripSeineServiceTopia.java (87%) delete mode 100644 services-topia/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory delete mode 100644 services-topia/src/main/resources/META-INF/services/fr.ird.observe.services.dto.reference.ReferenceBinderEngineSupplier delete mode 100644 services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java delete mode 100644 services-topia/src/test/java/fr/ird/observe/services/DataSourceResource.java create mode 100644 services-topia/src/test/java/fr/ird/observe/services/topia/DataSourcesForTestManager.java rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/ObserveDataSourceConnectionTopiaTaiste.java (97%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/ObserveServiceContextTopiaTaiste.java (86%) create mode 100644 services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestClassResource.java create mode 100644 services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestMethodResource.java rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/binder/BinderEngineMetadataTest.java (97%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/binder/BinderEngineTest.java (98%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/binder/ReferenceBinderEngineTest.java (96%) rename services-topia/src/test/java/fr/ird/observe/{entities/referentiel => services/topia/entity}/LengthWeightParemetersTest.java (94%) rename services-topia/src/test/java/fr/ird/observe/{entities/replication => services/topia/entity}/ReplicateReferentialsTest.java (91%) rename services-topia/src/test/java/fr/ird/observe/{entities/replication => services/topia/entity}/ReplicateTestSupport.java (81%) rename services-topia/src/test/java/fr/ird/observe/{entities/replication => services/topia/entity}/ReplicateTripLonglineTest.java (95%) rename services-topia/src/test/java/fr/ird/observe/{entities/replication => services/topia/entity}/ReplicateTripSeineTest.java (89%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/service/AbstractServiceTopiaTest.java (63%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/service/AddSqlScriptProducerServiceTopiaTest.java (90%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/service/DataSourceServiceTopiaTest.java (62%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/service/MigrateTestsDatabases.java (86%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/service/ReferentialServiceTopiaTest.java (90%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/service/RigthTest.java (55%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java (78%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/service/actions/report/AbstractReportServiceTopiaTest.java (95%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/service/actions/report/ReportAccessoryCatch2Test.java (99%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/service/actions/report/ReportAccessoryCatchByGroup2Test.java (98%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/service/actions/report/ReportAccessoryCatchByGroupTest.java (98%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/service/actions/report/ReportAccessoryCatchTest.java (99%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/service/actions/report/ReportActivityWithCommentTest.java (99%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/service/actions/report/ReportAllActivitysTest.java (99%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/service/actions/report/ReportDailySetAndCatchTest.java (98%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/service/actions/report/ReportDcpUsageTest.java (98%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/service/actions/report/ReportSetByAssociationTest.java (98%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/service/actions/report/ReportTargetCatchByAssociationTest.java (98%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/service/actions/report/ReportTargetDiscardedByAssociationTest.java (98%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java (89%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/service/actions/validate/ValidateServiceTopiaTest.java (95%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/service/longline/SetLonglineDetailCompositionServiceTopiaTest.java (95%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/service/seine/RouteServiceTopiaTest.java (88%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/service/seine/TargetSampleServiceTopiaTest.java (70%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/service/seine/TripSeineGearUseServiceTopiaTest.java (90%) rename services-topia/src/test/java/fr/ird/observe/services/{ => topia}/service/seine/TripSeineServiceTopiaTest.java (92%) delete mode 100644 test-data/src/main/java/fr/ird/observe/test/TestHelper.java rename {test-data => test}/LICENSE.txt (100%) rename {test-data => test}/README.md (100%) rename {test-data => test}/pom.xml (87%) rename {test-data => test}/src/license/THIRD-PARTY.properties (100%) rename {test-data => test}/src/main/java/fr/ird/observe/test/DatabaseName.java (100%) rename {test-data => test}/src/main/java/fr/ird/observe/test/ObserveFixtures.java (91%) create mode 100644 test/src/main/java/fr/ird/observe/test/ObserveTestConfiguration.java create mode 100644 test/src/main/java/fr/ird/observe/test/ObserveTestResources.java create mode 100644 test/src/main/java/fr/ird/observe/test/TestClassResourceSupport.java create mode 100644 test/src/main/java/fr/ird/observe/test/TestHelper.java create mode 100644 test/src/main/java/fr/ird/observe/test/TestMethodResourceSupport.java rename {test-data => test}/src/main/java/fr/ird/observe/test/spi/CopyDatabaseConfiguration.java (100%) rename {test-data => test}/src/main/java/fr/ird/observe/test/spi/CopyDatabaseConfigurations.java (100%) rename {test-data => test}/src/main/java/fr/ird/observe/test/spi/DatabaseClassifier.java (100%) create mode 100644 test/src/main/java/fr/ird/observe/test/spi/DatabaseLoginConfiguration.java rename {test-data => test}/src/main/java/fr/ird/observe/test/spi/DatabaseNameConfiguration.java (100%) rename {test-data => test}/src/main/java/fr/ird/observe/test/spi/DatabaseNameConfigurations.java (100%) create mode 100644 test/src/main/java/fr/ird/observe/test/spi/DatabasePasswordConfiguration.java create mode 100644 test/src/main/java/fr/ird/observe/test/spi/DatabaseUrlConfiguration.java rename {test-data => test}/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfiguration.java (100%) rename {test-data => test}/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfigurations.java (100%) rename {test-data => test}/src/main/resources/db/4.0.1/dataForTestLongline.sql.gz (100%) rename {test-data => test}/src/main/resources/db/4.0.1/dataForTestSeine.sql.gz (100%) rename {test-data => test}/src/main/resources/db/4.0.1/empty_h2.sql.gz (100%) rename {test-data => test}/src/main/resources/db/4.0.1/empty_pg.sql.gz (100%) rename {test-data => test}/src/main/resources/db/4.0.1/referentiel.sql.gz (100%) rename {test-data => test}/src/main/resources/db/4.0/referentiel.sql.gz (100%) rename {test-data => test}/src/main/resources/db/4.902/dataForTestLongline.sql.gz (100%) rename {test-data => test}/src/main/resources/db/4.902/dataForTestSeine.sql.gz (100%) rename {test-data/src/main/resources/db/4.903 => test/src/main/resources/db/4.902}/empty_h2.sql.gz (100%) rename {test-data/src/main/resources/db/4.903 => test/src/main/resources/db/4.902}/empty_pg.sql.gz (100%) rename {test-data => test}/src/main/resources/db/4.902/referentiel.sql.gz (100%) rename {test-data => test}/src/main/resources/db/4.903/dataForTestLongline.sql.gz (100%) rename {test-data => test}/src/main/resources/db/4.903/dataForTestSeine.sql.gz (100%) rename {test-data => test}/src/main/resources/db/4.903/dataForTestUnidirectionalReferentialSynchro.sql.gz (100%) rename {test-data/src/main/resources/db/4.902 => test/src/main/resources/db/4.903}/empty_h2.sql.gz (100%) rename {test-data/src/main/resources/db/4.902 => test/src/main/resources/db/4.903}/empty_pg.sql.gz (100%) rename {test-data => test}/src/main/resources/db/4.903/referentiel.sql.gz (100%) rename {test-data => test}/src/main/resources/db/4.904/dataForTestLongline.sql.gz (100%) rename {test-data => test}/src/main/resources/db/4.904/dataForTestSeine.sql.gz (100%) rename {test-data => test}/src/main/resources/db/4.904/dataForTestUnidirectionalReferentialSynchro.sql.gz (100%) rename {test-data => test}/src/main/resources/db/4.904/empty_h2.sql.gz (100%) rename {test-data => test}/src/main/resources/db/4.904/empty_pg.sql.gz (100%) rename {test-data => test}/src/main/resources/db/4.904/referentiel.sql.gz (100%) rename {test-data => test}/src/main/resources/db/replication/data.sql.gz (100%) rename {test-data => test}/src/main/resources/observetest.properties (61%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.