[Observe-commits] 01/01: sanityze service module

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 3c297cfed8b7e23c8e883f36535c75c0a93aedb8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 22 18:14:44 2016 +0100 sanityze service module --- .../configuration/constants/CreationMode.java | 2 +- .../src/main/resources/validators.xml | 20 +- .../swing/decoration/DecoratorService.java | 4 +- .../decorators/DataReferenceDecorator.java | 4 +- .../decoration/decorators/ObserveDecorator.java | 2 +- .../decorators/ReferentialReferenceDecorator.java | 2 +- .../AbstractSpeciesFieldDtoValidator.java | 2 +- .../validators/QuadrantFieldDtoValidator.java | 2 +- .../SetLonglineUniqueHomeIdDtoValidator.java | 2 +- .../SetLonglineUniqueNumberDtoValidator.java | 2 +- application-swing/pom.xml | 2 +- .../swing/ObserveSwingApplicationContext.java | 4 +- .../swing/db/ObserveSwingDataSource.java | 12 +- .../content/MoveActivityLonglinesUIAction.java | 2 +- .../content/MoveActivitySeinesUIAction.java | 2 +- .../ui/actions/content/MoveRoutesUIAction.java | 2 +- .../actions/content/MoveTripLonglinesUIAction.java | 2 +- .../ui/actions/content/MoveTripSeinesUIAction.java | 2 +- .../ui/actions/content/MoveTripsUIAction.java | 2 +- .../swing/ui/actions/content/ReOpenUIAction.java | 2 +- .../ui/actions/content/SelectNodeUIAction.java | 2 +- .../ui/actions/menu/config/ShowConfigAction.java | 2 +- .../swing/ui/admin/AdminTabUIHandler.java | 4 +- .../swing/ui/admin/config/SelectDataModel.java | 6 +- .../ui/admin/consolidate/ConsolidateUIHandler.java | 2 +- .../swing/ui/admin/export/ExportUIHandler.java | 6 +- .../swing/ui/admin/export/TripEntry.java | 4 +- .../ui/admin/export/TripToExportTableModel.java | 4 +- .../swing/ui/admin/report/ReportConfigUI.jaxx | 2 +- .../swing/ui/admin/report/ReportModel.java | 5 +- .../swing/ui/admin/report/ReportUI.jaxx | 2 +- .../swing/ui/admin/report/ReportUIHandler.java | 10 +- .../swing/ui/admin/report/ResultTableModel.java | 5 +- .../synchronize/data/DataSynchroUIHandler.java | 4 +- .../data/task/CopyToLeftDataSynchronizeTask.java | 4 +- .../data/task/CopyToRightDataSynchronizeTask.java | 4 +- .../data/task/DataSynchronizeTaskSupport.java | 4 +- .../task/DeleteFromLeftDataSynchronizeTask.java | 4 +- .../task/DeleteFromRightDataSynchronizeTask.java | 4 +- .../legacy/ObsoleteReferentialReference.java | 2 +- .../referential/legacy/SynchronizeUIHandler.java | 2 +- .../referential/ng/ReferentialReplaceUI.jaxx | 2 +- .../ng/ReferentialReplaceUIHandler.java | 2 +- .../referential/ng/ReferentialSynchroModel.java | 4 +- .../ng/action/RegisterAddTaskAction.java | 2 +- .../ng/action/RegisterCopyTaskAction.java | 2 +- .../ng/action/RegisterDeleteTaskAction.java | 2 +- .../ng/action/RegisterDesactivateTaskAction.java | 2 +- .../ng/action/RegisterRevertTaskAction.java | 2 +- .../ng/action/RegisterSkipTaskAction.java | 2 +- .../ng/action/RegisterTasksActionSupport.java | 2 +- .../ng/action/RegisterUpdateTaskAction.java | 2 +- .../ng/task/AddReferentialSynchronizeTask.java | 2 +- .../ng/task/DeleteReferentialSynchronizeTask.java | 2 +- .../DesactivateReferentialSynchronizeTask.java | 2 +- .../ng/task/ReferentialSynchronizeTaskSupport.java | 2 +- ...ferentialSynchronizeTaskWithReplaceSupport.java | 2 +- .../ng/task/RevertReferentialSynchronizeTask.java | 2 +- .../ng/task/SkipReferentialSynchronizeTask.java | 2 +- .../ng/task/UpdateReferentialSynchronizeTask.java | 2 +- .../ReferentialSynchronizeTreeCellRenderer.java | 2 +- .../ReferentialSynchronizeTreeModelsBuilder.java | 5 +- .../node/AddedReferenceReferentialSynchroNode.java | 2 +- .../ReferenceReferentialSynchroNodeSupport.java | 2 +- .../UpdatedReferenceReferentialSynchroNode.java | 2 +- .../validate/ValidateEntityListCellRenderer.java | 4 +- .../swing/ui/admin/validate/ValidateModel.java | 2 +- .../swing/ui/admin/validate/ValidateUI.jaxx | 2 +- .../swing/ui/admin/validate/ValidateUIHandler.java | 4 +- .../swing/ui/content/ContentUIHandler.java | 22 +- .../swing/ui/content/ContentUIInitializer.java | 6 +- .../swing/ui/content/ContentUIModel.java | 10 +- .../ui/content/impl/longline/BranchlineUI.jaxx | 2 +- .../LonglineDetailCompositionUIHandler.java | 2 +- .../impl/longline/LonglineGlobalCompositionUI.jaxx | 2 +- .../LonglineGlobalCompositionUIHandler.java | 2 +- .../ui/content/impl/longline/SetLonglineUI.jaxx | 2 +- .../impl/longline/SetLonglineUIHandler.java | 4 +- .../FloatingObjectTransmittingBuoyOperationUI.jaxx | 2 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 4 +- .../ui/content/impl/seine/FloatingObjectUI.jaxx | 2 +- .../impl/seine/FloatingObjectUIHandler.java | 4 +- .../swing/ui/content/impl/seine/SetSeineUI.jaxx | 2 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 4 +- .../swing/ui/content/list/ContentListUI.jaxx | 2 +- .../ui/content/list/ContentListUIHandler.java | 4 +- .../swing/ui/content/list/ContentListUIModel.java | 2 +- .../impl/longline/ActivityLonglinesUIHandler.java | 2 +- .../list/impl/longline/TripLonglinesUIHandler.java | 4 +- .../list/impl/longline/TripLonglinesUIModel.java | 2 +- .../list/impl/seine/ActivitySeinesUIHandler.java | 2 +- .../content/list/impl/seine/RoutesUIHandler.java | 2 +- .../list/impl/seine/TripSeinesUIHandler.java | 4 +- .../content/list/impl/seine/TripSeinesUIModel.java | 2 +- .../open/impl/longline/ActivityLonglineUI.jaxx | 2 +- .../impl/longline/ActivityLonglineUIHandler.java | 4 +- .../impl/longline/ActivityLonglineUIModel.java | 2 +- .../content/open/impl/longline/TripLonglineUI.jaxx | 2 +- .../open/impl/longline/TripLonglineUIHandler.java | 4 +- .../content/open/impl/seine/ActivitySeineUI.jaxx | 2 +- .../open/impl/seine/ActivitySeineUIHandler.java | 6 +- .../open/impl/seine/ActivitySeineUIModel.java | 2 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 4 +- .../ui/content/open/impl/seine/TripSeineUI.jaxx | 2 +- .../open/impl/seine/TripSeineUIHandler.java | 4 +- .../swing/ui/content/ref/ContentReferenceUI.jaxx | 2 +- .../ui/content/ref/ContentReferenceUIHandler.java | 16 +- .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 2 +- .../swing/ui/content/ref/impl/GearUI.jaxx | 2 +- .../swing/ui/content/ref/impl/GearUIHandler.java | 2 +- .../swing/ui/content/ref/impl/HarbourUI.jaxx | 2 +- .../content/ref/impl/LengthLengthParameterUI.jaxx | 2 +- .../ref/impl/LengthLengthParameterUIHandler.java | 2 +- .../content/ref/impl/LengthWeightParameterUI.jaxx | 2 +- .../ref/impl/LengthWeightParameterUIHandler.java | 2 +- .../swing/ui/content/ref/impl/OrganismUI.jaxx | 2 +- .../swing/ui/content/ref/impl/PersonUI.jaxx | 2 +- .../swing/ui/content/ref/impl/ProgramUI.jaxx | 2 +- .../ui/content/ref/impl/ProgramUIHandler.java | 2 +- .../swing/ui/content/ref/impl/ShipOwnerUI.jaxx | 2 +- .../swing/ui/content/ref/impl/SpeciesListUI.jaxx | 2 +- .../ui/content/ref/impl/SpeciesListUIHandler.java | 2 +- .../swing/ui/content/ref/impl/SpeciesUI.jaxx | 2 +- .../ui/content/ref/impl/SpeciesUIHandler.java | 2 +- .../swing/ui/content/ref/impl/VesselUI.jaxx | 2 +- .../swing/ui/content/ref/impl/VesselUIHandler.java | 2 +- .../content/ref/impl/seine/WeightCategoryUI.jaxx | 2 +- .../ui/content/ref/usage/UsageForDeleteUI.jaxx | 4 +- .../content/ref/usage/UsageForDesactivateUI.jaxx | 4 +- .../ui/content/ref/usage/UsageForDisplayUI.jaxx | 2 +- .../content/ref/usage/UsageUIHandlerSupport.java | 8 +- .../ui/content/table/ContentTableUIHandler.java | 2 +- .../impl/GearUseFeatureMeasurementCellEditor.java | 2 +- .../GearUseFeatureMeasurementCellRenderer.java | 2 +- .../table/impl/longline/BaitsCompositionUI.jaxx | 2 +- .../impl/longline/BranchlinesCompositionUI.jaxx | 2 +- .../table/impl/longline/CatchLonglineUI.jaxx | 4 +- .../impl/longline/CatchLonglineUIHandler.java | 8 +- .../content/table/impl/longline/EncounterUI.jaxx | 2 +- .../table/impl/longline/EncounterUIHandler.java | 6 +- .../impl/longline/FloatlinesCompositionUI.jaxx | 2 +- .../GearUseFeaturesLonglineTableModel.java | 2 +- .../impl/longline/GearUseFeaturesLonglineUI.jaxx | 2 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 4 +- ...rUseFeaturesMeasurementLonglinesTableModel.java | 2 +- .../table/impl/longline/HooksCompositionUI.jaxx | 2 +- .../impl/longline/LonglinePositionHelper.java | 2 +- .../content/table/impl/longline/SensorUsedUI.jaxx | 2 +- .../table/impl/longline/SensorUsedUIHandler.java | 2 +- .../impl/longline/SizeMeasuresTableModel.java | 2 +- .../ui/content/table/impl/longline/TdrUI.jaxx | 4 +- .../content/table/impl/longline/TdrUIHandler.java | 6 +- .../impl/longline/WeightMeasuresTableModel.java | 2 +- .../table/impl/seine/AbstractSampleUIHandler.java | 2 +- ...GearUseFeaturesMeasurementSeinesTableModel.java | 2 +- .../impl/seine/GearUseFeaturesSeineTableModel.java | 2 +- .../table/impl/seine/GearUseFeaturesSeineUI.jaxx | 2 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 4 +- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 2 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 6 +- .../table/impl/seine/NonTargetSampleUI.jaxx | 2 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 4 +- .../table/impl/seine/NonTargetSampleUIModel.java | 2 +- .../table/impl/seine/ObjectObservedSpeciesUI.jaxx | 2 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 6 +- .../table/impl/seine/ObjectSchoolEstimateUI.jaxx | 2 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 6 +- .../content/table/impl/seine/SchoolEstimateUI.jaxx | 2 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 6 +- .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 2 +- .../table/impl/seine/TargetCatchUIHandler.java | 6 +- .../table/impl/seine/TargetDiscardCatchUI.jaxx | 2 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 6 +- .../content/table/impl/seine/TargetSampleUI.jaxx | 2 +- .../table/impl/seine/TargetSampleUIHandler.java | 4 +- .../table/impl/seine/TargetSampleUIModel.java | 2 +- .../swing/ui/storage/ObstunaAdminAction.java | 4 +- .../swing/ui/storage/StorageBackupUILauncher.java | 10 +- .../swing/ui/storage/StorageUIHandler.java | 2 +- .../swing/ui/storage/StorageUIModel.java | 6 +- .../menu/MoveTripLonglineNodeMenuPopulator.java | 2 +- .../tree/menu/MoveTripSeineNodeMenuPopulator.java | 2 +- .../swing/ui/tree/navigation/NavigationTree.java | 6 +- .../ui/tree/navigation/NavigationTreeHeader.jcss | 14 +- .../ui/tree/navigation/NavigationTreeModel.java | 4 +- .../nodes/ReferenceNavigationTreeNodeSupport.java | 2 +- .../navigation/nodes/RootNavigationTreeNode.java | 2 +- .../ActivitiesLonglineNavigationTreeNode.java | 4 +- .../ActivityLonglineNavigationTreeNode.java | 2 +- .../ProgramLonglineNavigationTreeNode.java | 4 +- .../longline/SetLonglineNavigationTreeNode.java | 2 +- .../longline/TripLonglineNavigationTreeNode.java | 2 +- .../seine/ActivitiesSeineNavigationTreeNode.java | 4 +- .../seine/ActivitySeineNavigationTreeNode.java | 4 +- .../FloatingObjectSeineNavigationTreeNode.java | 2 +- .../seine/ProgramSeineNavigationTreeNode.java | 4 +- .../nodes/seine/RouteSeineNavigationTreeNode.java | 2 +- .../nodes/seine/RoutesSeineNavigationTreeNode.java | 4 +- .../nodes/seine/SetSeineNavigationTreeNode.java | 2 +- .../nodes/seine/TripSeineNavigationTreeNode.java | 2 +- .../ui/tree/selection/SelectionTreeModel.java | 4 +- .../selection/nodes/ProgramSelectionTreeNode.java | 4 +- .../nodes/ReferenceSelectionTreeNodeSupport.java | 2 +- .../nodes/TripLonglineSelectionTreeNode.java | 2 +- .../nodes/TripSeineSelectionTreeNode.java | 2 +- .../nodes/TripSelectionTreeNodeSupport.java | 2 +- .../i18n/application-swing_en_GB.properties | 14 +- .../i18n/application-swing_es_ES.properties | 14 +- .../i18n/application-swing_fr_FR.properties | 14 +- .../src/main/resources/validators.xml | 20 +- .../web/ObserveWebApplicationContext.java | 2 +- .../controller/v1/DataSourceServiceController.java | 6 +- .../controller/v1/ObserveWebErrorController.java | 2 +- .../v1/actions/report/ReportServiceController.java | 4 +- ...eferentialSynchronizeDiffServiceController.java | 2 +- ...ferentialSynchronizeLocalServiceController.java | 2 +- ...ActivityLongLineEncounterServiceController.java | 2 +- ...ctivityLongLineSensorUsedServiceController.java | 2 +- .../ActivityLonglineServiceController.java | 6 +- .../data/longline/BranchlineServiceController.java | 2 +- .../SetLonglineCatchServiceController.java | 2 +- ...LonglineDetailCompositionServiceController.java | 2 +- ...LonglineGlobalCompositionServiceController.java | 2 +- .../longline/SetLonglineServiceController.java | 4 +- .../v1/data/longline/TdrServiceController.java | 2 +- .../TripLonglineGearUseServiceController.java | 2 +- .../longline/TripLonglineServiceController.java | 8 +- .../data/seine/ActivitySeineServiceController.java | 6 +- .../seine/FloatingObjectServiceController.java | 6 +- .../seine/NonTargetCatchServiceController.java | 2 +- .../seine/NonTargetSampleServiceController.java | 4 +- .../ObjectObservedSpeciesServiceController.java | 2 +- .../ObjectSchoolEstimateServiceController.java | 2 +- .../v1/data/seine/RouteServiceController.java | 6 +- .../seine/SchoolEstimateServiceController.java | 2 +- .../v1/data/seine/SetSeineServiceController.java | 4 +- .../data/seine/TargetCatchServiceController.java | 2 +- .../data/seine/TargetSampleServiceController.java | 4 +- ...TransmittingBuoyOperationServiceController.java | 2 +- .../seine/TripSeineGearUseServiceController.java | 2 +- .../v1/data/seine/TripSeineServiceController.java | 8 +- .../referential/ReferentialServiceController.java | 8 +- .../services/{topia => }/binder/BinderEngine.java | 11 +- .../binder/BinderEngineInitializer.java | 232 ++++++++++----------- .../services/{topia => }/binder/BinderSupport.java | 8 +- .../DefaultReferenceBinderEngineSupplier.java} | 7 +- .../{topia => }/binder/data/DataBinderSupport.java | 12 +- .../data/longline/ActivityLonglineBinder.java | 6 +- .../ActivityLonglineEncouterDtoBinder.java | 5 +- .../ActivityLonglineSensorUsedDtoBinder.java | 5 +- .../longline/ActivityLonglineStubDtoBinder.java | 5 +- .../data/longline/BaitsCompositionBinder.java | 8 +- .../binder/data/longline/BasketBinder.java | 6 +- .../binder/data/longline/BranchlineBinder.java | 6 +- .../longline/BranchlinesCompositionBinder.java | 8 +- .../binder/data/longline/CatchLonglineBinder.java | 6 +- .../binder/data/longline/EncounterBinder.java | 6 +- .../data/longline/FloatlinesCompositionBinder.java | 6 +- .../longline/GearUseFeaturesLonglineBinder.java | 5 +- .../GearUseFeaturesMeasurementLonglineBinder.java | 5 +- .../data/longline/HooksCompositionBinder.java | 6 +- .../binder/data/longline/SectionBinder.java | 6 +- .../binder/data/longline/SensorUsedBinder.java | 6 +- .../binder/data/longline/SetLonglineBinder.java | 6 +- .../data/longline/SetLonglineCatchDtoBinder.java | 6 +- .../SetLonglineDetailCompositionDtoBinder.java | 5 +- .../SetLonglineGlobalCompositionDtoBinder.java | 5 +- .../data/longline/SetLonglineStubDtoBinder.java | 5 +- .../data/longline/SetLonglineTdrDtoBinder.java | 5 +- .../binder/data/longline/SizeMeasureBinder.java | 6 +- .../binder/data/longline/TdrBinder.java | 6 +- .../longline/TripLonglineActivityDtoBinder.java | 5 +- .../binder/data/longline/TripLonglineBinder.java | 6 +- .../longline/TripLonglineGearUseDtoBinder.java | 5 +- .../binder/data/longline/WeightMeasureBinder.java | 6 +- .../binder/data/seine/ActivitySeineBinder.java | 6 +- .../data/seine/ActivitySeineStubDtoBinder.java | 4 +- .../binder/data/seine/FloatingObjectBinder.java | 6 +- .../FloatingObjectObservedSpeciesDtoBinder.java | 5 +- .../FloatingObjectSchoolEstimateDtoBinder.java | 5 +- .../FloatingObjectTransmittingBuoyDtoBinder.java | 5 +- .../GearUseFeaturesMeasurementSeineBinder.java | 5 +- .../data/seine/GearUseFeaturesSeineBinder.java | 5 +- .../binder/data/seine/NonTargetCatchBinder.java | 6 +- .../binder/data/seine/NonTargetLengthBinder.java | 6 +- .../binder/data/seine/NonTargetSampleBinder.java | 5 +- .../data/seine/ObjectObservedSpeciesBinder.java | 6 +- .../data/seine/ObjectSchoolEstimateBinder.java | 6 +- .../{topia => }/binder/data/seine/RouteBinder.java | 6 +- .../binder/data/seine/RouteStubDtoBinder.java | 5 +- .../binder/data/seine/SchoolEstimateBinder.java | 6 +- .../binder/data/seine/SetSeineBinder.java | 6 +- .../seine/SetSeineNonTargetCatchDtoBinder.java | 4 +- .../seine/SetSeineSchoolEstimateDtoBinder.java | 6 +- .../data/seine/SetSeineTargetCatchDtoBinder.java | 4 +- .../binder/data/seine/TargetCatchBinder.java | 8 +- .../binder/data/seine/TargetLengthBinder.java | 6 +- .../binder/data/seine/TargetSampleBinder.java | 5 +- .../binder/data/seine/TransmittingBuoyBinder.java | 6 +- .../binder/data/seine/TripSeineBinder.java | 6 +- .../data/seine/TripSeineGearUseDtoBinder.java | 4 +- .../referential/ReferentialBinderSupport.java | 10 +- .../binder/referential/common/CountryBinder.java | 6 +- .../binder/referential/common/FpaZoneBinder.java | 6 +- .../binder/referential/common/GearBinder.java | 6 +- .../common/GearCaracteristicBinder.java | 6 +- .../common/GearCaracteristicTypeBinder.java | 6 +- .../binder/referential/common/HarbourBinder.java | 6 +- .../common/LengthLengthParameterBinder.java | 6 +- .../common/LengthWeightParameterBinder.java | 6 +- .../binder/referential/common/OceanBinder.java | 6 +- .../binder/referential/common/OrganismBinder.java | 6 +- .../binder/referential/common/PersonBinder.java | 6 +- .../binder/referential/common/ProgramBinder.java | 6 +- .../binder/referential/common/SexBinder.java | 6 +- .../binder/referential/common/ShipOwnerBinder.java | 6 +- .../referential/common/SizeMeasureTypeBinder.java | 6 +- .../binder/referential/common/SpeciesBinder.java | 6 +- .../referential/common/SpeciesGroupBinder.java | 6 +- .../referential/common/SpeciesListBinder.java | 6 +- .../binder/referential/common/VesselBinder.java | 6 +- .../common/VesselSizeCategoryBinder.java | 6 +- .../referential/common/VesselTypeBinder.java | 6 +- .../common/WeightMeasureTypeBinder.java | 6 +- .../longline/BaitHaulingStatusBinder.java | 6 +- .../longline/BaitSettingStatusBinder.java | 6 +- .../referential/longline/BaitTypeBinder.java | 6 +- .../longline/CatchFateLonglineBinder.java | 6 +- .../referential/longline/EncounterTypeBinder.java | 6 +- .../referential/longline/HealthnessBinder.java | 6 +- .../referential/longline/HookPositionBinder.java | 6 +- .../referential/longline/HookSizeBinder.java | 6 +- .../referential/longline/HookTypeBinder.java | 6 +- .../longline/ItemHorizontalPositionBinder.java | 6 +- .../longline/ItemVerticalPositionBinder.java | 6 +- .../longline/LightsticksColorBinder.java | 6 +- .../longline/LightsticksTypeBinder.java | 6 +- .../referential/longline/LineTypeBinder.java | 6 +- .../referential/longline/MaturityStatusBinder.java | 6 +- .../referential/longline/MitigationTypeBinder.java | 6 +- .../referential/longline/SensorBrandBinder.java | 6 +- .../longline/SensorDataFormatBinder.java | 6 +- .../referential/longline/SensorTypeBinder.java | 6 +- .../referential/longline/SettingShapeBinder.java | 6 +- .../referential/longline/StomacFullnessBinder.java | 6 +- .../referential/longline/TripTypeBinder.java | 6 +- .../longline/VesselActivityLonglineBinder.java | 6 +- .../referential/seine/DetectionModeBinder.java | 6 +- .../binder/referential/seine/ObjectFateBinder.java | 6 +- .../referential/seine/ObjectOperationBinder.java | 6 +- .../binder/referential/seine/ObjectTypeBinder.java | 6 +- .../referential/seine/ObservedSystemBinder.java | 6 +- .../referential/seine/ReasonForDiscardBinder.java | 6 +- .../seine/ReasonForNoFishingBinder.java | 6 +- .../referential/seine/ReasonForNullSetBinder.java | 6 +- .../referential/seine/SpeciesFateBinder.java | 6 +- .../referential/seine/SpeciesStatusBinder.java | 6 +- .../seine/SurroundingActivityBinder.java | 6 +- .../seine/TransmittingBuoyOperationBinder.java | 6 +- .../seine/TransmittingBuoyTypeBinder.java | 6 +- .../seine/VesselActivitySeineBinder.java | 6 +- .../referential/seine/WeightCategoryBinder.java | 6 +- .../binder/referential/seine/WindBinder.java | 6 +- .../binder/BinderEngineMetadataTest.java | 8 +- .../binder/ReferenceBinderEngineTest.java | 4 +- .../services/rest/ObserveServiceFactoryRest.java | 2 +- .../services/rest/http/ObserveRequestBuilder.java | 2 +- .../services/rest/http/ObserveResponseBuilder.java | 2 +- .../rest/service/AbstractServiceRestTest.java | 2 +- .../rest/service/DataSourceServiceRestTest.java | 6 +- .../service/ReferenceValuesSetServiceRestTest.java | 6 +- .../rest/service/ReferentialServiceRestTest.java | 4 +- .../report/AbstractReportServiceRestTest.java | 10 +- .../report/ReportAccessoryCatchRestTest.java | 6 +- .../seine/TripSeineGearUseServiceRestTest.java | 6 +- .../service/seine/TripSeineServiceRestTest.java | 6 +- .../services/topia/ObserveServiceFactoryTopia.java | 2 +- .../services/topia/ObserveServiceTopia.java | 24 +-- .../topia/service/DataSourceServiceTopia.java | 8 +- .../service/actions/report/ReportServiceTopia.java | 20 +- .../ReferentialSynchronizeDiffServiceTopia.java | 6 +- ...nalReferentialSynchronizeLocalServiceTopia.java | 6 +- .../ReferentialSynchronizeSqlsRequestBuilder.java | 4 +- .../sql/InsertSqlStatementGenerator.java | 4 +- .../InsertSqlWithCascadeStatementGenerator.java | 2 +- .../sql/UpdateSqlStatementGenerator.java | 2 +- .../UpdateSqlWithCascadeStatementGenerator.java | 2 +- .../actions/validate/ValidateServiceTopia.java | 4 +- .../topia/service/data/NavigationServiceTopia.java | 6 +- .../ActivityLongLineEncounterServiceTopia.java | 6 +- .../ActivityLongLineSensorUsedServiceTopia.java | 6 +- .../longline/ActivityLonglineServiceTopia.java | 12 +- .../data/longline/BranchlineServiceTopia.java | 6 +- .../longline/LonglinePositionSetDtoHelper.java | 10 +- .../longline/SetLonglineCatchServiceTopia.java | 6 +- .../SetLonglineDetailCompositionServiceTopia.java | 6 +- .../SetLonglineGlobalCompositionServiceTopia.java | 6 +- .../data/longline/SetLonglineServiceTopia.java | 12 +- .../service/data/longline/TdrServiceTopia.java | 6 +- .../longline/TripLonglineGearUseServiceTopia.java | 6 +- .../data/longline/TripLonglineServiceTopia.java | 16 +- .../data/seine/ActivitySeineServiceTopia.java | 12 +- .../data/seine/FloatingObjectServiceTopia.java | 12 +- .../data/seine/NonTargetCatchServiceTopia.java | 8 +- .../data/seine/NonTargetSampleServiceTopia.java | 10 +- .../seine/ObjectObservedSpeciesServiceTopia.java | 6 +- .../seine/ObjectSchoolEstimateServiceTopia.java | 6 +- .../service/data/seine/RouteServiceTopia.java | 8 +- .../data/seine/SchoolEstimateServiceTopia.java | 6 +- .../service/data/seine/SetSeineServiceTopia.java | 12 +- .../data/seine/TargetCatchServiceTopia.java | 8 +- .../data/seine/TargetSampleServiceTopia.java | 10 +- .../TransmittingBuoyOperationServiceTopia.java | 6 +- .../data/seine/TripSeineGearUseServiceTopia.java | 6 +- .../service/data/seine/TripSeineServiceTopia.java | 16 +- .../referential/ReferentialServiceTopia.java | 20 +- .../referential/ReferentialsShellBuilder.java | 2 +- .../services/topia/TopiaTestClassResource.java | 6 +- .../services/topia/binder/BinderEngineTest.java | 1 + .../topia/entity/ReplicateTestSupport.java | 4 +- .../topia/entity/ReplicateTripLonglineTest.java | 4 +- .../topia/service/AbstractServiceTopiaTest.java | 6 +- .../topia/service/DataSourceServiceTopiaTest.java | 6 +- .../topia/service/ReferentialServiceTopiaTest.java | 4 +- .../observe/services/topia/service/RigthTest.java | 4 +- .../report/AbstractReportServiceTopiaTest.java | 10 +- .../actions/report/ReportAccessoryCatch2Test.java | 2 +- .../report/ReportAccessoryCatchByGroup2Test.java | 2 +- .../report/ReportAccessoryCatchByGroupTest.java | 6 +- .../actions/report/ReportAccessoryCatchTest.java | 6 +- .../report/ReportActivityWithCommentTest.java | 6 +- .../actions/report/ReportAllActivitysTest.java | 6 +- .../actions/report/ReportDailySetAndCatchTest.java | 6 +- .../service/actions/report/ReportDcpUsageTest.java | 6 +- .../actions/report/ReportSeineEquipmentsTest.java | 6 +- .../actions/report/ReportSetByAssociationTest.java | 6 +- .../report/ReportTargetCatchByAssociationTest.java | 6 +- .../ReportTargetDiscardedByAssociationTest.java | 6 +- .../UnidirectionalSynchronizeReferentialTest.java | 2 +- .../data/TripManagementServiceTopiaTest.java | 8 +- ...tLonglineDetailCompositionServiceTopiaTest.java | 4 +- .../service/data/seine/RouteServiceTopiaTest.java | 2 +- .../data/seine/TargetSampleServiceTopiaTest.java | 2 +- .../seine/TripSeineGearUseServiceTopiaTest.java | 2 +- .../data/seine/TripSeineServiceTopiaTest.java | 5 +- .../topia/service/sql/MigrateTestsDatabases.java | 4 +- services-topia/src/test/resources/validators.xml | 20 +- .../src/test/resources/validators.xml | 20 +- .../validators/AbstractSpeciesFieldValidator.java | 2 +- .../ActivityFinDeVeilleExistsValidator.java | 2 +- .../validators/ActivitySimpleSpeedValidator.java | 2 +- .../validators/ActivitySpeedValidator.java | 2 +- .../validators/CollectionUniqueKeyValidator2.java | 2 +- .../ObserveCollectionUniqueKeyValidator.java | 2 +- .../validators/QuadrantFieldValidator.java | 2 +- .../SetLonglineUniqueHomeIdValidator.java | 2 +- .../SetLonglineUniqueNumberValidator.java | 2 +- .../validators/SpeciesLengthFieldValidator.java | 2 +- .../validators/SpeciesWeightFieldValidator.java | 2 +- ...initions.java => ObserveDataReferenceSets.java} | 13 +- ...stDefinitions.java => ObserveFormRequests.java} | 152 +++++++------- ...s.java => ObserveReferentialReferenceSets.java} | 9 +- .../ReferenceBinderEngine.java | 6 +- .../ReferenceBinderEngineSupplier.java | 2 +- .../java/fr/ird/observe/services/dto/IdHelper.java | 3 +- .../dto/{ => constants}/ObserveModelType.java | 2 +- .../ird/observe/services/dto/{ => form}/Form.java | 4 +- .../FormRequestDefinition.java} | 24 +-- .../FormRequestKeyDefinition.java} | 12 +- .../dto/longline/ActivityLonglineHelper.java | 2 +- .../dto/longline/LonglinePositionAwareDto.java | 2 +- .../dto/longline/LonglinePositionSetDto.java | 2 +- .../services/dto/longline/TripLonglineHelper.java | 2 +- .../dto/{ => reference}/AbstractReference.java | 4 +- .../dto/{ => reference}/DataReference.java | 5 +- .../dto/{ => reference}/DataReferenceList.java | 3 +- .../dto/{ => reference}/DataReferenceSet.java | 3 +- .../ReferenceCollectionSupport.java | 4 +- .../services/dto/{ => reference}/ReferenceMap.java | 5 +- .../ReferenceValueNotFoundException.java | 4 +- .../ReferentialReference.java | 4 +- .../ReferentialReferenceSet.java | 4 +- .../ReferentialReferences.java | 4 +- .../services/dto/referential/PersonHelper.java | 2 + .../services/dto/referential/ProgramHelper.java | 1 + .../services/dto/referential/ReferentialDto.java | 2 +- .../dto/referential/SizeMeasureTypeHelper.java | 1 + .../services/dto/referential/SpeciesListDto.java | 2 + .../services/dto/referential/VesselHelper.java | 2 + .../longline/VesselActivityLonglineHelper.java | 2 +- .../seine/VesselActivitySeineHelper.java | 2 +- .../referential/seine/WeightCategoryHelper.java | 2 +- .../services/dto/seine/ActivitySeineDto.java | 2 +- .../services/dto/seine/ActivitySeineHelper.java | 2 +- .../seine/FloatingObjectTransmittingBuoyDto.java | 2 +- .../services/dto/seine/TargetCatchHelper.java | 2 +- .../services/dto/seine/TripSeineHelper.java | 2 +- .../DataSourceCreateConfigurationDto.java | 3 +- ...urceCreateWithNoReferentialImportException.java | 4 +- ...ibleDataSourceCreateConfigurationException.java | 4 +- .../{dto => }/gson/ArrayListMultimapAdapter.java | 2 +- .../services/{dto => }/gson/BlobAdapter.java | 2 +- .../services/{dto => }/gson/ClassAdapter.java | 2 +- .../services/{dto => }/gson/DateAdapter.java | 2 +- .../services/{dto => }/gson/FormAdapter.java | 4 +- .../{dto => }/gson/ImmutableListAdapter.java | 2 +- .../{dto => }/gson/ImmutableMapAdapter.java | 2 +- .../{dto => }/gson/ImmutableMultimapAdapter.java | 2 +- .../{dto => }/gson/ImmutableSetAdapter.java | 2 +- .../services/{dto => }/gson/IntegerAdapter.java | 2 +- .../{dto => }/gson/MultimapAdapterSupport.java | 2 +- .../gson/ObserveBlobsContainerAdapter.java | 2 +- .../{dto => }/gson/ObserveDtoGsonSupplier.java | 30 +-- .../{dto => }/gson/ReferentialMultimapAdapter.java | 2 +- .../{dto => }/gson/ReportVariableAdapter.java | 8 +- .../{dto => }/gson/SetMultimapAdapter.java | 2 +- .../services/{dto => }/gson/VersionAdapter.java | 2 +- .../gson/reference/AbstractReferenceAdapter.java | 4 +- .../gson/reference/DataReferenceAdapter.java | 8 +- .../gson/reference/DataReferenceListAdapter.java | 6 +- .../gson/reference/DataReferenceSetAdapter.java | 6 +- .../ReferenceCollectionSupportAdapter.java | 6 +- .../reference/ReferentialReferenceAdapter.java | 8 +- .../reference/ReferentialReferenceSetAdapter.java | 6 +- .../gson/reference/UnknownReferenceAdapter.java | 8 +- .../{dto => security}/UnauthorizedException.java | 2 +- .../services/service/DataSourceService.java | 6 +- .../actions/report/DataMatrix.java | 2 +- .../{dto => service}/actions/report/Report.java | 4 +- .../service/actions/report/ReportBuilder.java | 6 +- .../actions/report/ReportOperation.java | 2 +- .../actions/report/ReportRequest.java | 2 +- .../service/actions/report/ReportService.java | 2 - .../actions/report/ReportVariable.java | 2 +- .../diff/ReferentialSynchronizeDiffService.java | 2 +- .../diff/ReferentialSynchronizeDiffsEngine.java | 2 +- ...ionalReferentialSynchronizeCallbackRequest.java | 2 +- ...onalReferentialSynchronizeCallbackRequests.java | 2 +- ...UnidirectionalReferentialSynchronizeEngine.java | 4 +- ...ectionalReferentialSynchronizeLocalService.java | 2 +- .../actions/validate/ValidateResultForDto.java | 2 +- .../actions/validate/ValidateResultForDtoType.java | 2 +- .../actions/validate/ValidateServiceUtils.java | 2 +- .../services/service/data/NavigationResult.java | 4 +- .../longline/ActivityLongLineEncounterService.java | 2 +- .../ActivityLongLineSensorUsedService.java | 2 +- .../data/longline/ActivityLonglineService.java | 6 +- .../service/data/longline/BranchlineService.java | 2 +- .../data/longline/SetLonglineCatchService.java | 2 +- .../SetLonglineDetailCompositionService.java | 2 +- .../SetLonglineGlobalCompositionService.java | 2 +- .../service/data/longline/SetLonglineService.java | 4 +- .../services/service/data/longline/TdrService.java | 2 +- .../data/longline/TripLonglineGearUseService.java | 2 +- .../service/data/longline/TripLonglineService.java | 8 +- .../service/data/seine/ActivitySeineService.java | 6 +- .../service/data/seine/FloatingObjectService.java | 6 +- .../service/data/seine/NonTargetCatchService.java | 2 +- .../service/data/seine/NonTargetSampleService.java | 4 +- .../data/seine/ObjectObservedSpeciesService.java | 2 +- .../data/seine/ObjectSchoolEstimateService.java | 2 +- .../services/service/data/seine/RouteService.java | 6 +- .../service/data/seine/SchoolEstimateService.java | 2 +- .../service/data/seine/SetSeineService.java | 4 +- .../service/data/seine/TargetCatchService.java | 2 +- .../service/data/seine/TargetSampleService.java | 4 +- .../seine/TransmittingBuoyOperationService.java | 2 +- .../data/seine/TripSeineGearUseService.java | 2 +- .../service/data/seine/TripSeineService.java | 8 +- .../referential/ObserveReferentialCache.java | 10 +- .../service/referential/ReferentialService.java | 8 +- .../src/main/xmi/observe-services-dto-common.zargo | Bin 51083 -> 51118 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 68017 -> 68055 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 60907 -> 60940 bytes .../service/actions/report/ReportBuilderTest.java | 4 - 575 files changed, 1487 insertions(+), 1505 deletions(-) diff --git a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/CreationMode.java b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/CreationMode.java index 52c931f..3a34749 100644 --- a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/CreationMode.java +++ b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/CreationMode.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.application.swing.configuration.constants; -import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; +import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto; /** * Pour caractériser comment créer une base locale. diff --git a/application-swing-configuration/src/main/resources/validators.xml b/application-swing-configuration/src/main/resources/validators.xml index 253c37f..72b5bde 100644 --- a/application-swing-configuration/src/main/resources/validators.xml +++ b/application-swing-configuration/src/main/resources/validators.xml @@ -52,16 +52,16 @@ <validator name="fieldexpressionwithparams" class="org.nuiton.validator.xwork2.field.FieldExpressionWithParamsValidator"/> <!-- Les validateurs spécifique aux entitées dans observe --> - <validator name="collectionUniqueKey" class="fr.ird.observe.services.topia.validators.CollectionUniqueKeyValidator2"/> - <validator name="observeCollectionUniqueKey" class="fr.ird.observe.services.topia.validators.ObserveCollectionUniqueKeyValidator"/> - <validator name="species_length" class="fr.ird.observe.services.topia.validators.SpeciesLengthFieldValidator"/> - <validator name="species_weight" class="fr.ird.observe.services.topia.validators.SpeciesWeightFieldValidator"/> - <validator name="activitySpeed" class="fr.ird.observe.services.topia.validators.ActivitySpeedValidator"/> - <validator name="activitySimpleSpeed" class="fr.ird.observe.services.topia.validators.ActivitySimpleSpeedValidator"/> - <validator name="activityFinDeVeilleExists" class="fr.ird.observe.services.topia.validators.ActivityFinDeVeilleExistsValidator"/> - <validator name="setLonglineUniqueHomeId" class="fr.ird.observe.services.topia.validators.SetLonglineUniqueHomeIdValidator"/> - <validator name="setLonglineUniqueNumber" class="fr.ird.observe.services.topia.validators.SetLonglineUniqueNumberValidator"/> - <validator name="quadrant" class="fr.ird.observe.services.topia.validators.QuadrantFieldValidator"/> + <validator name="collectionUniqueKey" class="fr.ird.observe.services.validators.CollectionUniqueKeyValidator2"/> + <validator name="observeCollectionUniqueKey" class="fr.ird.observe.services.validators.ObserveCollectionUniqueKeyValidator"/> + <validator name="species_length" class="fr.ird.observe.services.validators.SpeciesLengthFieldValidator"/> + <validator name="species_weight" class="fr.ird.observe.services.validators.SpeciesWeightFieldValidator"/> + <validator name="activitySpeed" class="fr.ird.observe.services.validators.ActivitySpeedValidator"/> + <validator name="activitySimpleSpeed" class="fr.ird.observe.services.validators.ActivitySimpleSpeedValidator"/> + <validator name="activityFinDeVeilleExists" class="fr.ird.observe.services.validators.ActivityFinDeVeilleExistsValidator"/> + <validator name="setLonglineUniqueHomeId" class="fr.ird.observe.services.validators.SetLonglineUniqueHomeIdValidator"/> + <validator name="setLonglineUniqueNumber" class="fr.ird.observe.services.validators.SetLonglineUniqueNumberValidator"/> + <validator name="quadrant" class="fr.ird.observe.services.validators.QuadrantFieldValidator"/> <!-- Les validateurs spécifique aux Dto dans observe --> <validator name="collectionUniqueKeyDto" class="fr.ird.observe.application.swing.validators.CollectionUniqueKeyDtoValidator"/> diff --git a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java index 26e9cd6..653d5a1 100644 --- a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java +++ b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java @@ -34,7 +34,7 @@ import fr.ird.observe.application.swing.decoration.decorators.TargetCatchDecorat import fr.ird.observe.application.swing.decoration.decorators.TripLonglineDecorator; import fr.ird.observe.application.swing.decoration.decorators.TripSeineDecorator; import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; @@ -64,7 +64,7 @@ import fr.ird.observe.services.dto.referential.OrganismDto; import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.ShipOwnerDto; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; diff --git a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/DataReferenceDecorator.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/DataReferenceDecorator.java index 0c8ebd0..10242eb 100644 --- a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/DataReferenceDecorator.java +++ b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/DataReferenceDecorator.java @@ -22,9 +22,9 @@ package fr.ird.observe.application.swing.decoration.decorators; * #L% */ -import fr.ird.observe.services.dto.AbstractReference; +import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import org.apache.commons.jxpath.JXPathContext; /** diff --git a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObserveDecorator.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObserveDecorator.java index 169a80b..977d3ba 100644 --- a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObserveDecorator.java +++ b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObserveDecorator.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.application.swing.decoration.decorators; -import fr.ird.observe.services.dto.AbstractReference; +import fr.ird.observe.services.dto.reference.AbstractReference; import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; diff --git a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ReferentialReferenceDecorator.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ReferentialReferenceDecorator.java index 05a3298..9baa6b8 100644 --- a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ReferentialReferenceDecorator.java +++ b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ReferentialReferenceDecorator.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.decoration.decorators; */ import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.lang3.StringUtils; import org.nuiton.decorator.JXPathDecorator; diff --git a/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/AbstractSpeciesFieldDtoValidator.java b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/AbstractSpeciesFieldDtoValidator.java index 4ba7ed9..f82850d 100644 --- a/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/AbstractSpeciesFieldDtoValidator.java +++ b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/AbstractSpeciesFieldDtoValidator.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.validators; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; diff --git a/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/QuadrantFieldDtoValidator.java b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/QuadrantFieldDtoValidator.java index 96e6356..91d3a82 100644 --- a/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/QuadrantFieldDtoValidator.java +++ b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/QuadrantFieldDtoValidator.java @@ -25,7 +25,7 @@ package fr.ird.observe.application.swing.validators; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; import fr.ird.observe.services.dto.referential.OceanDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; /** * Created on 02/09/16. diff --git a/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueHomeIdDtoValidator.java b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueHomeIdDtoValidator.java index 809593c..9aad8ad 100644 --- a/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueHomeIdDtoValidator.java +++ b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueHomeIdDtoValidator.java @@ -26,7 +26,7 @@ import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineStubDto; diff --git a/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueNumberDtoValidator.java b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueNumberDtoValidator.java index 8887282..3bf38bf 100644 --- a/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueNumberDtoValidator.java +++ b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueNumberDtoValidator.java @@ -26,7 +26,7 @@ import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineStubDto; diff --git a/application-swing/pom.xml b/application-swing/pom.xml index 3b7ef84..0d3720c 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -445,7 +445,7 @@ <enum>fr.ird.observe.application.swing.ui.storage.ObstunaAdminAction</enum> <enum>fr.ird.observe.application.swing.ui.admin.AdminStep</enum> <enum>fr.ird.observe.application.swing.db.constants.ConnexionStatus</enum> - <enum>fr.ird.observe.services.dto.ObserveModelType</enum> + <enum>fr.ird.observe.services.dto.constants.ObserveModelType</enum> </enums> </enumerationSet> <enumerationSet> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java index 116dc62..9e5067e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java @@ -34,8 +34,8 @@ import fr.ird.observe.application.swing.ui.content.ObserveFocusManager; import fr.ird.observe.application.swing.validation.ValidationContext; import fr.ird.observe.services.ObserveServicesProvider; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.reference.ReferenceBinderEngine; -import fr.ird.observe.services.dto.reference.ReferenceBinderEngineSupplier; +import fr.ird.observe.services.binder.ReferenceBinderEngine; +import fr.ird.observe.services.binder.ReferenceBinderEngineSupplier; import fr.ird.observe.services.runner.ObserveDataSourceConfigurationMainFactory; import fr.ird.observe.services.runner.ObserveServiceMainFactory; import fr.ird.observe.services.service.actions.validate.ValidateServiceUtils; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java b/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java index c45ce6f..ae922e3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java @@ -43,16 +43,16 @@ import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfiguration import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaSupport; -import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; -import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; -import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; +import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto; +import fr.ird.observe.services.dto.source.DataSourceCreateWithNoReferentialImportException; +import fr.ird.observe.services.dto.source.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.dto.ObserveDbUserDto; import fr.ird.observe.services.dto.ObserveSpeciesListConfiguration; -import fr.ird.observe.services.dto.ReferenceMap; +import fr.ird.observe.services.dto.reference.ReferenceMap; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.runner.ObserveServiceMainFactory; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DataSourceService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivityLonglinesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivityLonglinesUIAction.java index 0799399..1d6719a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivityLonglinesUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivityLonglinesUIAction.java @@ -32,7 +32,7 @@ import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.longline.TripLonglineNavigationTreeNode; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.service.data.longline.ActivityLonglineService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivitySeinesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivitySeinesUIAction.java index c7e6639..f99d0fa 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivitySeinesUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivitySeinesUIAction.java @@ -33,7 +33,7 @@ import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine.RouteSeineNavigationTreeNode; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.service.data.seine.ActivitySeineService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveRoutesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveRoutesUIAction.java index 767d352..fc9da14 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveRoutesUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveRoutesUIAction.java @@ -32,7 +32,7 @@ import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine.TripSeineNavigationTreeNode; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.data.seine.RouteService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripLonglinesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripLonglinesUIAction.java index 71fd15f..d1ddf17 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripLonglinesUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripLonglinesUIAction.java @@ -27,7 +27,7 @@ import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.list.impl.longline.TripLonglinesUI; import fr.ird.observe.application.swing.ui.content.list.impl.longline.TripLonglinesUIModel; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.common.constants.GearType; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.service.data.longline.TripLonglineService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripSeinesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripSeinesUIAction.java index 8403837..24267f3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripSeinesUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripSeinesUIAction.java @@ -27,7 +27,7 @@ import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.list.impl.seine.TripSeinesUI; import fr.ird.observe.application.swing.ui.content.list.impl.seine.TripSeinesUIModel; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.common.constants.GearType; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.data.seine.TripSeineService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripsUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripsUIAction.java index a6dffa6..5f9d854 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripsUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripsUIAction.java @@ -33,7 +33,7 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeN import fr.ird.observe.application.swing.ui.tree.navigation.nodes.RootNavigationTreeNode; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.common.constants.GearType; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ReOpenUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ReOpenUIAction.java index 36e6815..ef115f7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ReOpenUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ReOpenUIAction.java @@ -28,7 +28,7 @@ import fr.ird.observe.application.swing.ui.content.list.ContentListUI; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUI; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import static org.nuiton.i18n.I18n.n; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SelectNodeUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SelectNodeUIAction.java index ef7a5c3..3fd517a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SelectNodeUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SelectNodeUIAction.java @@ -26,7 +26,7 @@ import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.application.swing.ui.content.list.ContentListUI; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import javax.swing.JComponent; import javax.swing.SwingUtilities; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowConfigAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowConfigAction.java index 3e42354..d56f1eb 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowConfigAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowConfigAction.java @@ -31,7 +31,7 @@ import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferen import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.ObserveUICallback; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesListDto; import jaxx.runtime.swing.config.ConfigUIHelper; import jaxx.runtime.swing.config.model.ConfigUIModelBuilder; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUIHandler.java index 9c97f6b..20441e2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUIHandler.java @@ -28,9 +28,9 @@ import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.application.swing.ui.admin.resume.ShowResumeUI; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataModel.java index cce927f..0d9a84e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataModel.java @@ -28,10 +28,10 @@ import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminUIModel; import fr.ird.observe.application.swing.ui.admin.report.ReportModel; import fr.ird.observe.application.swing.ui.tree.selection.SelectionTreeModel; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceList; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceList; import fr.ird.observe.services.dto.IdHelper; -import fr.ird.observe.services.dto.ObserveModelType; +import fr.ird.observe.services.dto.constants.ObserveModelType; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.data.longline.TripLonglineService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java index ef37462..5fe80ee 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java @@ -26,7 +26,7 @@ import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.ui.MnemonicHelper; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; import fr.ird.observe.application.swing.ui.util.ProgressModel; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.service.actions.consolidate.ConsolidateActivitySeineDataResult; import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataService; import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataRequest; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java index e63888d..657fa87 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java @@ -36,10 +36,10 @@ import fr.ird.observe.application.swing.ui.admin.config.ConfigUI; import fr.ird.observe.application.swing.ui.content.ref.usage.UsageForDisplayUI; import fr.ird.observe.application.swing.ui.tree.selection.SelectionTreeModel; import fr.ird.observe.application.swing.ui.util.ProgressModel; -import fr.ird.observe.services.dto.AbstractReference; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.AbstractReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.ReferenceMap; +import fr.ird.observe.services.dto.reference.ReferenceMap; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/TripEntry.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/TripEntry.java index 2a13ca7..81597c1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/TripEntry.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/TripEntry.java @@ -21,9 +21,9 @@ */ package fr.ird.observe.application.swing.ui.admin.export; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import java.io.Serializable; import java.util.Objects; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/TripToExportTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/TripToExportTableModel.java index bc839c9..d8082ba 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/TripToExportTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/TripToExportTableModel.java @@ -21,8 +21,8 @@ */ package fr.ird.observe.application.swing.ui.admin.export; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import javax.swing.table.AbstractTableModel; import java.util.HashSet; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportConfigUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportConfigUI.jaxx index e7b3e20..a536d72 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportConfigUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportConfigUI.jaxx @@ -27,7 +27,7 @@ <import> fr.ird.observe.application.swing.ui.admin.AdminUIModel - fr.ird.observe.services.dto.ObserveModelType + fr.ird.observe.services.dto.constants.ObserveModelType java.io.File diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportModel.java index 0de6d8b..44c5fc9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportModel.java @@ -29,8 +29,8 @@ import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminUIModel; import fr.ird.observe.application.swing.ui.admin.config.SelectDataModel; import fr.ird.observe.application.swing.ui.tree.selection.SelectionTreeModel; -import fr.ird.observe.services.dto.ObserveModelType; -import fr.ird.observe.services.dto.actions.report.Report; +import fr.ird.observe.services.dto.constants.ObserveModelType; +import fr.ird.observe.services.service.actions.report.Report; import fr.ird.observe.services.service.actions.report.ReportBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -45,7 +45,6 @@ import java.util.TreeMap; import java.util.stream.Collectors; import static fr.ird.observe.application.swing.ui.admin.AdminUIModel.SELECTED_TRIP_PROPERTY_NAME; -import static jaxx.runtime.swing.wizard.WizardModel.VALID_STEP_PROPERTY_NAME; /** * Le modèle utilisé pour la fonctionnalité de génération de rapport. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUI.jaxx index 0c359fe..9f95519 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUI.jaxx @@ -30,7 +30,7 @@ fr.ird.observe.application.swing.ui.admin.AdminStep fr.ird.observe.application.swing.ui.admin.AdminTabUI fr.ird.observe.application.swing.ui.admin.AdminUI - fr.ird.observe.services.dto.actions.report.Report + fr.ird.observe.services.service.actions.report.Report java.awt.Dimension diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUIHandler.java index 803cae9..36d36a0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUIHandler.java @@ -29,11 +29,11 @@ import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; import fr.ird.observe.application.swing.ui.admin.config.ConfigUI; import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.ObserveModelType; -import fr.ird.observe.services.dto.actions.report.DataMatrix; -import fr.ird.observe.services.dto.actions.report.Report; -import fr.ird.observe.services.dto.actions.report.ReportVariable; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.constants.ObserveModelType; +import fr.ird.observe.services.service.actions.report.DataMatrix; +import fr.ird.observe.services.service.actions.report.Report; +import fr.ird.observe.services.service.actions.report.ReportVariable; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.service.actions.report.ReportService; import jaxx.runtime.context.JAXXInitialContext; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ResultTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ResultTableModel.java index 0511903..56e8f4b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ResultTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ResultTableModel.java @@ -21,13 +21,12 @@ */ package fr.ird.observe.application.swing.ui.admin.report; -import fr.ird.observe.services.dto.actions.report.DataMatrix; -import fr.ird.observe.services.dto.actions.report.Report; +import fr.ird.observe.services.service.actions.report.DataMatrix; +import fr.ird.observe.services.service.actions.report.Report; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import javax.swing.table.AbstractTableModel; -import java.io.Serializable; /** * Le modèle de tableau de résultats d'un report. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java index 0691a81..e154f7c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java @@ -40,9 +40,9 @@ import fr.ird.observe.application.swing.ui.tree.selection.SelectionTree; import fr.ird.observe.application.swing.ui.tree.selection.SelectionTreeModel; import fr.ird.observe.application.swing.ui.util.ProgressModel; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.service.data.DeleteTripRequest; import fr.ird.observe.services.service.data.DeleteTripResult; import fr.ird.observe.services.service.data.ExportTripRequest; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/CopyToLeftDataSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/CopyToLeftDataSynchronizeTask.java index 55e34d2..0744019 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/CopyToLeftDataSynchronizeTask.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/CopyToLeftDataSynchronizeTask.java @@ -22,9 +22,9 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.data.task; * #L% */ -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import static org.nuiton.i18n.I18n.t; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/CopyToRightDataSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/CopyToRightDataSynchronizeTask.java index aaaf01c..85fea24 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/CopyToRightDataSynchronizeTask.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/CopyToRightDataSynchronizeTask.java @@ -22,9 +22,9 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.data.task; * #L% */ -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import static org.nuiton.i18n.I18n.t; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DataSynchronizeTaskSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DataSynchronizeTaskSupport.java index 34e93e3..4242ff6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DataSynchronizeTaskSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DataSynchronizeTaskSupport.java @@ -25,9 +25,9 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.data.task; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.ui.UIHelper; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import javax.swing.Icon; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DeleteFromLeftDataSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DeleteFromLeftDataSynchronizeTask.java index b1acf58..161dfa9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DeleteFromLeftDataSynchronizeTask.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DeleteFromLeftDataSynchronizeTask.java @@ -22,9 +22,9 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.data.task; * #L% */ -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import static org.nuiton.i18n.I18n.t; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DeleteFromRightDataSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DeleteFromRightDataSynchronizeTask.java index f80c2a2..1e626c0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DeleteFromRightDataSynchronizeTask.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/task/DeleteFromRightDataSynchronizeTask.java @@ -22,9 +22,9 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.data.task; * #L% */ -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import static org.nuiton.i18n.I18n.t; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/ObsoleteReferentialReference.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/ObsoleteReferentialReference.java index a0ab1dc..a17ca41 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/ObsoleteReferentialReference.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/ObsoleteReferentialReference.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.legacy */ import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import java.util.Objects; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java index 83d34dc..310aa21 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java @@ -29,7 +29,7 @@ import fr.ird.observe.application.swing.ui.MnemonicHelper; import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffsEngine; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeCallbackRequest; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeCallbackRequests; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUI.jaxx index 36e3df2..54cf56b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUI.jaxx @@ -23,7 +23,7 @@ <import> fr.ird.observe.services.dto.referential.ReferentialDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference jaxx.runtime.swing.editor.bean.BeanComboBox diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUIHandler.java index 4729646..3c526f7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUIHandler.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng; import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import jaxx.runtime.spi.UIHandler; import jaxx.runtime.swing.editor.bean.BeanComboBox; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java index 3c10927..93380e9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java @@ -34,8 +34,8 @@ import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task.ReferentialSynchronizeTaskSupport; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.ReferentialSynchronizeTreeModel; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffsEngine; import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeService; import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceEngine; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterAddTaskAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterAddTaskAction.java index 0d16662..092bbf4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterAddTaskAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterAddTaskAction.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.act */ import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchroUI; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task.AddReferentialSynchronizeTask; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterCopyTaskAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterCopyTaskAction.java index f695dda..7c4ea0b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterCopyTaskAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterCopyTaskAction.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.act */ import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchroUI; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task.AddReferentialSynchronizeTask; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDeleteTaskAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDeleteTaskAction.java index 8997f0c..7b50991 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDeleteTaskAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDeleteTaskAction.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.act */ import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchroUI; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task.DeleteReferentialSynchronizeTask; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDesactivateTaskAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDesactivateTaskAction.java index 35e53a3..96130ca 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDesactivateTaskAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterDesactivateTaskAction.java @@ -26,7 +26,7 @@ import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.Refe import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task.DesactivateReferentialSynchronizeTask; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import static org.nuiton.i18n.I18n.t; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterRevertTaskAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterRevertTaskAction.java index 2aa7746..c798a63 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterRevertTaskAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterRevertTaskAction.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.act */ import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchroUI; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task.RevertReferentialSynchronizeTask; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterSkipTaskAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterSkipTaskAction.java index 3543a1d..59181ad 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterSkipTaskAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterSkipTaskAction.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.act */ import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchroUI; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task.SkipReferentialSynchronizeTask; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java index 7fded4e..c5ccd65 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java @@ -35,7 +35,7 @@ import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.ReferentialSynchronizeTreeModel; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.ReferenceReferentialSynchroNodeSupport; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import jaxx.runtime.context.JAXXInitialContext; import org.apache.commons.lang3.NotImplementedException; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterUpdateTaskAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterUpdateTaskAction.java index 63b687f..108d800 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterUpdateTaskAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterUpdateTaskAction.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.act */ import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchroUI; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.task.UpdateReferentialSynchronizeTask; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/AddReferentialSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/AddReferentialSynchronizeTask.java index cb6b1af..8f9fefc 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/AddReferentialSynchronizeTask.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/AddReferentialSynchronizeTask.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tas */ import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; /** diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/DeleteReferentialSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/DeleteReferentialSynchronizeTask.java index 20bc4d8..77fb632 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/DeleteReferentialSynchronizeTask.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/DeleteReferentialSynchronizeTask.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tas */ import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; /** diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/DesactivateReferentialSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/DesactivateReferentialSynchronizeTask.java index 7b7158a..798136c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/DesactivateReferentialSynchronizeTask.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/DesactivateReferentialSynchronizeTask.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tas */ import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; import static org.nuiton.i18n.I18n.n; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskSupport.java index e99e7ec..a1f42f9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskSupport.java @@ -25,7 +25,7 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tas import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceProduceSqlsRequest; import fr.ird.observe.services.service.actions.synchro.referential.ng.task.ReferentialSynchronizeTaskType; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskWithReplaceSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskWithReplaceSupport.java index 3e8dc27..4e7dada 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskWithReplaceSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/ReferentialSynchronizeTaskWithReplaceSupport.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tas import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceProduceSqlsRequest; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/RevertReferentialSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/RevertReferentialSynchronizeTask.java index c394f09..77b1ad3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/RevertReferentialSynchronizeTask.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/RevertReferentialSynchronizeTask.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tas */ import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; /** diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/SkipReferentialSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/SkipReferentialSynchronizeTask.java index 7fe89d5..254df0e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/SkipReferentialSynchronizeTask.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/SkipReferentialSynchronizeTask.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tas */ import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceProduceSqlsRequest; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/UpdateReferentialSynchronizeTask.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/UpdateReferentialSynchronizeTask.java index 2b2e6b6..dd6e3dd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/UpdateReferentialSynchronizeTask.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/task/UpdateReferentialSynchronizeTask.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tas */ import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchronizeResources; /** diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java index c1df906..ea58fde 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeCellRenderer.java @@ -27,7 +27,7 @@ import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.ReferenceReferentialSynchroNodeSupport; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.ReferentialSynchroNodeSupport; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.TypeReferentialSynchroNode; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java index ff18835..3701cbf 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java @@ -34,8 +34,8 @@ import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.TypeReferentialSynchroNode; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.UpdatedReferenceReferentialSynchroNode; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiff; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffState; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffs; @@ -44,7 +44,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import java.util.ArrayList; -import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Objects; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/AddedReferenceReferentialSynchroNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/AddedReferenceReferentialSynchroNode.java index 5c440dc..4614a73 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/AddedReferenceReferentialSynchroNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/AddedReferenceReferentialSynchroNode.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tre */ import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; /** * Created on 11/08/16. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/ReferenceReferentialSynchroNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/ReferenceReferentialSynchroNodeSupport.java index 96f4537..98dc46e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/ReferenceReferentialSynchroNodeSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/ReferenceReferentialSynchroNodeSupport.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tre */ import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.application.swing.ui.UIHelper; /** diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/UpdatedReferenceReferentialSynchroNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/UpdatedReferenceReferentialSynchroNode.java index 2f75aa1..2f71368 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/UpdatedReferenceReferentialSynchroNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/node/UpdatedReferenceReferentialSynchroNode.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tre */ import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; /** * Created on 11/08/16. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateEntityListCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateEntityListCellRenderer.java index c891916..72aa49f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateEntityListCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateEntityListCellRenderer.java @@ -24,8 +24,8 @@ package fr.ird.observe.application.swing.ui.admin.validate; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; -import fr.ird.observe.services.dto.AbstractReference; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.AbstractReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.service.actions.validate.ValidateResultForDto; import fr.ird.observe.services.service.actions.validate.ValidateResultForDtoHelper; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateModel.java index 86fc1ce..5d5ad6a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateModel.java @@ -30,7 +30,7 @@ import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminUIModel; import fr.ird.observe.application.swing.ui.util.ProgressModel; import fr.ird.observe.application.swing.validation.ValidationModelMode; -import fr.ird.observe.services.dto.AbstractReference; +import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.service.actions.validate.ValidateResultForDto; import fr.ird.observe.services.service.actions.validate.ValidateResultForDtoType; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUI.jaxx index 9b44fab..c36b7dd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUI.jaxx @@ -27,7 +27,7 @@ <fr.ird.observe.application.swing.ui.admin.AdminTabUI> <import> - fr.ird.observe.services.dto.AbstractReference + fr.ird.observe.services.dto.reference.AbstractReference fr.ird.observe.application.swing.ui.UIHelper fr.ird.observe.application.swing.ui.admin.AdminStep diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java index 6935007..c11f4ef 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java @@ -38,8 +38,8 @@ import fr.ird.observe.application.swing.ui.tree.selection.SelectionTreeModel; import fr.ird.observe.application.swing.ui.util.ObserveValidationMessageTableRenderer; import fr.ird.observe.application.swing.ui.util.ProgressModel; import fr.ird.observe.application.swing.validation.ValidationModelMode; -import fr.ird.observe.services.dto.AbstractReference; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.AbstractReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.TripSeineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java index 7c7ce5b..0462159 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java @@ -43,16 +43,16 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeN import fr.ird.observe.application.swing.ui.util.SpringUtilities; import fr.ird.observe.application.swing.validation.ValidationContext; import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinition; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestKeyDefinition; +import fr.ird.observe.services.dto.form.FormRequestDefinition; +import fr.ird.observe.services.ObserveFormRequests; +import fr.ird.observe.services.dto.form.FormRequestKeyDefinition; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; -import fr.ird.observe.services.dto.referential.ReferentialReferences; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; +import fr.ird.observe.services.dto.reference.ReferentialReferences; import jaxx.runtime.JAXXContext; import jaxx.runtime.context.DefaultJAXXContext; import jaxx.runtime.swing.editor.bean.BeanComboBox; @@ -614,9 +614,9 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U // calculer les listes de référentiels à utiliser dans le modèle - ReferenceSetRequestDefinition requestDefinition = ReferenceSetRequestDefinitions.get(requestName); + FormRequestDefinition requestDefinition = ObserveFormRequests.get(requestName); - for (ReferenceSetRequestKeyDefinition propertyDefinition : requestDefinition.getPropertyDefinitions()) { + for (FormRequestKeyDefinition propertyDefinition : requestDefinition.getPropertyDefinitions()) { if (!propertyDefinition.isReferential()) { continue; @@ -1106,7 +1106,7 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U return getDecoratorService().getReferentialReferenceDecorator(dtoType); } - private <D extends ReferentialDto> ReferentialReferenceSet<D> filterReferentialReferenceSet(ReferenceSetRequestKeyDefinition<D> propertyDefinition, + private <D extends ReferentialDto> ReferentialReferenceSet<D> filterReferentialReferenceSet(FormRequestKeyDefinition<D> propertyDefinition, ReferentialReferenceSet<D> incomingReferentialReferenceSet) { Class<D> dtoType = propertyDefinition.getType(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java index 14d1c33..b153af7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java @@ -35,12 +35,12 @@ import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import fr.ird.observe.application.swing.ui.util.BooleanEditor; import fr.ird.observe.application.swing.ui.util.tripMap.ObserveMapPane; import fr.ird.observe.application.swing.validation.ObserveSwingValidator; -import fr.ird.observe.services.dto.AbstractReference; +import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import jaxx.runtime.JAXXValidator; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.JAXXWidgetUtil; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java index 6536c61..392132c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIModel.java @@ -24,13 +24,13 @@ package fr.ird.observe.application.swing.ui.content; import com.google.common.collect.ImmutableMap; import fr.ird.observe.application.swing.ObserveSwingTechnicalException; import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceSet; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractSerializableBean; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx index fd5c47a..7192af4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx @@ -23,7 +23,7 @@ <import> fr.ird.observe.services.dto.longline.BranchlineDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.longline.LineTypeDto fr.ird.observe.services.dto.referential.longline.BaitTypeDto fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java index 25642cf..c98fc4e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java @@ -33,7 +33,7 @@ import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import fr.ird.observe.application.swing.ui.content.ContentUIModel; import fr.ird.observe.application.swing.ui.util.JVetoableTabbedPane; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUI.jaxx index 24eb7df..f1ef641 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUI.jaxx @@ -25,7 +25,7 @@ <import> fr.ird.observe.application.swing.ObserveSwingApplicationContext fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.longline.MitigationTypeDto fr.ird.observe.application.swing.ui.actions.content.ResetEditUIAction fr.ird.observe.application.swing.ui.actions.content.SaveEditUIAction diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java index 0f3cd01..aebbe98 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java @@ -36,7 +36,7 @@ import fr.ird.observe.application.swing.ui.content.table.impl.longline.Floatline import fr.ird.observe.application.swing.ui.content.table.impl.longline.FloatlinesCompositionUIModel; import fr.ird.observe.application.swing.ui.content.table.impl.longline.HooksCompositionUI; import fr.ird.observe.application.swing.ui.content.table.impl.longline.HooksCompositionUIModel; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionHelper; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx index 9f4bcfa..6bad926 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx @@ -25,7 +25,7 @@ <import> fr.ird.observe.services.dto.longline.SetLonglineDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.longline.SettingShapeDto fr.ird.observe.services.dto.referential.longline.LineTypeDto fr.ird.observe.services.dto.referential.longline.LightsticksTypeDto diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java index c016cae..4f9c15c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java @@ -32,8 +32,8 @@ import fr.ird.observe.application.swing.ui.content.ContentUIModel; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.application.swing.validation.ValidationContext; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineHelper; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx index 969c018..8ff994d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx @@ -30,7 +30,7 @@ fr.ird.observe.common.constants.seine.Ownership fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation fr.ird.observe.services.dto.referential.CountryDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto fr.ird.observe.application.swing.ui.actions.content.ResetEditUIAction diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java index 7abfe9d..16a3288 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java @@ -29,10 +29,10 @@ import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.common.constants.seine.Ownership; import fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx index 7763a07..11d8f39 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx @@ -25,7 +25,7 @@ <import> fr.ird.observe.services.dto.seine.FloatingObjectDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.seine.ObjectFateDto fr.ird.observe.services.dto.referential.seine.ObjectOperationDto fr.ird.observe.services.dto.referential.seine.ObjectTypeDto diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java index f556e56..385ff4a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -30,8 +30,8 @@ import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import fr.ird.observe.application.swing.ui.content.ContentUIModel; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx index 9a93309..24512bf 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx @@ -25,7 +25,7 @@ <import> fr.ird.observe.services.dto.seine.SetSeineDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.seine.ReasonForNullSetDto fr.ird.observe.application.swing.ui.actions.content.DeleteDataUIAction fr.ird.observe.application.swing.ui.actions.content.ResetEditUIAction diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java index f6e147f..c1556c6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java @@ -31,8 +31,8 @@ import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import fr.ird.observe.application.swing.ui.content.ContentUIModel; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.common.constants.seine.SchoolType; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jaxx index c4b7788..be5837f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jaxx @@ -29,7 +29,7 @@ fr.ird.observe.services.dto.DataDto fr.ird.observe.services.dto.IdDto - fr.ird.observe.services.dto.DataReference + fr.ird.observe.services.dto.reference.DataReference jaxx.runtime.swing.editor.bean.BeanListHeader diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java index 9be8930..56e1738 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java @@ -27,9 +27,9 @@ import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIHandler; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.services.dto.AbstractReference; +import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.IdDto; import jaxx.runtime.swing.editor.bean.BeanListHeader; import org.apache.commons.collections4.CollectionUtils; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIModel.java index d327bdb..e1203e6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIModel.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.content.list; import fr.ird.observe.application.swing.ui.content.ContentUIModel; import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.IdDto; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java index 3e72d65..8beed9a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java @@ -29,7 +29,7 @@ import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.list.ContentListUIHandler; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import jaxx.runtime.spi.UIHandler; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIHandler.java index 2ea28ae..b830929 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIHandler.java @@ -30,10 +30,10 @@ import fr.ird.observe.application.swing.ui.content.list.ContentListUIHandler; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.longline.ProgramLonglineNavigationTreeNode; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import jaxx.runtime.spi.UIHandler; import static org.nuiton.i18n.I18n.n; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIModel.java index 1be26ce..a30b440 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIModel.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.content.list.impl.longline; */ import fr.ird.observe.application.swing.ui.content.list.ContentListUIModel; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIHandler.java index fb38030..ebca0fa 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIHandler.java @@ -28,7 +28,7 @@ import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.list.ContentListUIHandler; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import jaxx.runtime.spi.UIHandler; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIHandler.java index 797d775..724b00c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIHandler.java @@ -28,7 +28,7 @@ import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.list.ContentListUIHandler; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import jaxx.runtime.spi.UIHandler; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIHandler.java index a0ce017..03a6987 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIHandler.java @@ -29,9 +29,9 @@ import fr.ird.observe.application.swing.ui.content.list.ContentListUIHandler; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine.ProgramSeineNavigationTreeNode; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.seine.TripSeineDto; import jaxx.runtime.spi.UIHandler; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIModel.java index 2da415f..79f43a8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIModel.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.content.list.impl.seine; */ import fr.ird.observe.application.swing.ui.content.list.ContentListUIModel; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.TripSeineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jaxx index 413dce3..8ed1e4d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jaxx @@ -29,7 +29,7 @@ <import> fr.ird.observe.services.dto.longline.ActivityLonglineDto fr.ird.observe.services.dto.longline.SetLonglineDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.FpaZoneDto fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto fr.ird.observe.application.swing.ui.actions.content.AddActivityLonglineSetUIAction diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java index d1d0864..3bf1d1d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java @@ -29,8 +29,8 @@ import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIModel; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIHandler; import fr.ird.observe.application.swing.validation.ValidationContext; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.ActivityLonglineHelper; import fr.ird.observe.services.dto.longline.TripLonglineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIModel.java index e93e6f2..f0fd32f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIModel.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.open.impl.longline; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIModel; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineHelper; import org.nuiton.util.DateUtil; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx index 1f0a41c..be34255 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx @@ -28,7 +28,7 @@ <import> fr.ird.observe.services.dto.longline.TripLonglineDto fr.ird.observe.services.dto.longline.TripLonglineActivityDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.HarbourDto fr.ird.observe.services.dto.referential.VesselDto fr.ird.observe.services.dto.referential.PersonDto diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java index 9c35fc1..eca15e2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java @@ -30,13 +30,13 @@ import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIHandler; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIModel; import fr.ird.observe.application.swing.ui.util.tripMap.TripMapUI; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineHelper; import fr.ird.observe.services.dto.referential.PersonHelper; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.VesselHelper; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.TripLonglineService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx index a76c9da..ea1eac1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx @@ -29,7 +29,7 @@ fr.ird.observe.services.dto.seine.ActivitySeineDto fr.ird.observe.services.dto.seine.SetSeineDto fr.ird.observe.services.dto.seine.FloatingObjectDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.FpaZoneDto fr.ird.observe.services.dto.referential.seine.ObservedSystemDto fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java index 97289ad..89dbe8c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java @@ -28,9 +28,9 @@ import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.ContentUIModel; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIHandler; import fr.ird.observe.application.swing.validation.ValidationContext; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.form.Form; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineHelper; import fr.ird.observe.services.dto.result.SaveResultDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIModel.java index 6c2f8f7..2456f76 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIModel.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.open.impl.seine; import com.google.common.collect.ImmutableSet; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIModel; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineHelper; import fr.ird.observe.services.dto.seine.ActivitySeineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java index 0edac68..e137b61 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java @@ -30,8 +30,8 @@ import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIHandler; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; -import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.form.Form; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineHelper; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx index 6026c5b..fc48291 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx @@ -29,7 +29,7 @@ fr.ird.observe.services.dto.seine.TripSeineDto fr.ird.observe.services.dto.seine.RouteDto fr.ird.observe.services.dto.seine.RouteStubDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.HarbourDto fr.ird.observe.services.dto.referential.PersonHelper fr.ird.observe.services.dto.referential.VesselDto diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java index 8cf6250..08fad32 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -29,11 +29,11 @@ import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIHandler; import fr.ird.observe.application.swing.ui.content.open.ContentOpenableUIModel; import fr.ird.observe.application.swing.ui.util.tripMap.TripMapUI; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.referential.PersonHelper; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.VesselHelper; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TripSeineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jaxx index 36c6205..a5f0a25 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jaxx @@ -26,7 +26,7 @@ <import> fr.ird.observe.services.dto.referential.ReferentialDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper fr.ird.observe.application.swing.ui.UIHelper fr.ird.observe.application.swing.ui.actions.content.BackToReferentialListUIAction diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java index 4158cc0..39ac14e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java @@ -36,14 +36,14 @@ import fr.ird.observe.application.swing.ui.content.ref.usage.UsageForDisplayUI; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.validation.ValidationContext; import fr.ird.observe.common.constants.ReferenceStatus; -import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.ReferenceMap; +import fr.ird.observe.services.dto.form.Form; +import fr.ird.observe.services.dto.reference.ReferenceMap; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; +import fr.ird.observe.services.ObserveFormRequests; import fr.ird.observe.services.dto.referential.I18nReferentialDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.DataNotFoundException; import fr.ird.observe.services.service.referential.ReferentialService; @@ -406,7 +406,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto, U extends Conte ContentReferenceUIModel<E> model = getModel(); - ReferenceSetRequestDefinitions requestDefinition = ReferenceSetRequestDefinitions.get(getBeanType()); + ObserveFormRequests requestDefinition = ObserveFormRequests.get(getBeanType()); loadReferentialReferenceSetsInModel(requestDefinition.name()); // Chargement des données @@ -638,7 +638,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto, U extends Conte } // on met a jour le referentiel dans le cache et le model - ReferenceSetRequestDefinitions requestDefinition = ReferenceSetRequestDefinitions.get(getBeanType()); + ObserveFormRequests requestDefinition = ObserveFormRequests.get(getBeanType()); loadReferentialReferenceSetsInModel(requestDefinition.name()); return true; @@ -711,7 +711,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto, U extends Conte } // on met a jour le referentiel dans le cache et le model - ReferenceSetRequestDefinitions requestDefinition = ReferenceSetRequestDefinitions.get(getBeanType()); + ObserveFormRequests requestDefinition = ObserveFormRequests.get(getBeanType()); loadReferentialReferenceSetsInModel(requestDefinition.name()); return true; @@ -794,7 +794,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto, U extends Conte } // on met a jour le referentiel dans le cache et le model - ReferenceSetRequestDefinitions requestDefinition = ReferenceSetRequestDefinitions.get(getBeanType()); + ObserveFormRequests requestDefinition = ObserveFormRequests.get(getBeanType()); loadReferentialReferenceSetsInModel(requestDefinition.name()); //getModel().setSelectedBean(null); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jaxx index 450beef..3841193 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jaxx @@ -26,7 +26,7 @@ <style source="ReferenceEntity.jcss"/> <import> - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.GearCaracteristicDto fr.ird.observe.services.dto.referential.GearCaracteristicTypeDto diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx index 97ca09d..5aa1757 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx @@ -24,7 +24,7 @@ <style source="../ContentI18nReferenceUI.jcss"/> <import> - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.I18nReferentialDto fr.ird.observe.services.dto.referential.GearDto fr.ird.observe.services.dto.referential.GearCaracteristicDto diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIHandler.java index 26cab08..79ddde4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIHandler.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; import fr.ird.observe.services.dto.referential.GearDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import jaxx.runtime.spi.UIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jaxx index 22649e7..806acfb 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jaxx @@ -25,7 +25,7 @@ <style source="ReferenceEntity.jcss"/> <import> - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.HarbourDto fr.ird.observe.services.dto.referential.CountryDto diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx index 57e4391..9086f17 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx @@ -26,7 +26,7 @@ <style source="ReferenceEntity.jcss"/> <import> - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.SizeMeasureTypeDto fr.ird.observe.services.dto.referential.LengthLengthParameterDto fr.ird.observe.application.swing.ui.UIHelper diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIHandler.java index 4ee1130..0409754 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIHandler.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; import fr.ird.observe.services.dto.referential.LengthLengthParameterDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import jaxx.runtime.spi.UIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx index 5fe9b53..e14edf4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx @@ -26,7 +26,7 @@ <style source="ReferenceEntity.jcss"/> <import> - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.SexDto fr.ird.observe.services.dto.referential.SizeMeasureTypeDto fr.ird.observe.services.dto.referential.SpeciesDto diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIHandler.java index 44baea3..d7a0410 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIHandler.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import jaxx.runtime.spi.UIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jaxx index 9264ca9..2d5076d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jaxx @@ -26,7 +26,7 @@ <import> fr.ird.observe.common.constants.ReferenceStatus - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.OrganismDto fr.ird.observe.services.dto.referential.CountryDto diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jaxx index 855fb2d..2c2a7d0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jaxx @@ -26,7 +26,7 @@ <import> fr.ird.observe.common.constants.ReferenceStatus - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.PersonDto fr.ird.observe.services.dto.referential.CountryDto fr.ird.observe.application.swing.ui.UIHelper diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx index 5743611..8d429b1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx @@ -28,7 +28,7 @@ <import> fr.ird.observe.common.constants.ReferenceStatus fr.ird.observe.common.constants.GearType - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.ProgramDto fr.ird.observe.services.dto.referential.ReferentialDto fr.ird.observe.services.dto.referential.I18nReferentialDto diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIHandler.java index 4d2abf0..c58b67d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIHandler.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import jaxx.runtime.spi.UIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ShipOwnerUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ShipOwnerUI.jaxx index c7b735a..f7a9971 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ShipOwnerUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ShipOwnerUI.jaxx @@ -23,7 +23,7 @@ <style source="ReferenceEntity.jcss"/> <import> - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.ShipOwnerDto fr.ird.observe.services.dto.referential.CountryDto diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx index e640e44..734ead8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx @@ -26,7 +26,7 @@ <style source="../ContentI18nReferenceUI.jcss"/> <import> - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.I18nReferentialDto fr.ird.observe.services.dto.referential.SpeciesListDto fr.ird.observe.services.dto.referential.SpeciesDto diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUIHandler.java index 0725604..f684c97 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUIHandler.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl; */ import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesListDto; import jaxx.runtime.spi.UIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx index 13847ca..5cc30ff 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx @@ -26,7 +26,7 @@ <style source="../ContentI18nReferenceUI.jcss"/> <import> - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.I18nReferentialDto fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.referential.SpeciesGroupDto diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIHandler.java index 1e2afed..2becaea 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIHandler.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl; */ import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import jaxx.runtime.spi.UIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx index dd13fbd..6caedb8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx @@ -26,7 +26,7 @@ <style source="../ContentI18nReferenceUI.jcss"/> <import> - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.I18nReferentialDto fr.ird.observe.services.dto.referential.VesselDto fr.ird.observe.services.dto.referential.VesselSizeCategoryDto diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIHandler.java index e1ba00b..27d014a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIHandler.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl; */ import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.VesselDto; import jaxx.runtime.spi.UIHandler; import jaxx.runtime.validator.swing.SwingValidatorMessage; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUI.jaxx index f422767..598e64b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUI.jaxx @@ -26,7 +26,7 @@ <style source="../ReferenceEntity.jcss"/> <import> - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.seine.WeightCategoryDto fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.application.swing.ui.UIHelper diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDeleteUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDeleteUI.jaxx index ce65ff9..345bebe 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDeleteUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDeleteUI.jaxx @@ -25,8 +25,8 @@ Interface graphique pour afficher la liste des usages d'une entitee donnee. <import> - fr.ird.observe.services.dto.AbstractReference - fr.ird.observe.services.dto.ReferenceMap + fr.ird.observe.services.dto.reference.AbstractReference + fr.ird.observe.services.dto.reference.ReferenceMap jaxx.runtime.context.JAXXInitialContext jaxx.runtime.swing.editor.bean.BeanComboBox java.util.List diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDesactivateUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDesactivateUI.jaxx index 39330a7..826b714 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDesactivateUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDesactivateUI.jaxx @@ -25,8 +25,8 @@ Interface graphique pour afficher la liste des usages d'une entitee donnee. <import> - fr.ird.observe.services.dto.AbstractReference - fr.ird.observe.services.dto.ReferenceMap + fr.ird.observe.services.dto.reference.AbstractReference + fr.ird.observe.services.dto.reference.ReferenceMap jaxx.runtime.context.JAXXInitialContext jaxx.runtime.swing.editor.bean.BeanComboBox java.util.List diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDisplayUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDisplayUI.jaxx index cfe3892..d6076b4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDisplayUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDisplayUI.jaxx @@ -25,7 +25,7 @@ Interface graphique pour afficher la liste des usages d'une entitee donnee. <import> - fr.ird.observe.services.dto.ReferenceMap + fr.ird.observe.services.dto.reference.ReferenceMap jaxx.runtime.context.JAXXInitialContext static org.nuiton.i18n.I18n.t diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageUIHandlerSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageUIHandlerSupport.java index 92992b7..12c7f98 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageUIHandlerSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageUIHandlerSupport.java @@ -25,13 +25,13 @@ package fr.ird.observe.application.swing.ui.content.ref.usage; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; -import fr.ird.observe.services.dto.AbstractReference; +import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.ReferenceMap; +import fr.ird.observe.services.dto.reference.ReferenceMap; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import jaxx.runtime.JAXXObject; import jaxx.runtime.spi.UIHandler; import jaxx.runtime.swing.editor.bean.BeanComboBox; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java index ba49a41..2c41858 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIHandler.java @@ -36,7 +36,7 @@ import fr.ird.observe.application.swing.ui.util.table.EditableTableModelSupport; import fr.ird.observe.application.swing.ui.util.table.InlineTableAutotSelectRowAndShowPopupAction; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/GearUseFeatureMeasurementCellEditor.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/GearUseFeatureMeasurementCellEditor.java index 75fa587..f81021d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/GearUseFeatureMeasurementCellEditor.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/GearUseFeatureMeasurementCellEditor.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearCaracteristicTypeHelper; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import org.nuiton.jaxx.widgets.number.NumberCellEditor; import javax.swing.JTable; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/GearUseFeatureMeasurementCellRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/GearUseFeatureMeasurementCellRenderer.java index da79eba..4053ef2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/GearUseFeatureMeasurementCellRenderer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/GearUseFeatureMeasurementCellRenderer.java @@ -25,7 +25,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearCaracteristicTypeHelper; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUI.jaxx index b6532e3..b4ee063 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUI.jaxx @@ -29,7 +29,7 @@ <import> fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto fr.ird.observe.services.dto.longline.BaitsCompositionDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.longline.BaitTypeDto fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto fr.ird.observe.application.swing.ui.content.table.* diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx index 67af208..652a4c5 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx @@ -29,7 +29,7 @@ <import> fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto fr.ird.observe.services.dto.longline.BranchlinesCompositionDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.longline.LineTypeDto fr.ird.observe.application.swing.ui.content.table.* diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx index fff73e7..9a053e1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx @@ -31,13 +31,13 @@ <style source="../../CommonTable.jcss"/> <import> - fr.ird.observe.services.dto.DataReference + fr.ird.observe.services.dto.reference.DataReference fr.ird.observe.services.dto.longline.BasketDto fr.ird.observe.services.dto.longline.BranchlineDto fr.ird.observe.services.dto.longline.CatchLonglineDto fr.ird.observe.services.dto.longline.SectionDto fr.ird.observe.services.dto.longline.SetLonglineCatchDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.referential.SexDto fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java index e266abe..8077d9d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java @@ -37,8 +37,8 @@ import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.longline.TripLonglineNavigationTreeNode; import fr.ird.observe.application.swing.ui.util.table.AutotSelectRowAndShowPopupActionSupport; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.longline.BranchlineHelper; @@ -50,8 +50,8 @@ import fr.ird.observe.services.dto.longline.SizeMeasureDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.WeightMeasureDto; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialReferences; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferences; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUI.jaxx index 4a9bc37..40d26ed 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUI.jaxx @@ -29,7 +29,7 @@ <import> fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto fr.ird.observe.services.dto.longline.EncounterDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.referential.longline.EncounterTypeDto fr.ird.observe.application.swing.ui.content.table.* diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java index d856178..8f9c1eb 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java @@ -26,13 +26,13 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto; import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterHelper; import fr.ird.observe.services.dto.longline.EncounterDto; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialReferences; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferences; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUI.jaxx index ced011a..d933f34 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUI.jaxx @@ -29,7 +29,7 @@ <import> fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto fr.ird.observe.services.dto.longline.FloatlinesCompositionDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.longline.LineTypeDto fr.ird.observe.application.swing.ui.content.table.* diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java index d3e6852..e87b877 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineTableModel.java @@ -31,7 +31,7 @@ import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineHelper; import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineGearUseDto; import fr.ird.observe.services.dto.referential.GearDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx index 78b574a..ffb58b4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx @@ -31,7 +31,7 @@ <import> fr.ird.observe.services.dto.longline.TripLonglineDto fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.GearDto fr.ird.observe.application.swing.ui.content.table.* fr.ird.observe.application.swing.ui.util.BooleanEditor diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java index e38394a..2efacef 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java @@ -34,7 +34,7 @@ import fr.ird.observe.application.swing.ui.content.ContentUIInitializer; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import fr.ird.observe.application.swing.ui.content.table.impl.GearUseFeatureMeasurementCellEditor; import fr.ird.observe.application.swing.ui.content.table.impl.GearUseFeatureMeasurementCellRenderer; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; @@ -43,7 +43,7 @@ import fr.ird.observe.services.dto.longline.TripLonglineGearUseHelper; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearCaracteristicTypeHelper; import fr.ird.observe.services.dto.referential.GearDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.TripLonglineGearUseService; import fr.ird.observe.services.service.referential.ReferentialService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesMeasurementLonglinesTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesMeasurementLonglinesTableModel.java index 7749e44..7215832 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesMeasurementLonglinesTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesMeasurementLonglinesTableModel.java @@ -26,7 +26,7 @@ import fr.ird.observe.application.swing.ui.util.table.EditableTableWithCacheTabl import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearCaracteristicTypeHelper; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; /** * Created on 4/7/15. diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUI.jaxx index 45da996..b38d70a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUI.jaxx @@ -29,7 +29,7 @@ <import> fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto fr.ird.observe.services.dto.longline.HooksCompositionDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.longline.HookTypeDto fr.ird.observe.services.dto.referential.longline.HookSizeDto fr.ird.observe.application.swing.ui.content.table.* diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/LonglinePositionHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/LonglinePositionHelper.java index bb68db5..1d7d3d6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/LonglinePositionHelper.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/LonglinePositionHelper.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl.longline; */ import com.google.common.collect.Lists; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BasketWithSectionIdDto; import fr.ird.observe.services.dto.longline.BranchlineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jaxx index 2da7140..57024f2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jaxx @@ -29,7 +29,7 @@ <import> fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto fr.ird.observe.services.dto.longline.SensorUsedDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.longline.SensorTypeDto fr.ird.observe.services.dto.referential.longline.SensorBrandDto fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java index 9477f5c..74e0ee8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java @@ -29,7 +29,7 @@ import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import fr.ird.observe.services.dto.DataFileDto; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedHelper; import fr.ird.observe.services.dto.longline.SensorUsedDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SizeMeasuresTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SizeMeasuresTableModel.java index fe2e783..1ec5e00 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SizeMeasuresTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SizeMeasuresTableModel.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl.longline; import fr.ird.observe.application.swing.ui.util.table.EditableTableWithCacheTableModelSupport; import fr.ird.observe.services.dto.longline.SizeMeasureDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; /** diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUI.jaxx index 9a2377c..38214f9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUI.jaxx @@ -26,13 +26,13 @@ <style source="../../CommonTable.jcss"/> <import> - fr.ird.observe.services.dto.DataReference + fr.ird.observe.services.dto.reference.DataReference fr.ird.observe.services.dto.longline.BasketDto fr.ird.observe.services.dto.longline.BranchlineDto fr.ird.observe.services.dto.longline.TdrDto fr.ird.observe.services.dto.longline.SectionDto fr.ird.observe.services.dto.longline.SetLonglineTdrDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.referential.longline.ItemHorizontalPositionDto fr.ird.observe.services.dto.referential.longline.ItemVerticalPositionDto diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java index 17e80c3..4e044e1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java @@ -31,13 +31,13 @@ import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIModel; import fr.ird.observe.services.dto.DataFileDto; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; import fr.ird.observe.services.dto.longline.SetLonglineTdrHelper; import fr.ird.observe.services.dto.longline.TdrDto; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialReferences; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferences; import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.TdrService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/WeightMeasuresTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/WeightMeasuresTableModel.java index cb92e60..1a9db4a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/WeightMeasuresTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/WeightMeasuresTableModel.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl.longline; import fr.ird.observe.application.swing.ui.util.table.EditableTableWithCacheTableModelSupport; import fr.ird.observe.services.dto.longline.WeightMeasureDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; /** diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUIHandler.java index 97face7..590936c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/AbstractSampleUIHandler.java @@ -26,7 +26,7 @@ import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.application.swing.ui.content.table.ContentTableUI; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.seine.TargetLengthDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java index f278b2e..1ce9bcb 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesMeasurementSeinesTableModel.java @@ -25,7 +25,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl.seine; import fr.ird.observe.application.swing.ui.util.table.EditableTableWithCacheTableModelSupport; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearCaracteristicTypeHelper; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; /** diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java index dfead55..a8e1c48 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineTableModel.java @@ -27,7 +27,7 @@ import fr.ird.observe.application.swing.ui.content.table.ContentTableMeta; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.application.swing.ui.content.table.ObserveContentTableUI; import fr.ird.observe.services.dto.referential.GearDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineHelper; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx index 764b762..2eb06ae 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx @@ -31,7 +31,7 @@ <import> fr.ird.observe.services.dto.seine.TripSeineGearUseDto fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.GearDto fr.ird.observe.application.swing.ui.content.table.* fr.ird.observe.application.swing.ui.util.BooleanEditor diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java index 1423252..ea88adc 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java @@ -34,11 +34,11 @@ import fr.ird.observe.application.swing.ui.content.ContentUIInitializer; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import fr.ird.observe.application.swing.ui.content.table.impl.GearUseFeatureMeasurementCellEditor; import fr.ird.observe.application.swing.ui.content.table.impl.GearUseFeatureMeasurementCellRenderer; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearCaracteristicTypeHelper; import fr.ird.observe.services.dto.referential.GearDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx index 97226ee..71fe60c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx @@ -33,7 +33,7 @@ fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto fr.ird.observe.services.dto.seine.NonTargetCatchDto fr.ird.observe.services.dto.referential.seine.SpeciesFateDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto fr.ird.observe.application.swing.ui.content.table.* diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java index e1438d9..0283fba 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java @@ -30,11 +30,11 @@ import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferen import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialReferences; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferences; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx index 1fa0ca6..a6a133f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx @@ -33,7 +33,7 @@ fr.ird.observe.services.dto.referential.SexDto fr.ird.observe.services.dto.referential.SizeMeasureTypeDto fr.ird.observe.services.dto.referential.SpeciesDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.seine.SpeciesFateDto fr.ird.observe.services.dto.seine.NonTargetLengthDto fr.ird.observe.services.dto.seine.NonTargetSampleDto diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java index b18147b..027a047 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java @@ -27,9 +27,9 @@ import fr.ird.observe.application.swing.db.DataContext; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.SpeciesDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java index d38bf77..7d07bd1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIModel.java @@ -27,7 +27,7 @@ import fr.ird.observe.application.swing.ui.content.table.ContentTableMeta; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIModel; import fr.ird.observe.application.swing.ui.content.table.ObserveContentTableUI; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.seine.NonTargetLengthDto; import fr.ird.observe.services.dto.seine.NonTargetLengthHelper; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx index c32ca8b..0fad771 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx @@ -31,7 +31,7 @@ <import> fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto fr.ird.observe.application.swing.ui.content.table.* diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java index 708b11c..4257853 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java @@ -25,10 +25,10 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialReferences; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferences; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx index 75628bb..f4ffe84 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx @@ -31,7 +31,7 @@ <import> fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.application.swing.ui.content.table.* fr.ird.observe.application.swing.ui.util.JComment diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java index cb6f46b..d3ceefa 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java @@ -25,10 +25,10 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialReferences; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferences; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.result.SaveResultDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUI.jaxx index 0ea301e..8e27408 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUI.jaxx @@ -31,7 +31,7 @@ <import> fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto fr.ird.observe.services.dto.seine.SchoolEstimateDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.application.swing.ui.content.table.* fr.ird.observe.application.swing.ui.util.JComment diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java index f417db2..9d3945e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java @@ -26,10 +26,10 @@ import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialReferences; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferences; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jaxx index 6367dec..d2c791b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jaxx @@ -31,7 +31,7 @@ <import> fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto fr.ird.observe.services.dto.seine.TargetCatchDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.referential.seine.WeightCategoryDto fr.ird.observe.application.swing.ui.content.table.* diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java index 69cb1bc..f567679 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java @@ -28,10 +28,10 @@ import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialReferences; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferences; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryHelper; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx index 07c4a82..901e2f8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx @@ -31,7 +31,7 @@ <import> fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto fr.ird.observe.services.dto.seine.TargetCatchDto - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto fr.ird.observe.services.dto.referential.seine.WeightCategoryDto diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java index 4750a1f..997e808 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java @@ -28,10 +28,10 @@ import fr.ird.observe.application.swing.db.constants.DataContextType; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialReferences; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferences; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx index e15c4ce..82b8381 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx @@ -29,7 +29,7 @@ fr.ird.observe.services.dto.seine.TargetSampleDto fr.ird.observe.services.dto.seine.TargetLengthDto fr.ird.observe.application.swing.ui.content.table.impl.seine.ModeSaisieEchantillonEnum - fr.ird.observe.services.dto.referential.ReferentialReference + fr.ird.observe.services.dto.reference.ReferentialReference fr.ird.observe.services.dto.referential.SpeciesDto fr.ird.observe.services.dto.referential.SexDto fr.ird.observe.services.dto.referential.SizeMeasureTypeDto diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java index 5656a98..586a444 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java @@ -27,9 +27,9 @@ import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.content.ContentMode; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.application.swing.ui.content.table.ContentTableUI; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.SizeMeasureTypeHelper; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java index fefa7c3..caef99d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIModel.java @@ -27,7 +27,7 @@ import fr.ird.observe.application.swing.ui.content.table.ContentTableMeta; import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; import fr.ird.observe.application.swing.ui.content.table.ContentTableUIModel; import fr.ird.observe.application.swing.ui.content.table.ObserveContentTableUI; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.seine.TargetLengthDto; import fr.ird.observe.services.dto.seine.TargetLengthHelper; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/ObstunaAdminAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/ObstunaAdminAction.java index 88df488..ba45c06 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/ObstunaAdminAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/ObstunaAdminAction.java @@ -32,8 +32,8 @@ import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.ObserveDbUserDto; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageBackupUILauncher.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageBackupUILauncher.java index cb3db39..338965c 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageBackupUILauncher.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageBackupUILauncher.java @@ -27,12 +27,12 @@ import fr.ird.observe.application.swing.configuration.constants.DbMode; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.ui.tree.selection.SelectionTreeModel; import fr.ird.observe.application.swing.ui.util.ProgressModel; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; -import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; -import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto; +import fr.ird.observe.services.dto.source.DataSourceCreateWithNoReferentialImportException; +import fr.ird.observe.services.dto.source.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java index f35f407..b73571a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java @@ -47,7 +47,7 @@ import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; -import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; +import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.ObserveDbUserDto; import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; import fr.ird.observe.services.service.sql.SqlScriptProducerService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java index 46a9923..891f7dd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java @@ -38,9 +38,9 @@ import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; -import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; -import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; -import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; +import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto; +import fr.ird.observe.services.dto.source.DataSourceCreateWithNoReferentialImportException; +import fr.ird.observe.services.dto.source.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.dto.ObserveDbUserDto; import fr.ird.observe.services.runner.ObserveDataSourceConfigurationMainFactory; import fr.ird.observe.services.security.BadObserveWebUserPasswordException; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripLonglineNodeMenuPopulator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripLonglineNodeMenuPopulator.java index 5e2a348..c7bc091 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripLonglineNodeMenuPopulator.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripLonglineNodeMenuPopulator.java @@ -33,7 +33,7 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.RootNavigationT import fr.ird.observe.application.swing.ui.tree.navigation.nodes.longline.ProgramLonglineNavigationTreeNode; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import java.util.ArrayList; import java.util.List; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripSeineNodeMenuPopulator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripSeineNodeMenuPopulator.java index a561667..04ac29e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripSeineNodeMenuPopulator.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/menu/MoveTripSeineNodeMenuPopulator.java @@ -33,7 +33,7 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.RootNavigationT import fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine.ProgramSeineNavigationTreeNode; import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import java.util.ArrayList; import java.util.List; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java index c4c8ad9..03ac7c9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java @@ -41,16 +41,16 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine.RouteSein import fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine.RoutesSeineNavigationTreeNode; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine.SetSeineNavigationTreeNode; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine.TripSeineNavigationTreeNode; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.dto.reference.ReferenceBinderEngine; +import fr.ird.observe.services.binder.ReferenceBinderEngine; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ProgramHelper; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.RouteDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeader.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeader.jcss index 0e2ffc3..2ddf994 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeader.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeader.jcss @@ -22,23 +22,23 @@ #showSeine { selected: {tree.getTreeModel().isLoadSeine()}; - text:"observe.enum.fr.ird.observe.services.dto.ObserveModelType.PS"; - toolTipText:"observe.enum.fr.ird.observe.services.dto.ObserveModelType.PS.tip"; + text:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS"; + toolTipText:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS.tip"; } #showLongline { selected: {tree.getTreeModel().isLoadLongline()}; - text:"observe.enum.fr.ird.observe.services.dto.ObserveModelType.LL"; - toolTipText:"observe.enum.fr.ird.observe.services.dto.ObserveModelType.LL.tip"; + text:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL"; + toolTipText:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL.tip"; } #showReferential { selected: {tree.getTreeModel().isLoadReferential()}; - text:"observe.enum.fr.ird.observe.services.dto.ObserveModelType.REF"; - toolTipText:"observe.enum.fr.ird.observe.services.dto.ObserveModelType.REF.tip"; + text:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF"; + toolTipText:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF.tip"; } #showEmptyProgram { selected: {tree.getTreeModel().isLoadEmptyProgram()}; - toolTipText:"observe.enum.fr.ird.observe.services.dto.ObserveModelType.EMPTY.tip"; + toolTipText:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY.tip"; } #label { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeModel.java index 731b2a5..d0f7400 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeModel.java @@ -31,12 +31,12 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.referential.Ref import fr.ird.observe.application.swing.ui.tree.navigation.nodes.referential.ReferentialsLonglineNavigationTreeNode; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.referential.ReferentialsSeineNavigationTreeNode; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine.ProgramSeineNavigationTreeNode; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineHelper; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ProgramHelper; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineHelper; import fr.ird.observe.services.service.data.NavigationRequest; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ReferenceNavigationTreeNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ReferenceNavigationTreeNodeSupport.java index 7e7b7af..604415e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ReferenceNavigationTreeNodeSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/ReferenceNavigationTreeNodeSupport.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.services.dto.AbstractReference; +import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.IdDto; import org.nuiton.decorator.Decorator; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/RootNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/RootNavigationTreeNode.java index 43bd660..32b97aa 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/RootNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/RootNavigationTreeNode.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes; import fr.ird.observe.application.swing.ui.content.ContentUI; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import org.apache.commons.collections4.EnumerationUtils; import java.util.Iterator; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivitiesLonglineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivitiesLonglineNavigationTreeNode.java index bc7ca3b..fa2d9e8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivitiesLonglineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivitiesLonglineNavigationTreeNode.java @@ -26,8 +26,8 @@ import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.application.swing.ui.content.list.impl.longline.ActivityLonglinesUI; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.WithChildsToReload; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceSet; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import static org.nuiton.i18n.I18n.t; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivityLonglineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivityLonglineNavigationTreeNode.java index f4f3d0b..ca42259 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivityLonglineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ActivityLonglineNavigationTreeNode.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.longline; import fr.ird.observe.application.swing.ui.content.open.impl.longline.ActivityLonglineUI; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.ActivityLonglineHelper; import fr.ird.observe.services.dto.longline.SetLonglineDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ProgramLonglineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ProgramLonglineNavigationTreeNode.java index f563c6c..1e858ae 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ProgramLonglineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/ProgramLonglineNavigationTreeNode.java @@ -24,10 +24,10 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.longline; import fr.ird.observe.application.swing.ui.content.list.impl.longline.TripLonglinesUI; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import org.apache.commons.collections4.EnumerationUtils; import java.util.Collection; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/SetLonglineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/SetLonglineNavigationTreeNode.java index 928f0c6..27d82af 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/SetLonglineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/SetLonglineNavigationTreeNode.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.longline; import fr.ird.observe.application.swing.ui.content.impl.longline.SetLonglineUI; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.SetLonglineDto; import static org.nuiton.i18n.I18n.t; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/TripLonglineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/TripLonglineNavigationTreeNode.java index 85571db..6294c43 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/TripLonglineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/longline/TripLonglineNavigationTreeNode.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.longline; import fr.ird.observe.application.swing.ui.content.open.impl.longline.TripLonglineUI; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineHelper; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ActivitiesSeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ActivitiesSeineNavigationTreeNode.java index 276d76e..d37b7d2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ActivitiesSeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ActivitiesSeineNavigationTreeNode.java @@ -26,8 +26,8 @@ import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.application.swing.ui.content.list.impl.seine.ActivitySeinesUI; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.WithChildsToReload; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceSet; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import static org.nuiton.i18n.I18n.t; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ActivitySeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ActivitySeineNavigationTreeNode.java index 7545ed2..5026e02 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ActivitySeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ActivitySeineNavigationTreeNode.java @@ -25,8 +25,8 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine; import fr.ird.observe.application.swing.ui.content.open.impl.seine.ActivitySeineUI; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.WithChildsToReload; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceSet; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineHelper; import fr.ird.observe.services.dto.seine.FloatingObjectDto; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/FloatingObjectSeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/FloatingObjectSeineNavigationTreeNode.java index 6aa0922..b19ff35 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/FloatingObjectSeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/FloatingObjectSeineNavigationTreeNode.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine; import fr.ird.observe.application.swing.ui.content.impl.seine.FloatingObjectUI; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import static org.nuiton.i18n.I18n.t; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ProgramSeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ProgramSeineNavigationTreeNode.java index dfb7a28..3dafa6d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ProgramSeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/ProgramSeineNavigationTreeNode.java @@ -24,9 +24,9 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine; import fr.ird.observe.application.swing.ui.content.list.impl.seine.TripSeinesUI; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.seine.TripSeineDto; import org.apache.commons.collections4.EnumerationUtils; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RouteSeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RouteSeineNavigationTreeNode.java index ab0c0b7..4ea2e27 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RouteSeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RouteSeineNavigationTreeNode.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine; import fr.ird.observe.application.swing.ui.content.open.impl.seine.RouteUI; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.seine.RouteDto; import static org.nuiton.i18n.I18n.t; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RoutesSeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RoutesSeineNavigationTreeNode.java index 34b8d7f..08f7ac0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RoutesSeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/RoutesSeineNavigationTreeNode.java @@ -27,8 +27,8 @@ import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.application.swing.ui.content.list.impl.seine.RoutesUI; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ClassNavigationTreeNode; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.WithChildsToReload; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceSet; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.service.data.seine.RouteService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/SetSeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/SetSeineNavigationTreeNode.java index 4b6e80a..3611e18 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/SetSeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/SetSeineNavigationTreeNode.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine; import fr.ird.observe.application.swing.ui.content.impl.seine.SetSeineUI; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.service.data.seine.SetSeineService; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/TripSeineNavigationTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/TripSeineNavigationTreeNode.java index fd4b7ad..708c0d0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/TripSeineNavigationTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/seine/TripSeineNavigationTreeNode.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.tree.navigation.nodes.seine; import fr.ird.observe.application.swing.ui.content.open.impl.seine.TripSeineUI; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineHelper; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/SelectionTreeModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/SelectionTreeModel.java index 092b1f2..d28ae89 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/SelectionTreeModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/SelectionTreeModel.java @@ -33,13 +33,13 @@ import fr.ird.observe.application.swing.ui.tree.selection.nodes.ReferentialsSele import fr.ird.observe.application.swing.ui.tree.selection.nodes.RootSelectionTreeNode; import fr.ird.observe.application.swing.ui.tree.selection.nodes.SelectionTreeNodeSupport; import fr.ird.observe.application.swing.ui.tree.selection.nodes.TripSelectionTreeNodeSupport; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ProgramHelper; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialHelper; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.data.NavigationRequest; import fr.ird.observe.services.service.data.NavigationResult; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/ProgramSelectionTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/ProgramSelectionTreeNode.java index 6895695..c869e4b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/ProgramSelectionTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/ProgramSelectionTreeNode.java @@ -24,10 +24,10 @@ package fr.ird.observe.application.swing.ui.tree.selection.nodes; import com.google.common.collect.ImmutableList; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.seine.TripSeineDto; import org.apache.commons.collections4.EnumerationUtils; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/ReferenceSelectionTreeNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/ReferenceSelectionTreeNodeSupport.java index d1652dc..a2102bd 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/ReferenceSelectionTreeNodeSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/ReferenceSelectionTreeNodeSupport.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.tree.selection.nodes; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.services.dto.AbstractReference; +import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.IdDto; import org.nuiton.decorator.Decorator; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/TripLonglineSelectionTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/TripLonglineSelectionTreeNode.java index 893f56c..e784b89 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/TripLonglineSelectionTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/TripLonglineSelectionTreeNode.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.tree.selection.nodes; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineHelper; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/TripSeineSelectionTreeNode.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/TripSeineSelectionTreeNode.java index a665fcf..9d4fc40 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/TripSeineSelectionTreeNode.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/TripSeineSelectionTreeNode.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.tree.selection.nodes; */ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineHelper; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/TripSelectionTreeNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/TripSelectionTreeNodeSupport.java index 5533685..b0bc145 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/TripSelectionTreeNodeSupport.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/nodes/TripSelectionTreeNodeSupport.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.tree.selection.nodes; */ import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; /** * Created on 20/11/16. diff --git a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties index 1a95f5d..dd8f3a9 100644 --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -1450,13 +1450,13 @@ observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperation=Grab observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Grab and change observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.visite=Visit -observe.enum.fr.ird.observe.services.dto.ObserveModelType.EMPTY.tip=Display programs with no trip -observe.enum.fr.ird.observe.services.dto.ObserveModelType.LL=Longline -observe.enum.fr.ird.observe.services.dto.ObserveModelType.LL.tip=Display Palangre's programs -observe.enum.fr.ird.observe.services.dto.ObserveModelType.PS=Seine -observe.enum.fr.ird.observe.services.dto.ObserveModelType.PS.tip=Display Seine's programs -observe.enum.fr.ird.observe.services.dto.ObserveModelType.REF=Referential -observe.enum.fr.ird.observe.services.dto.ObserveModelType.REF.tip=Display referential +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY.tip=Display programs with no trip +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL=Longline +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL.tip=Display Palangre's programs +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS=Seine +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS.tip=Display Seine's programs +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF=Referential +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF.tip=Display referential observe.error.can.not.create.directory=Can't create directory %&$s\! observe.error.no.activity.6=Activity of type 6 was not found. observe.error.storage.could.not.backup.unsane.local.db=Can not save an borken database diff --git a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties index b46d168..889c4e4 100644 --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -1450,13 +1450,13 @@ observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperation=Recogida de baliza sin regreso al agua observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Recuperación y colocación de una nueva baliza observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.visite=Visita a la baliza -observe.enum.fr.ird.observe.services.dto.ObserveModelType.EMPTY.tip=Voir les programmes sans marée \#TODO -observe.enum.fr.ird.observe.services.dto.ObserveModelType.LL=Palangre -observe.enum.fr.ird.observe.services.dto.ObserveModelType.LL.tip=Voir les programmes Palangre \#TODO -observe.enum.fr.ird.observe.services.dto.ObserveModelType.PS=Senne -observe.enum.fr.ird.observe.services.dto.ObserveModelType.PS.tip=Voir les programmes Senne \#TODO -observe.enum.fr.ird.observe.services.dto.ObserveModelType.REF=Referencial -observe.enum.fr.ird.observe.services.dto.ObserveModelType.REF.tip=Voir le référentiel \#TODO +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY.tip=Voir les programmes sans marée \#TODO +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL=Palangre +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL.tip=Voir les programmes Palangre \#TODO +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS=Senne +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS.tip=Voir les programmes Senne \#TODO +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF=Referencial +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF.tip=Voir le référentiel \#TODO observe.error.can.not.create.directory=¡Imposible crear el directorio %1$s\! observe.error.no.activity.6=La actividad con código 6 no se ha encontrado en la base de datos. observe.error.storage.could.not.backup.unsane.local.db=Impossible grabar una base dañada diff --git a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties index af90535..86b5d6b 100644 --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -1449,13 +1449,13 @@ observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperation=Récupération d'une balise sans remise à l'eau observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Récupération et pose d'une nouvelle balise observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.visite=Simple visite de la balise -observe.enum.fr.ird.observe.services.dto.ObserveModelType.EMPTY.tip=Voir les programmes sans marée -observe.enum.fr.ird.observe.services.dto.ObserveModelType.LL=Palangre -observe.enum.fr.ird.observe.services.dto.ObserveModelType.LL.tip=Voir les programmes Palangre -observe.enum.fr.ird.observe.services.dto.ObserveModelType.PS=Senne -observe.enum.fr.ird.observe.services.dto.ObserveModelType.PS.tip=Voir les programmes Seine -observe.enum.fr.ird.observe.services.dto.ObserveModelType.REF=Référentiel -observe.enum.fr.ird.observe.services.dto.ObserveModelType.REF.tip=Voir le référentiel +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY.tip=Voir les programmes sans marée +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL=Palangre +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL.tip=Voir les programmes Palangre +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS=Senne +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.PS.tip=Voir les programmes Seine +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF=Référentiel +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.REF.tip=Voir le référentiel observe.error.can.not.create.directory=Création du répertoire %1$s impossible\! observe.error.no.activity.6=L'activité de type 6 n'a pas été trouvée en base. observe.error.storage.could.not.backup.unsane.local.db=Impossible d'enregistrer une base non endommagée diff --git a/application-web-configuration/src/main/resources/validators.xml b/application-web-configuration/src/main/resources/validators.xml index c763b7b..32c88ac 100644 --- a/application-web-configuration/src/main/resources/validators.xml +++ b/application-web-configuration/src/main/resources/validators.xml @@ -52,16 +52,16 @@ <validator name="fieldexpressionwithparams" class="org.nuiton.validator.xwork2.field.FieldExpressionWithParamsValidator"/> <!-- Les validateurs spécifique aux entitées dans observe --> - <validator name="collectionUniqueKey" class="fr.ird.observe.services.topia.validators.CollectionUniqueKeyValidator2"/> - <validator name="observeCollectionUniqueKey" class="fr.ird.observe.services.topia.validators.ObserveCollectionUniqueKeyValidator"/> - <validator name="species_length" class="fr.ird.observe.services.topia.validators.SpeciesLengthFieldValidator"/> - <validator name="species_weight" class="fr.ird.observe.services.topia.validators.SpeciesWeightFieldValidator"/> - <validator name="activitySpeed" class="fr.ird.observe.services.topia.validators.ActivitySpeedValidator"/> - <validator name="activitySimpleSpeed" class="fr.ird.observe.services.topia.validators.ActivitySimpleSpeedValidator"/> - <validator name="activityFinDeVeilleExists" class="fr.ird.observe.services.topia.validators.ActivityFinDeVeilleExistsValidator"/> - <validator name="setLonglineUniqueHomeId" class="fr.ird.observe.services.topia.validators.SetLonglineUniqueHomeIdValidator"/> - <validator name="setLonglineUniqueNumber" class="fr.ird.observe.services.topia.validators.SetLonglineUniqueNumberValidator"/> - <validator name="quadrant" class="fr.ird.observe.services.topia.validators.QuadrantFieldValidator"/> + <validator name="collectionUniqueKey" class="fr.ird.observe.services.validators.CollectionUniqueKeyValidator2"/> + <validator name="observeCollectionUniqueKey" class="fr.ird.observe.services.validators.ObserveCollectionUniqueKeyValidator"/> + <validator name="species_length" class="fr.ird.observe.services.validators.SpeciesLengthFieldValidator"/> + <validator name="species_weight" class="fr.ird.observe.services.validators.SpeciesWeightFieldValidator"/> + <validator name="activitySpeed" class="fr.ird.observe.services.validators.ActivitySpeedValidator"/> + <validator name="activitySimpleSpeed" class="fr.ird.observe.services.validators.ActivitySimpleSpeedValidator"/> + <validator name="activityFinDeVeilleExists" class="fr.ird.observe.services.validators.ActivityFinDeVeilleExistsValidator"/> + <validator name="setLonglineUniqueHomeId" class="fr.ird.observe.services.validators.SetLonglineUniqueHomeIdValidator"/> + <validator name="setLonglineUniqueNumber" class="fr.ird.observe.services.validators.SetLonglineUniqueNumberValidator"/> + <validator name="quadrant" class="fr.ird.observe.services.validators.QuadrantFieldValidator"/> <!-- Les validateurs spécifique aux Dto dans observe --> <validator name="collectionUniqueKeyDto" class="fr.ird.observe.application.swing.validators.CollectionUniqueKeyDtoValidator"/> diff --git a/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContext.java b/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContext.java index a16c2ff..6ee7322 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContext.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationContext.java @@ -39,7 +39,7 @@ import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.ObserveServiceFactory; import fr.ird.observe.services.ObserveServiceInitializer; import fr.ird.observe.services.runner.ObserveServiceMainFactory; -import fr.ird.observe.services.dto.gson.ObserveDtoGsonSupplier; +import fr.ird.observe.services.gson.ObserveDtoGsonSupplier; import org.debux.webmotion.server.call.HttpContext; import org.nuiton.version.Version; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java index 7f82063..ca739d2 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceServiceController.java @@ -31,9 +31,9 @@ import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfiguration import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.configuration.rest.ObserveDataSourceConnectionRest; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; -import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; -import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; -import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; +import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto; +import fr.ird.observe.services.dto.source.DataSourceCreateWithNoReferentialImportException; +import fr.ird.observe.services.dto.source.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.dto.ObserveDbUserDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.service.BabModelVersionException; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java index 0625ddd..33178b8 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1; */ import fr.ird.observe.services.security.ObserveWebSecurityExceptionSupport; -import fr.ird.observe.services.dto.UnauthorizedException; +import fr.ird.observe.services.security.UnauthorizedException; import fr.ird.observe.services.http.ObserveHttpError; import org.debux.webmotion.server.WebMotionController; import org.debux.webmotion.server.WebMotionException; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/report/ReportServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/report/ReportServiceController.java index 04dc592..249b6ab 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/report/ReportServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/report/ReportServiceController.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.web.controller.v1.actions.report; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.actions.report.DataMatrix; -import fr.ird.observe.services.dto.actions.report.Report; +import fr.ird.observe.services.service.actions.report.DataMatrix; +import fr.ird.observe.services.service.actions.report.Report; import fr.ird.observe.services.service.actions.report.ReportService; /** diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceController.java index e7e0559..60cb3bb 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceController.java @@ -26,7 +26,7 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialMultimap; -import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialDataSourceStates; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceController.java index 6862aa5..7270a3a 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceController.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.web.controller.v1.actions.synchro.referential import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalService; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeRequest; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLongLineEncounterServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLongLineEncounterServiceController.java index 90d871a..cd609d3 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLongLineEncounterServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLongLineEncounterServiceController.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.data.longline; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.ActivityLongLineEncounterService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLongLineSensorUsedServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLongLineSensorUsedServiceController.java index 3e4a8f8..8da706f 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLongLineSensorUsedServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLongLineSensorUsedServiceController.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.web.controller.v1.data.longline; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.DataFileDto; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.ActivityLongLineSensorUsedService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLonglineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLonglineServiceController.java index d264bac..5fe1d29 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLonglineServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/ActivityLonglineServiceController.java @@ -23,9 +23,9 @@ package fr.ird.observe.application.web.controller.v1.data.longline; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceSet; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.service.data.longline.ActivityLonglineService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/BranchlineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/BranchlineServiceController.java index 4421e90..b5da2fd 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/BranchlineServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/BranchlineServiceController.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.data.longline; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.BranchlineService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineCatchServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineCatchServiceController.java index 72171a8..a5d330c 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineCatchServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineCatchServiceController.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.data.longline; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.SetLonglineCatchService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineDetailCompositionServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineDetailCompositionServiceController.java index e38b634..3aa737e 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineDetailCompositionServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineDetailCompositionServiceController.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.data.longline; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.SetLonglineDetailCompositionService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineGlobalCompositionServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineGlobalCompositionServiceController.java index 81ae25a..01e390d 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineGlobalCompositionServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineGlobalCompositionServiceController.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.data.longline; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.SetLonglineGlobalCompositionService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineServiceController.java index 6a79201..ca896d4 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/SetLonglineServiceController.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.web.controller.v1.data.longline; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.SetLonglineService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TdrServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TdrServiceController.java index d1f127d..a560f07 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TdrServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TdrServiceController.java @@ -24,7 +24,7 @@ package fr.ird.observe.application.web.controller.v1.data.longline; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.DataFileDto; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.TdrService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TripLonglineGearUseServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TripLonglineGearUseServiceController.java index e00e39b..d898179 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TripLonglineGearUseServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TripLonglineGearUseServiceController.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.data.longline; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.TripLonglineGearUseDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.TripLonglineGearUseService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TripLonglineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TripLonglineServiceController.java index 91b9467..4afbf81 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TripLonglineServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TripLonglineServiceController.java @@ -24,12 +24,12 @@ package fr.ird.observe.application.web.controller.v1.data.longline; import com.google.common.collect.ImmutableList; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceList; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceList; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.TripLonglineService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/ActivitySeineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/ActivitySeineServiceController.java index 019ea0d..38cb40c 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/ActivitySeineServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/ActivitySeineServiceController.java @@ -23,9 +23,9 @@ package fr.ird.observe.application.web.controller.v1.data.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceSet; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.service.data.seine.ActivitySeineService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/FloatingObjectServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/FloatingObjectServiceController.java index 83b8a8c..62f22a2 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/FloatingObjectServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/FloatingObjectServiceController.java @@ -23,9 +23,9 @@ package fr.ird.observe.application.web.controller.v1.data.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceSet; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.service.data.seine.FloatingObjectService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/NonTargetCatchServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/NonTargetCatchServiceController.java index 5ca5939..ddb541c 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/NonTargetCatchServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/NonTargetCatchServiceController.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.data.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; import fr.ird.observe.services.service.data.seine.NonTargetCatchService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/NonTargetSampleServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/NonTargetSampleServiceController.java index 2030c7f..21f8977 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/NonTargetSampleServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/NonTargetSampleServiceController.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.web.controller.v1.data.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.form.Form; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.NonTargetSampleDto; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/ObjectObservedSpeciesServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/ObjectObservedSpeciesServiceController.java index a4ee3f9..c46d1d2 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/ObjectObservedSpeciesServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/ObjectObservedSpeciesServiceController.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.data.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; import fr.ird.observe.services.service.data.seine.ObjectObservedSpeciesService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/ObjectSchoolEstimateServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/ObjectSchoolEstimateServiceController.java index bf64f66..b2b4f08 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/ObjectSchoolEstimateServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/ObjectSchoolEstimateServiceController.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.data.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; import fr.ird.observe.services.service.data.seine.ObjectSchoolEstimateService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/RouteServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/RouteServiceController.java index 38807b8..ed68222 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/RouteServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/RouteServiceController.java @@ -23,9 +23,9 @@ package fr.ird.observe.application.web.controller.v1.data.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceSet; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.service.data.seine.RouteService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/SchoolEstimateServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/SchoolEstimateServiceController.java index 97b806b..f9111ab 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/SchoolEstimateServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/SchoolEstimateServiceController.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.data.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; import fr.ird.observe.services.service.data.seine.SchoolEstimateService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/SetSeineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/SetSeineServiceController.java index 8076cd0..6ada048 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/SetSeineServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/SetSeineServiceController.java @@ -23,8 +23,8 @@ package fr.ird.observe.application.web.controller.v1.data.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.service.data.seine.SetSeineService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TargetCatchServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TargetCatchServiceController.java index 95607e1..4afbf3d 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TargetCatchServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TargetCatchServiceController.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.data.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; import fr.ird.observe.services.service.data.seine.TargetCatchService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TargetSampleServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TargetSampleServiceController.java index 8f7951f..0f6c7e5 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TargetSampleServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TargetSampleServiceController.java @@ -24,8 +24,8 @@ package fr.ird.observe.application.web.controller.v1.data.seine; import com.google.common.collect.ImmutableList; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.form.Form; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TargetSampleDto; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TransmittingBuoyOperationServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TransmittingBuoyOperationServiceController.java index 7b89022..da532e9 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TransmittingBuoyOperationServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TransmittingBuoyOperationServiceController.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.data.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; import fr.ird.observe.services.service.data.seine.TransmittingBuoyOperationService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TripSeineGearUseServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TripSeineGearUseServiceController.java index 393c8ab..abe683d 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TripSeineGearUseServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TripSeineGearUseServiceController.java @@ -23,7 +23,7 @@ package fr.ird.observe.application.web.controller.v1.data.seine; */ import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; import fr.ird.observe.services.service.data.seine.TripSeineGearUseService; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TripSeineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TripSeineServiceController.java index c85f1ef..317325a 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TripSeineServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TripSeineServiceController.java @@ -24,11 +24,11 @@ package fr.ird.observe.application.web.controller.v1.data.seine; import com.google.common.collect.ImmutableList; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceList; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceList; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.TripMapDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TripSeineDto; diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/referential/ReferentialServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/referential/ReferentialServiceController.java index fa8f9c6..e25f3af 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/referential/ReferentialServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/referential/ReferentialServiceController.java @@ -25,11 +25,11 @@ package fr.ird.observe.application.web.controller.v1.referential; import com.google.common.collect.ImmutableSet; import com.google.common.collect.SetMultimap; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.ReferenceMap; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.ReferenceMap; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.DataNotFoundException; diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderEngine.java b/services-binder/src/main/java/fr/ird/observe/services/binder/BinderEngine.java similarity index 96% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderEngine.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/BinderEngine.java index 5a5b5ea..f4316cd 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderEngine.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/BinderEngine.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder; +package fr.ird.observe.services.binder; /*- * #%L @@ -27,15 +27,14 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.ObserveModelInitializerRunner; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.reference.ReferenceBinderEngine; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import java.util.Map; diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java b/services-binder/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java similarity index 83% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java index 616c415..ab8a0ef 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/BinderEngineInitializer.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder; +package fr.ird.observe.services.binder; /*- * #%L @@ -242,121 +242,121 @@ import fr.ird.observe.services.dto.seine.TargetSampleDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; -import fr.ird.observe.services.topia.binder.data.longline.ActivityLonglineBinder; -import fr.ird.observe.services.topia.binder.data.longline.ActivityLonglineEncouterDtoBinder; -import fr.ird.observe.services.topia.binder.data.longline.ActivityLonglineSensorUsedDtoBinder; -import fr.ird.observe.services.topia.binder.data.longline.ActivityLonglineStubDtoBinder; -import fr.ird.observe.services.topia.binder.data.longline.BaitsCompositionBinder; -import fr.ird.observe.services.topia.binder.data.longline.BasketBinder; -import fr.ird.observe.services.topia.binder.data.longline.BranchlineBinder; -import fr.ird.observe.services.topia.binder.data.longline.BranchlinesCompositionBinder; -import fr.ird.observe.services.topia.binder.data.longline.CatchLonglineBinder; -import fr.ird.observe.services.topia.binder.data.longline.EncounterBinder; -import fr.ird.observe.services.topia.binder.data.longline.FloatlinesCompositionBinder; -import fr.ird.observe.services.topia.binder.data.longline.GearUseFeaturesLonglineBinder; -import fr.ird.observe.services.topia.binder.data.longline.GearUseFeaturesMeasurementLonglineBinder; -import fr.ird.observe.services.topia.binder.data.longline.HooksCompositionBinder; -import fr.ird.observe.services.topia.binder.data.longline.SectionBinder; -import fr.ird.observe.services.topia.binder.data.longline.SensorUsedBinder; -import fr.ird.observe.services.topia.binder.data.longline.SetLonglineBinder; -import fr.ird.observe.services.topia.binder.data.longline.SetLonglineCatchDtoBinder; -import fr.ird.observe.services.topia.binder.data.longline.SetLonglineDetailCompositionDtoBinder; -import fr.ird.observe.services.topia.binder.data.longline.SetLonglineGlobalCompositionDtoBinder; -import fr.ird.observe.services.topia.binder.data.longline.SetLonglineStubDtoBinder; -import fr.ird.observe.services.topia.binder.data.longline.SetLonglineTdrDtoBinder; -import fr.ird.observe.services.topia.binder.data.longline.SizeMeasureBinder; -import fr.ird.observe.services.topia.binder.data.longline.TdrBinder; -import fr.ird.observe.services.topia.binder.data.longline.TripLonglineActivityDtoBinder; -import fr.ird.observe.services.topia.binder.data.longline.TripLonglineBinder; -import fr.ird.observe.services.topia.binder.data.longline.TripLonglineGearUseDtoBinder; -import fr.ird.observe.services.topia.binder.data.longline.WeightMeasureBinder; -import fr.ird.observe.services.topia.binder.data.seine.ActivitySeineBinder; -import fr.ird.observe.services.topia.binder.data.seine.ActivitySeineStubDtoBinder; -import fr.ird.observe.services.topia.binder.data.seine.FloatingObjectBinder; -import fr.ird.observe.services.topia.binder.data.seine.FloatingObjectObservedSpeciesDtoBinder; -import fr.ird.observe.services.topia.binder.data.seine.FloatingObjectSchoolEstimateDtoBinder; -import fr.ird.observe.services.topia.binder.data.seine.FloatingObjectTransmittingBuoyDtoBinder; -import fr.ird.observe.services.topia.binder.data.seine.GearUseFeaturesMeasurementSeineBinder; -import fr.ird.observe.services.topia.binder.data.seine.GearUseFeaturesSeineBinder; -import fr.ird.observe.services.topia.binder.data.seine.NonTargetCatchBinder; -import fr.ird.observe.services.topia.binder.data.seine.NonTargetLengthBinder; -import fr.ird.observe.services.topia.binder.data.seine.NonTargetSampleBinder; -import fr.ird.observe.services.topia.binder.data.seine.ObjectObservedSpeciesBinder; -import fr.ird.observe.services.topia.binder.data.seine.ObjectSchoolEstimateBinder; -import fr.ird.observe.services.topia.binder.data.seine.RouteBinder; -import fr.ird.observe.services.topia.binder.data.seine.RouteStubDtoBinder; -import fr.ird.observe.services.topia.binder.data.seine.SchoolEstimateBinder; -import fr.ird.observe.services.topia.binder.data.seine.SetSeineBinder; -import fr.ird.observe.services.topia.binder.data.seine.SetSeineNonTargetCatchDtoBinder; -import fr.ird.observe.services.topia.binder.data.seine.SetSeineSchoolEstimateDtoBinder; -import fr.ird.observe.services.topia.binder.data.seine.SetSeineTargetCatchDtoBinder; -import fr.ird.observe.services.topia.binder.data.seine.TargetCatchBinder; -import fr.ird.observe.services.topia.binder.data.seine.TargetLengthBinder; -import fr.ird.observe.services.topia.binder.data.seine.TargetSampleBinder; -import fr.ird.observe.services.topia.binder.data.seine.TransmittingBuoyBinder; -import fr.ird.observe.services.topia.binder.data.seine.TripSeineBinder; -import fr.ird.observe.services.topia.binder.data.seine.TripSeineGearUseDtoBinder; -import fr.ird.observe.services.topia.binder.referential.common.CountryBinder; -import fr.ird.observe.services.topia.binder.referential.common.FpaZoneBinder; -import fr.ird.observe.services.topia.binder.referential.common.GearBinder; -import fr.ird.observe.services.topia.binder.referential.common.GearCaracteristicBinder; -import fr.ird.observe.services.topia.binder.referential.common.GearCaracteristicTypeBinder; -import fr.ird.observe.services.topia.binder.referential.common.HarbourBinder; -import fr.ird.observe.services.topia.binder.referential.common.LengthLengthParameterBinder; -import fr.ird.observe.services.topia.binder.referential.common.LengthWeightParameterBinder; -import fr.ird.observe.services.topia.binder.referential.common.OceanBinder; -import fr.ird.observe.services.topia.binder.referential.common.OrganismBinder; -import fr.ird.observe.services.topia.binder.referential.common.PersonBinder; -import fr.ird.observe.services.topia.binder.referential.common.ProgramBinder; -import fr.ird.observe.services.topia.binder.referential.common.SexBinder; -import fr.ird.observe.services.topia.binder.referential.common.ShipOwnerBinder; -import fr.ird.observe.services.topia.binder.referential.common.SizeMeasureTypeBinder; -import fr.ird.observe.services.topia.binder.referential.common.SpeciesBinder; -import fr.ird.observe.services.topia.binder.referential.common.SpeciesGroupBinder; -import fr.ird.observe.services.topia.binder.referential.common.SpeciesListBinder; -import fr.ird.observe.services.topia.binder.referential.common.VesselBinder; -import fr.ird.observe.services.topia.binder.referential.common.VesselSizeCategoryBinder; -import fr.ird.observe.services.topia.binder.referential.common.VesselTypeBinder; -import fr.ird.observe.services.topia.binder.referential.common.WeightMeasureTypeBinder; -import fr.ird.observe.services.topia.binder.referential.longline.BaitHaulingStatusBinder; -import fr.ird.observe.services.topia.binder.referential.longline.BaitSettingStatusBinder; -import fr.ird.observe.services.topia.binder.referential.longline.BaitTypeBinder; -import fr.ird.observe.services.topia.binder.referential.longline.CatchFateLonglineBinder; -import fr.ird.observe.services.topia.binder.referential.longline.EncounterTypeBinder; -import fr.ird.observe.services.topia.binder.referential.longline.HealthnessBinder; -import fr.ird.observe.services.topia.binder.referential.longline.HookPositionBinder; -import fr.ird.observe.services.topia.binder.referential.longline.HookSizeBinder; -import fr.ird.observe.services.topia.binder.referential.longline.HookTypeBinder; -import fr.ird.observe.services.topia.binder.referential.longline.ItemHorizontalPositionBinder; -import fr.ird.observe.services.topia.binder.referential.longline.ItemVerticalPositionBinder; -import fr.ird.observe.services.topia.binder.referential.longline.LightsticksColorBinder; -import fr.ird.observe.services.topia.binder.referential.longline.LightsticksTypeBinder; -import fr.ird.observe.services.topia.binder.referential.longline.LineTypeBinder; -import fr.ird.observe.services.topia.binder.referential.longline.MaturityStatusBinder; -import fr.ird.observe.services.topia.binder.referential.longline.MitigationTypeBinder; -import fr.ird.observe.services.topia.binder.referential.longline.SensorBrandBinder; -import fr.ird.observe.services.topia.binder.referential.longline.SensorDataFormatBinder; -import fr.ird.observe.services.topia.binder.referential.longline.SensorTypeBinder; -import fr.ird.observe.services.topia.binder.referential.longline.SettingShapeBinder; -import fr.ird.observe.services.topia.binder.referential.longline.StomacFullnessBinder; -import fr.ird.observe.services.topia.binder.referential.longline.TripTypeBinder; -import fr.ird.observe.services.topia.binder.referential.longline.VesselActivityLonglineBinder; -import fr.ird.observe.services.topia.binder.referential.seine.DetectionModeBinder; -import fr.ird.observe.services.topia.binder.referential.seine.ObjectFateBinder; -import fr.ird.observe.services.topia.binder.referential.seine.ObjectOperationBinder; -import fr.ird.observe.services.topia.binder.referential.seine.ObjectTypeBinder; -import fr.ird.observe.services.topia.binder.referential.seine.ObservedSystemBinder; -import fr.ird.observe.services.topia.binder.referential.seine.ReasonForDiscardBinder; -import fr.ird.observe.services.topia.binder.referential.seine.ReasonForNoFishingBinder; -import fr.ird.observe.services.topia.binder.referential.seine.ReasonForNullSetBinder; -import fr.ird.observe.services.topia.binder.referential.seine.SpeciesFateBinder; -import fr.ird.observe.services.topia.binder.referential.seine.SpeciesStatusBinder; -import fr.ird.observe.services.topia.binder.referential.seine.SurroundingActivityBinder; -import fr.ird.observe.services.topia.binder.referential.seine.TransmittingBuoyOperationBinder; -import fr.ird.observe.services.topia.binder.referential.seine.TransmittingBuoyTypeBinder; -import fr.ird.observe.services.topia.binder.referential.seine.VesselActivitySeineBinder; -import fr.ird.observe.services.topia.binder.referential.seine.WeightCategoryBinder; -import fr.ird.observe.services.topia.binder.referential.seine.WindBinder; +import fr.ird.observe.services.binder.data.longline.ActivityLonglineBinder; +import fr.ird.observe.services.binder.data.longline.ActivityLonglineEncouterDtoBinder; +import fr.ird.observe.services.binder.data.longline.ActivityLonglineSensorUsedDtoBinder; +import fr.ird.observe.services.binder.data.longline.ActivityLonglineStubDtoBinder; +import fr.ird.observe.services.binder.data.longline.BaitsCompositionBinder; +import fr.ird.observe.services.binder.data.longline.BasketBinder; +import fr.ird.observe.services.binder.data.longline.BranchlineBinder; +import fr.ird.observe.services.binder.data.longline.BranchlinesCompositionBinder; +import fr.ird.observe.services.binder.data.longline.CatchLonglineBinder; +import fr.ird.observe.services.binder.data.longline.EncounterBinder; +import fr.ird.observe.services.binder.data.longline.FloatlinesCompositionBinder; +import fr.ird.observe.services.binder.data.longline.GearUseFeaturesLonglineBinder; +import fr.ird.observe.services.binder.data.longline.GearUseFeaturesMeasurementLonglineBinder; +import fr.ird.observe.services.binder.data.longline.HooksCompositionBinder; +import fr.ird.observe.services.binder.data.longline.SectionBinder; +import fr.ird.observe.services.binder.data.longline.SensorUsedBinder; +import fr.ird.observe.services.binder.data.longline.SetLonglineBinder; +import fr.ird.observe.services.binder.data.longline.SetLonglineCatchDtoBinder; +import fr.ird.observe.services.binder.data.longline.SetLonglineDetailCompositionDtoBinder; +import fr.ird.observe.services.binder.data.longline.SetLonglineGlobalCompositionDtoBinder; +import fr.ird.observe.services.binder.data.longline.SetLonglineStubDtoBinder; +import fr.ird.observe.services.binder.data.longline.SetLonglineTdrDtoBinder; +import fr.ird.observe.services.binder.data.longline.SizeMeasureBinder; +import fr.ird.observe.services.binder.data.longline.TdrBinder; +import fr.ird.observe.services.binder.data.longline.TripLonglineActivityDtoBinder; +import fr.ird.observe.services.binder.data.longline.TripLonglineBinder; +import fr.ird.observe.services.binder.data.longline.TripLonglineGearUseDtoBinder; +import fr.ird.observe.services.binder.data.longline.WeightMeasureBinder; +import fr.ird.observe.services.binder.data.seine.ActivitySeineBinder; +import fr.ird.observe.services.binder.data.seine.ActivitySeineStubDtoBinder; +import fr.ird.observe.services.binder.data.seine.FloatingObjectBinder; +import fr.ird.observe.services.binder.data.seine.FloatingObjectObservedSpeciesDtoBinder; +import fr.ird.observe.services.binder.data.seine.FloatingObjectSchoolEstimateDtoBinder; +import fr.ird.observe.services.binder.data.seine.FloatingObjectTransmittingBuoyDtoBinder; +import fr.ird.observe.services.binder.data.seine.GearUseFeaturesMeasurementSeineBinder; +import fr.ird.observe.services.binder.data.seine.GearUseFeaturesSeineBinder; +import fr.ird.observe.services.binder.data.seine.NonTargetCatchBinder; +import fr.ird.observe.services.binder.data.seine.NonTargetLengthBinder; +import fr.ird.observe.services.binder.data.seine.NonTargetSampleBinder; +import fr.ird.observe.services.binder.data.seine.ObjectObservedSpeciesBinder; +import fr.ird.observe.services.binder.data.seine.ObjectSchoolEstimateBinder; +import fr.ird.observe.services.binder.data.seine.RouteBinder; +import fr.ird.observe.services.binder.data.seine.RouteStubDtoBinder; +import fr.ird.observe.services.binder.data.seine.SchoolEstimateBinder; +import fr.ird.observe.services.binder.data.seine.SetSeineBinder; +import fr.ird.observe.services.binder.data.seine.SetSeineNonTargetCatchDtoBinder; +import fr.ird.observe.services.binder.data.seine.SetSeineSchoolEstimateDtoBinder; +import fr.ird.observe.services.binder.data.seine.SetSeineTargetCatchDtoBinder; +import fr.ird.observe.services.binder.data.seine.TargetCatchBinder; +import fr.ird.observe.services.binder.data.seine.TargetLengthBinder; +import fr.ird.observe.services.binder.data.seine.TargetSampleBinder; +import fr.ird.observe.services.binder.data.seine.TransmittingBuoyBinder; +import fr.ird.observe.services.binder.data.seine.TripSeineBinder; +import fr.ird.observe.services.binder.data.seine.TripSeineGearUseDtoBinder; +import fr.ird.observe.services.binder.referential.common.CountryBinder; +import fr.ird.observe.services.binder.referential.common.FpaZoneBinder; +import fr.ird.observe.services.binder.referential.common.GearBinder; +import fr.ird.observe.services.binder.referential.common.GearCaracteristicBinder; +import fr.ird.observe.services.binder.referential.common.GearCaracteristicTypeBinder; +import fr.ird.observe.services.binder.referential.common.HarbourBinder; +import fr.ird.observe.services.binder.referential.common.LengthLengthParameterBinder; +import fr.ird.observe.services.binder.referential.common.LengthWeightParameterBinder; +import fr.ird.observe.services.binder.referential.common.OceanBinder; +import fr.ird.observe.services.binder.referential.common.OrganismBinder; +import fr.ird.observe.services.binder.referential.common.PersonBinder; +import fr.ird.observe.services.binder.referential.common.ProgramBinder; +import fr.ird.observe.services.binder.referential.common.SexBinder; +import fr.ird.observe.services.binder.referential.common.ShipOwnerBinder; +import fr.ird.observe.services.binder.referential.common.SizeMeasureTypeBinder; +import fr.ird.observe.services.binder.referential.common.SpeciesBinder; +import fr.ird.observe.services.binder.referential.common.SpeciesGroupBinder; +import fr.ird.observe.services.binder.referential.common.SpeciesListBinder; +import fr.ird.observe.services.binder.referential.common.VesselBinder; +import fr.ird.observe.services.binder.referential.common.VesselSizeCategoryBinder; +import fr.ird.observe.services.binder.referential.common.VesselTypeBinder; +import fr.ird.observe.services.binder.referential.common.WeightMeasureTypeBinder; +import fr.ird.observe.services.binder.referential.longline.BaitHaulingStatusBinder; +import fr.ird.observe.services.binder.referential.longline.BaitSettingStatusBinder; +import fr.ird.observe.services.binder.referential.longline.BaitTypeBinder; +import fr.ird.observe.services.binder.referential.longline.CatchFateLonglineBinder; +import fr.ird.observe.services.binder.referential.longline.EncounterTypeBinder; +import fr.ird.observe.services.binder.referential.longline.HealthnessBinder; +import fr.ird.observe.services.binder.referential.longline.HookPositionBinder; +import fr.ird.observe.services.binder.referential.longline.HookSizeBinder; +import fr.ird.observe.services.binder.referential.longline.HookTypeBinder; +import fr.ird.observe.services.binder.referential.longline.ItemHorizontalPositionBinder; +import fr.ird.observe.services.binder.referential.longline.ItemVerticalPositionBinder; +import fr.ird.observe.services.binder.referential.longline.LightsticksColorBinder; +import fr.ird.observe.services.binder.referential.longline.LightsticksTypeBinder; +import fr.ird.observe.services.binder.referential.longline.LineTypeBinder; +import fr.ird.observe.services.binder.referential.longline.MaturityStatusBinder; +import fr.ird.observe.services.binder.referential.longline.MitigationTypeBinder; +import fr.ird.observe.services.binder.referential.longline.SensorBrandBinder; +import fr.ird.observe.services.binder.referential.longline.SensorDataFormatBinder; +import fr.ird.observe.services.binder.referential.longline.SensorTypeBinder; +import fr.ird.observe.services.binder.referential.longline.SettingShapeBinder; +import fr.ird.observe.services.binder.referential.longline.StomacFullnessBinder; +import fr.ird.observe.services.binder.referential.longline.TripTypeBinder; +import fr.ird.observe.services.binder.referential.longline.VesselActivityLonglineBinder; +import fr.ird.observe.services.binder.referential.seine.DetectionModeBinder; +import fr.ird.observe.services.binder.referential.seine.ObjectFateBinder; +import fr.ird.observe.services.binder.referential.seine.ObjectOperationBinder; +import fr.ird.observe.services.binder.referential.seine.ObjectTypeBinder; +import fr.ird.observe.services.binder.referential.seine.ObservedSystemBinder; +import fr.ird.observe.services.binder.referential.seine.ReasonForDiscardBinder; +import fr.ird.observe.services.binder.referential.seine.ReasonForNoFishingBinder; +import fr.ird.observe.services.binder.referential.seine.ReasonForNullSetBinder; +import fr.ird.observe.services.binder.referential.seine.SpeciesFateBinder; +import fr.ird.observe.services.binder.referential.seine.SpeciesStatusBinder; +import fr.ird.observe.services.binder.referential.seine.SurroundingActivityBinder; +import fr.ird.observe.services.binder.referential.seine.TransmittingBuoyOperationBinder; +import fr.ird.observe.services.binder.referential.seine.TransmittingBuoyTypeBinder; +import fr.ird.observe.services.binder.referential.seine.VesselActivitySeineBinder; +import fr.ird.observe.services.binder.referential.seine.WeightCategoryBinder; +import fr.ird.observe.services.binder.referential.seine.WindBinder; import java.util.Map; diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java b/services-binder/src/main/java/fr/ird/observe/services/binder/BinderSupport.java similarity index 96% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/BinderSupport.java index 24c080f..7c20c88 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/BinderSupport.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder; +package fr.ird.observe.services.binder; /*- * #%L @@ -28,14 +28,14 @@ import fr.ird.observe.entities.referentiel.I18nReferenceEntities; import fr.ird.observe.entities.referentiel.I18nReferentialEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.persistence.ObserveEntityEnum; -import fr.ird.observe.services.dto.AbstractReference; +import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.I18nReferentialDto; import fr.ird.observe.services.dto.referential.I18nReferentialHelper; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; import org.apache.commons.collections4.CollectionUtils; import org.nuiton.topia.persistence.TopiaEntity; diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/ReferenceBinderEngineSupplierTopia.java b/services-binder/src/main/java/fr/ird/observe/services/binder/DefaultReferenceBinderEngineSupplier.java similarity index 77% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/ReferenceBinderEngineSupplierTopia.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/DefaultReferenceBinderEngineSupplier.java index 6f9faa1..6748b9a 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/ReferenceBinderEngineSupplierTopia.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/DefaultReferenceBinderEngineSupplier.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder; +package fr.ird.observe.services.binder; /*- * #%L @@ -22,15 +22,12 @@ package fr.ird.observe.services.topia.binder; * #L% */ -import fr.ird.observe.services.dto.reference.ReferenceBinderEngine; -import fr.ird.observe.services.dto.reference.ReferenceBinderEngineSupplier; - /** * Created on 28/11/15. * * @author Tony Chemit - dev@tchemit.fr */ -public class ReferenceBinderEngineSupplierTopia extends ReferenceBinderEngineSupplier { +public class DefaultReferenceBinderEngineSupplier extends ReferenceBinderEngineSupplier { @Override public ReferenceBinderEngine get() { diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/DataBinderSupport.java similarity index 96% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/DataBinderSupport.java index ba2bfe7..f0e11df 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/DataBinderSupport.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data; +package fr.ird.observe.services.binder.data; /*- * #%L @@ -29,12 +29,12 @@ import fr.ird.observe.entities.CommentableEntity; import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.services.dto.CommentableDto; import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.reference.DataReferenceSetDefinitions; +import fr.ird.observe.services.ObserveDataReferenceSets; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; -import fr.ird.observe.services.topia.binder.BinderEngine; -import fr.ird.observe.services.topia.binder.BinderSupport; +import fr.ird.observe.services.binder.BinderEngine; +import fr.ird.observe.services.binder.BinderSupport; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -66,7 +66,7 @@ public abstract class DataBinderSupport<E extends ObserveDataEntity, D extends D protected DataBinderSupport(Class<E> entityType, Class<D> dtoType) { super(entityType, dtoType); - this.definition = DataReferenceSetDefinitions.getDefinition(dtoType); + this.definition = ObserveDataReferenceSets.getDefinition(dtoType); } // -------------------------------------------------------------------------------------------------------------- // diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/ActivityLonglineBinder.java similarity index 95% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/ActivityLonglineBinder.java index 6e83d44..78d9a8b 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/ActivityLonglineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -25,13 +25,13 @@ package fr.ird.observe.services.topia.binder.data.longline; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.referentiel.FpaZone; import fr.ird.observe.entities.referentiel.longline.VesselActivityLongline; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.referential.FpaZoneDto; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineEncouterDtoBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/ActivityLonglineEncouterDtoBinder.java similarity index 92% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineEncouterDtoBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/ActivityLonglineEncouterDtoBinder.java index 92eeff0..b705b6e 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineEncouterDtoBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/ActivityLonglineEncouterDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -24,11 +24,10 @@ package fr.ird.observe.services.topia.binder.data.longline; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.longline.Encounter; -import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto; import fr.ird.observe.services.dto.longline.EncounterDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineSensorUsedDtoBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/ActivityLonglineSensorUsedDtoBinder.java similarity index 92% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineSensorUsedDtoBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/ActivityLonglineSensorUsedDtoBinder.java index b849fe0..bc2f9f7 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineSensorUsedDtoBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/ActivityLonglineSensorUsedDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -24,11 +24,10 @@ package fr.ird.observe.services.topia.binder.data.longline; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.longline.SensorUsed; -import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; import fr.ird.observe.services.dto.longline.SensorUsedDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineStubDtoBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/ActivityLonglineStubDtoBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineStubDtoBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/ActivityLonglineStubDtoBinder.java index 1deb330..2b217c5 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/ActivityLonglineStubDtoBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/ActivityLonglineStubDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -23,10 +23,9 @@ package fr.ird.observe.services.topia.binder.data.longline; */ import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.ActivityLonglineStubDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BaitsCompositionBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/BaitsCompositionBinder.java similarity index 92% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BaitsCompositionBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/BaitsCompositionBinder.java index b70c0d6..c922cd3 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BaitsCompositionBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/BaitsCompositionBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -23,16 +23,14 @@ package fr.ird.observe.services.topia.binder.data.longline; */ import fr.ird.observe.entities.longline.BaitsComposition; -import fr.ird.observe.entities.longline.BaitsComposition; import fr.ird.observe.entities.referentiel.longline.BaitSettingStatus; import fr.ird.observe.entities.referentiel.longline.BaitType; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.BaitsCompositionDto; -import fr.ird.observe.services.dto.longline.BaitsCompositionDto; import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BasketBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/BasketBinder.java similarity index 94% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BasketBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/BasketBinder.java index 97e2eaf..5c3a2ad 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BasketBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/BasketBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -24,11 +24,11 @@ package fr.ird.observe.services.topia.binder.data.longline; import fr.ird.observe.entities.longline.Basket; import fr.ird.observe.entities.longline.Branchline; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BranchlineBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/BranchlineBinder.java similarity index 97% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BranchlineBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/BranchlineBinder.java index bd17494..a833e0d 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BranchlineBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/BranchlineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -29,7 +29,7 @@ import fr.ird.observe.entities.referentiel.longline.BaitType; import fr.ird.observe.entities.referentiel.longline.HookSize; import fr.ird.observe.entities.referentiel.longline.HookType; import fr.ird.observe.entities.referentiel.longline.LineType; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto; @@ -38,7 +38,7 @@ import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; import fr.ird.observe.services.dto.referential.longline.HookSizeDto; import fr.ird.observe.services.dto.referential.longline.HookTypeDto; import fr.ird.observe.services.dto.referential.longline.LineTypeDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BranchlinesCompositionBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/BranchlinesCompositionBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BranchlinesCompositionBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/BranchlinesCompositionBinder.java index d62b917..b017be9 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/BranchlinesCompositionBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/BranchlinesCompositionBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -23,14 +23,12 @@ package fr.ird.observe.services.topia.binder.data.longline; */ import fr.ird.observe.entities.longline.BranchlinesComposition; -import fr.ird.observe.entities.longline.BranchlinesComposition; import fr.ird.observe.entities.referentiel.longline.LineType; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.BranchlinesCompositionDto; -import fr.ird.observe.services.dto.longline.BranchlinesCompositionDto; import fr.ird.observe.services.dto.referential.longline.LineTypeDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/CatchLonglineBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/CatchLonglineBinder.java similarity index 97% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/CatchLonglineBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/CatchLonglineBinder.java index 499e877..b6115da 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/CatchLonglineBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/CatchLonglineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -35,7 +35,7 @@ import fr.ird.observe.entities.referentiel.longline.Healthness; import fr.ird.observe.entities.referentiel.longline.HookPosition; import fr.ird.observe.entities.referentiel.longline.MaturityStatus; import fr.ird.observe.entities.referentiel.longline.StomacFullness; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; @@ -50,7 +50,7 @@ import fr.ird.observe.services.dto.referential.longline.HealthnessDto; import fr.ird.observe.services.dto.referential.longline.HookPositionDto; import fr.ird.observe.services.dto.referential.longline.MaturityStatusDto; import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/EncounterBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/EncounterBinder.java similarity index 94% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/EncounterBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/EncounterBinder.java index 6a62027..5a44c2c 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/EncounterBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/EncounterBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -25,12 +25,12 @@ package fr.ird.observe.services.topia.binder.data.longline; import fr.ird.observe.entities.longline.Encounter; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.longline.EncounterType; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.EncounterDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/FloatlinesCompositionBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/FloatlinesCompositionBinder.java similarity index 94% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/FloatlinesCompositionBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/FloatlinesCompositionBinder.java index fa34242..8b006ae 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/FloatlinesCompositionBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/FloatlinesCompositionBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -24,11 +24,11 @@ package fr.ird.observe.services.topia.binder.data.longline; import fr.ird.observe.entities.longline.FloatlinesComposition; import fr.ird.observe.entities.referentiel.longline.LineType; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.FloatlinesCompositionDto; import fr.ird.observe.services.dto.referential.longline.LineTypeDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/GearUseFeaturesLonglineBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/GearUseFeaturesLonglineBinder.java similarity index 93% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/GearUseFeaturesLonglineBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/GearUseFeaturesLonglineBinder.java index 18c26b4..aa58053 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/GearUseFeaturesLonglineBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/GearUseFeaturesLonglineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -25,12 +25,11 @@ package fr.ird.observe.services.topia.binder.data.longline; import fr.ird.observe.entities.longline.GearUseFeaturesLongline; import fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLongline; import fr.ird.observe.entities.referentiel.Gear; -import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; import fr.ird.observe.services.dto.referential.GearDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/GearUseFeaturesMeasurementLonglineBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/GearUseFeaturesMeasurementLonglineBinder.java similarity index 92% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/GearUseFeaturesMeasurementLonglineBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/GearUseFeaturesMeasurementLonglineBinder.java index 765d878..759f7f0 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/GearUseFeaturesMeasurementLonglineBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/GearUseFeaturesMeasurementLonglineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -24,11 +24,10 @@ package fr.ird.observe.services.topia.binder.data.longline; import fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLongline; import fr.ird.observe.entities.referentiel.GearCaracteristic; -import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/HooksCompositionBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/HooksCompositionBinder.java similarity index 95% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/HooksCompositionBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/HooksCompositionBinder.java index ab83c94..f5cac22 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/HooksCompositionBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/HooksCompositionBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -25,12 +25,12 @@ package fr.ird.observe.services.topia.binder.data.longline; import fr.ird.observe.entities.longline.HooksComposition; import fr.ird.observe.entities.referentiel.longline.HookSize; import fr.ird.observe.entities.referentiel.longline.HookType; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.HooksCompositionDto; import fr.ird.observe.services.dto.referential.longline.HookSizeDto; import fr.ird.observe.services.dto.referential.longline.HookTypeDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SectionBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/SectionBinder.java similarity index 93% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SectionBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/SectionBinder.java index 0e967d8..a1c07e1 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SectionBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/SectionBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -24,11 +24,11 @@ package fr.ird.observe.services.topia.binder.data.longline; import fr.ird.observe.entities.longline.Basket; import fr.ird.observe.entities.longline.Section; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.SectionDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SensorUsedBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/SensorUsedBinder.java similarity index 95% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SensorUsedBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/SensorUsedBinder.java index 3e92137..5efcb0d 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SensorUsedBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/SensorUsedBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -26,13 +26,13 @@ import fr.ird.observe.entities.longline.SensorUsed; import fr.ird.observe.entities.referentiel.longline.SensorBrand; import fr.ird.observe.entities.referentiel.longline.SensorDataFormat; import fr.ird.observe.entities.referentiel.longline.SensorType; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.SensorUsedDto; import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/SetLonglineBinder.java similarity index 97% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/SetLonglineBinder.java index d347545..c62fd21 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/SetLonglineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -27,14 +27,14 @@ import fr.ird.observe.entities.referentiel.longline.LightsticksColor; import fr.ird.observe.entities.referentiel.longline.LightsticksType; import fr.ird.observe.entities.referentiel.longline.LineType; import fr.ird.observe.entities.referentiel.longline.SettingShape; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.referential.longline.LightsticksColorDto; import fr.ird.observe.services.dto.referential.longline.LightsticksTypeDto; import fr.ird.observe.services.dto.referential.longline.LineTypeDto; import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineCatchDtoBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/SetLonglineCatchDtoBinder.java similarity index 89% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineCatchDtoBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/SetLonglineCatchDtoBinder.java index f2bcd00..8847b98 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineCatchDtoBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/SetLonglineCatchDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -24,12 +24,10 @@ package fr.ird.observe.services.topia.binder.data.longline; import fr.ird.observe.entities.longline.CatchLongline; import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; -import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineDetailCompositionDtoBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/SetLonglineDetailCompositionDtoBinder.java similarity index 94% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineDetailCompositionDtoBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/SetLonglineDetailCompositionDtoBinder.java index f828a8f..c23f606 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineDetailCompositionDtoBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/SetLonglineDetailCompositionDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -24,11 +24,10 @@ package fr.ird.observe.services.topia.binder.data.longline; import fr.ird.observe.entities.longline.Section; import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineGlobalCompositionDtoBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/SetLonglineGlobalCompositionDtoBinder.java similarity index 95% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineGlobalCompositionDtoBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/SetLonglineGlobalCompositionDtoBinder.java index 6a30464..85c3d09 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineGlobalCompositionDtoBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/SetLonglineGlobalCompositionDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -28,7 +28,6 @@ import fr.ird.observe.entities.longline.FloatlinesComposition; import fr.ird.observe.entities.longline.HooksComposition; import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.entities.referentiel.longline.MitigationType; -import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.BaitsCompositionDto; import fr.ird.observe.services.dto.longline.BranchlinesCompositionDto; @@ -36,7 +35,7 @@ import fr.ird.observe.services.dto.longline.FloatlinesCompositionDto; import fr.ird.observe.services.dto.longline.HooksCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.services.dto.referential.longline.MitigationTypeDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineStubDtoBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/SetLonglineStubDtoBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineStubDtoBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/SetLonglineStubDtoBinder.java index 89f2716..77cfb68 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineStubDtoBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/SetLonglineStubDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -23,11 +23,10 @@ package fr.ird.observe.services.topia.binder.data.longline; */ import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineStubDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineTdrDtoBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/SetLonglineTdrDtoBinder.java similarity index 92% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineTdrDtoBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/SetLonglineTdrDtoBinder.java index 274afcb..5261cdf 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SetLonglineTdrDtoBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/SetLonglineTdrDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -24,11 +24,10 @@ package fr.ird.observe.services.topia.binder.data.longline; import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.entities.longline.Tdr; -import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; import fr.ird.observe.services.dto.longline.TdrDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SizeMeasureBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/SizeMeasureBinder.java similarity index 93% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SizeMeasureBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/SizeMeasureBinder.java index 10d79f2..3d9dd5c 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/SizeMeasureBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/SizeMeasureBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -24,11 +24,11 @@ package fr.ird.observe.services.topia.binder.data.longline; import fr.ird.observe.entities.longline.SizeMeasure; import fr.ird.observe.entities.referentiel.SizeMeasureType; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.SizeMeasureDto; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TdrBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/TdrBinder.java similarity index 97% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TdrBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/TdrBinder.java index 1520927..59a59d7 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TdrBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/TdrBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -30,7 +30,7 @@ import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.longline.ItemHorizontalPosition; import fr.ird.observe.entities.referentiel.longline.ItemVerticalPosition; import fr.ird.observe.entities.referentiel.longline.SensorBrand; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; @@ -40,7 +40,7 @@ import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.longline.ItemHorizontalPositionDto; import fr.ird.observe.services.dto.referential.longline.ItemVerticalPositionDto; import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineActivityDtoBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/TripLonglineActivityDtoBinder.java similarity index 90% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineActivityDtoBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/TripLonglineActivityDtoBinder.java index b42c095..319d8e8 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineActivityDtoBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/TripLonglineActivityDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -23,10 +23,9 @@ package fr.ird.observe.services.topia.binder.data.longline; */ import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.TripLonglineActivityDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/TripLonglineBinder.java similarity index 97% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/TripLonglineBinder.java index 06a913a..0c13bdc 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/TripLonglineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -30,7 +30,7 @@ import fr.ird.observe.entities.referentiel.Person; import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.entities.referentiel.Vessel; import fr.ird.observe.entities.referentiel.longline.TripType; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.TripLonglineActivityDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; @@ -41,7 +41,7 @@ import fr.ird.observe.services.dto.referential.PersonHelper; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.referential.longline.TripTypeDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineGearUseDtoBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/TripLonglineGearUseDtoBinder.java similarity index 92% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineGearUseDtoBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/TripLonglineGearUseDtoBinder.java index 616143a..f4ed61c 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/TripLonglineGearUseDtoBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/TripLonglineGearUseDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -24,11 +24,10 @@ package fr.ird.observe.services.topia.binder.data.longline; import fr.ird.observe.entities.longline.GearUseFeaturesLongline; import fr.ird.observe.entities.longline.TripLongline; -import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineGearUseDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/WeightMeasureBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/WeightMeasureBinder.java similarity index 93% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/WeightMeasureBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/WeightMeasureBinder.java index 1a3a284..828f544 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/longline/WeightMeasureBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/longline/WeightMeasureBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.longline; +package fr.ird.observe.services.binder.data.longline; /*- * #%L @@ -24,11 +24,11 @@ package fr.ird.observe.services.topia.binder.data.longline; import fr.ird.observe.entities.longline.WeightMeasure; import fr.ird.observe.entities.referentiel.WeightMeasureType; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.WeightMeasureDto; import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ActivitySeineBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/ActivitySeineBinder.java similarity index 97% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ActivitySeineBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/ActivitySeineBinder.java index 0d393ce..0ea1dda 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ActivitySeineBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/ActivitySeineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.seine; +package fr.ird.observe.services.binder.data.seine; /*- * #%L @@ -30,7 +30,7 @@ import fr.ird.observe.entities.referentiel.seine.SurroundingActivity; import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; import fr.ird.observe.entities.referentiel.seine.Wind; import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.FpaZoneDto; import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; @@ -41,7 +41,7 @@ import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.referential.seine.WindDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.SetSeineDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ActivitySeineStubDtoBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/ActivitySeineStubDtoBinder.java similarity index 94% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ActivitySeineStubDtoBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/ActivitySeineStubDtoBinder.java index b3e1ef5..15c53c1 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ActivitySeineStubDtoBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/ActivitySeineStubDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.seine; +package fr.ird.observe.services.binder.data.seine; /*- * #%L @@ -26,7 +26,7 @@ import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.ActivitySeineImpl; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectBinder.java similarity index 94% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectBinder.java index 559e66a..f2c3851 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.seine; +package fr.ird.observe.services.binder.data.seine; /*- * #%L @@ -26,13 +26,13 @@ import fr.ird.observe.entities.referentiel.seine.ObjectFate; import fr.ird.observe.entities.referentiel.seine.ObjectOperation; import fr.ird.observe.entities.referentiel.seine.ObjectType; import fr.ird.observe.entities.seine.FloatingObject; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; import fr.ird.observe.services.dto.referential.seine.ObjectTypeDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectObservedSpeciesDtoBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectObservedSpeciesDtoBinder.java similarity index 92% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectObservedSpeciesDtoBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectObservedSpeciesDtoBinder.java index 2304703..e37de21 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectObservedSpeciesDtoBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectObservedSpeciesDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.seine; +package fr.ird.observe.services.binder.data.seine; /*- * #%L @@ -24,11 +24,10 @@ package fr.ird.observe.services.topia.binder.data.seine; import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.entities.seine.ObjectObservedSpecies; -import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectSchoolEstimateDtoBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectSchoolEstimateDtoBinder.java similarity index 92% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectSchoolEstimateDtoBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectSchoolEstimateDtoBinder.java index d797053..8cb3313 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectSchoolEstimateDtoBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectSchoolEstimateDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.seine; +package fr.ird.observe.services.binder.data.seine; /*- * #%L @@ -24,11 +24,10 @@ package fr.ird.observe.services.topia.binder.data.seine; import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.entities.seine.ObjectSchoolEstimate; -import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectTransmittingBuoyDtoBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectTransmittingBuoyDtoBinder.java similarity index 92% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectTransmittingBuoyDtoBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectTransmittingBuoyDtoBinder.java index a993c41..d44999d 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/FloatingObjectTransmittingBuoyDtoBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/FloatingObjectTransmittingBuoyDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.seine; +package fr.ird.observe.services.binder.data.seine; /*- * #%L @@ -24,11 +24,10 @@ package fr.ird.observe.services.topia.binder.data.seine; import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.entities.seine.TransmittingBuoy; -import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/GearUseFeaturesMeasurementSeineBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/GearUseFeaturesMeasurementSeineBinder.java similarity index 92% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/GearUseFeaturesMeasurementSeineBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/GearUseFeaturesMeasurementSeineBinder.java index 50cc99c..1124d8d 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/GearUseFeaturesMeasurementSeineBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/GearUseFeaturesMeasurementSeineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.seine; +package fr.ird.observe.services.binder.data.seine; /*- * #%L @@ -24,11 +24,10 @@ package fr.ird.observe.services.topia.binder.data.seine; import fr.ird.observe.entities.referentiel.GearCaracteristic; import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; -import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/GearUseFeaturesSeineBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/GearUseFeaturesSeineBinder.java similarity index 93% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/GearUseFeaturesSeineBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/GearUseFeaturesSeineBinder.java index 7a5e09f..92386b4 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/GearUseFeaturesSeineBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/GearUseFeaturesSeineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.seine; +package fr.ird.observe.services.binder.data.seine; /*- * #%L @@ -25,12 +25,11 @@ package fr.ird.observe.services.topia.binder.data.seine; import fr.ird.observe.entities.referentiel.Gear; import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; import fr.ird.observe.entities.seine.GearUseFeaturesSeine; -import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetCatchBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/NonTargetCatchBinder.java similarity index 96% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetCatchBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/NonTargetCatchBinder.java index 3a4f600..49b047a 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetCatchBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/NonTargetCatchBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.seine; +package fr.ird.observe.services.binder.data.seine; /*- * #%L @@ -26,13 +26,13 @@ import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.seine.ReasonForDiscard; import fr.ird.observe.entities.referentiel.seine.SpeciesFate; import fr.ird.observe.entities.seine.NonTargetCatch; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; import fr.ird.observe.services.dto.seine.NonTargetCatchDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetLengthBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/NonTargetLengthBinder.java similarity index 96% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetLengthBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/NonTargetLengthBinder.java index 0674b42..627283b 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetLengthBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/NonTargetLengthBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.seine; +package fr.ird.observe.services.binder.data.seine; /*- * #%L @@ -27,14 +27,14 @@ import fr.ird.observe.entities.referentiel.SizeMeasureType; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.seine.SpeciesFate; import fr.ird.observe.entities.seine.NonTargetLength; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; import fr.ird.observe.services.dto.seine.NonTargetLengthDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetSampleBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/NonTargetSampleBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetSampleBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/NonTargetSampleBinder.java index a0a360c..c5b7bcc 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetSampleBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/NonTargetSampleBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.seine; +package fr.ird.observe.services.binder.data.seine; /*- * #%L @@ -24,11 +24,10 @@ package fr.ird.observe.services.topia.binder.data.seine; import fr.ird.observe.entities.seine.NonTargetLength; import fr.ird.observe.entities.seine.NonTargetSample; -import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.NonTargetLengthDto; import fr.ird.observe.services.dto.seine.NonTargetSampleDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectObservedSpeciesBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/ObjectObservedSpeciesBinder.java similarity index 94% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectObservedSpeciesBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/ObjectObservedSpeciesBinder.java index ec98039..f762c65 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectObservedSpeciesBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/ObjectObservedSpeciesBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.seine; +package fr.ird.observe.services.binder.data.seine; /*- * #%L @@ -25,12 +25,12 @@ package fr.ird.observe.services.topia.binder.data.seine; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.seine.SpeciesStatus; import fr.ird.observe.entities.seine.ObjectObservedSpecies; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto; import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectSchoolEstimateBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/ObjectSchoolEstimateBinder.java similarity index 93% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectSchoolEstimateBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/ObjectSchoolEstimateBinder.java index 5cc964c..31405da 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/ObjectSchoolEstimateBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/ObjectSchoolEstimateBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.seine; +package fr.ird.observe.services.binder.data.seine; /*- * #%L @@ -24,11 +24,11 @@ package fr.ird.observe.services.topia.binder.data.seine; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.seine.ObjectSchoolEstimate; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/RouteBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/RouteBinder.java similarity index 93% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/RouteBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/RouteBinder.java index 8603a06..b44df6f 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/RouteBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/RouteBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.seine; +package fr.ird.observe.services.binder.data.seine; /*- * #%L @@ -23,11 +23,11 @@ package fr.ird.observe.services.topia.binder.data.seine; */ import fr.ird.observe.entities.seine.Route; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.dto.seine.RouteDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/RouteStubDtoBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/RouteStubDtoBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/RouteStubDtoBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/RouteStubDtoBinder.java index dd45efa..5adc5c9 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/RouteStubDtoBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/RouteStubDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.seine; +package fr.ird.observe.services.binder.data.seine; /*- * #%L @@ -23,10 +23,9 @@ package fr.ird.observe.services.topia.binder.data.seine; */ import fr.ird.observe.entities.seine.Route; -import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.RouteStubDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SchoolEstimateBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/SchoolEstimateBinder.java similarity index 94% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SchoolEstimateBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/SchoolEstimateBinder.java index b295187..cb1cf75 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SchoolEstimateBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/SchoolEstimateBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.seine; +package fr.ird.observe.services.binder.data.seine; /*- * #%L @@ -24,11 +24,11 @@ package fr.ird.observe.services.topia.binder.data.seine; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.seine.SchoolEstimate; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.seine.SchoolEstimateDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/SetSeineBinder.java similarity index 96% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/SetSeineBinder.java index 844f740..d5a8fe4 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/SetSeineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.seine; +package fr.ird.observe.services.binder.data.seine; /*- * #%L @@ -24,11 +24,11 @@ package fr.ird.observe.services.topia.binder.data.seine; import fr.ird.observe.entities.referentiel.seine.ReasonForNullSet; import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.seine.ReasonForNullSetDto; import fr.ird.observe.services.dto.seine.SetSeineDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineNonTargetCatchDtoBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/SetSeineNonTargetCatchDtoBinder.java similarity index 94% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineNonTargetCatchDtoBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/SetSeineNonTargetCatchDtoBinder.java index e9f210d..7b1ad41 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineNonTargetCatchDtoBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/SetSeineNonTargetCatchDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.seine; +package fr.ird.observe.services.binder.data.seine; /*- * #%L @@ -27,7 +27,7 @@ import fr.ird.observe.entities.seine.SetSeine; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.NonTargetCatchDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineSchoolEstimateDtoBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/SetSeineSchoolEstimateDtoBinder.java similarity index 89% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineSchoolEstimateDtoBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/SetSeineSchoolEstimateDtoBinder.java index 43d827c..46daf96 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineSchoolEstimateDtoBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/SetSeineSchoolEstimateDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.seine; +package fr.ird.observe.services.binder.data.seine; /*- * #%L @@ -24,12 +24,10 @@ package fr.ird.observe.services.topia.binder.data.seine; import fr.ird.observe.entities.seine.SchoolEstimate; import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.SchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; -import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineTargetCatchDtoBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/SetSeineTargetCatchDtoBinder.java similarity index 95% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineTargetCatchDtoBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/SetSeineTargetCatchDtoBinder.java index a13a8f1..e04ac12 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineTargetCatchDtoBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/SetSeineTargetCatchDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.seine; +package fr.ird.observe.services.binder.data.seine; /*- * #%L @@ -27,7 +27,7 @@ import fr.ird.observe.entities.seine.TargetCatch; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; import fr.ird.observe.services.dto.seine.TargetCatchDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetCatchBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/TargetCatchBinder.java similarity index 94% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetCatchBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/TargetCatchBinder.java index b504b07..8b1b42b 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetCatchBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/TargetCatchBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.seine; +package fr.ird.observe.services.binder.data.seine; /*- * #%L @@ -26,15 +26,13 @@ import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.seine.ReasonForDiscard; import fr.ird.observe.entities.referentiel.seine.WeightCategory; import fr.ird.observe.entities.seine.TargetCatch; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.seine.TargetCatchDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; - -import java.io.Serializable; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetLengthBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/TargetLengthBinder.java similarity index 95% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetLengthBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/TargetLengthBinder.java index 319bac6..6259862 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetLengthBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/TargetLengthBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.seine; +package fr.ird.observe.services.binder.data.seine; /*- * #%L @@ -26,13 +26,13 @@ import fr.ird.observe.entities.referentiel.Sex; import fr.ird.observe.entities.referentiel.SizeMeasureType; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.seine.TargetLength; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.seine.TargetLengthDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetSampleBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/TargetSampleBinder.java similarity index 92% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetSampleBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/TargetSampleBinder.java index bfd28bed..2dd4dda 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TargetSampleBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/TargetSampleBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.seine; +package fr.ird.observe.services.binder.data.seine; /*- * #%L @@ -24,11 +24,10 @@ package fr.ird.observe.services.topia.binder.data.seine; import fr.ird.observe.entities.seine.TargetLength; import fr.ird.observe.entities.seine.TargetSample; -import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.TargetLengthDto; import fr.ird.observe.services.dto.seine.TargetSampleDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TransmittingBuoyBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/TransmittingBuoyBinder.java similarity index 95% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TransmittingBuoyBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/TransmittingBuoyBinder.java index 162dfbb..a440473 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TransmittingBuoyBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/TransmittingBuoyBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.seine; +package fr.ird.observe.services.binder.data.seine; /*- * #%L @@ -26,13 +26,13 @@ import fr.ird.observe.entities.referentiel.Country; import fr.ird.observe.entities.referentiel.seine.TransmittingBuoyOperation; import fr.ird.observe.entities.referentiel.seine.TransmittingBuoyType; import fr.ird.observe.entities.seine.TransmittingBuoy; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto; import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TripSeineBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/TripSeineBinder.java similarity index 96% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TripSeineBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/TripSeineBinder.java index fbd6a60..5d28f51 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TripSeineBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/TripSeineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.seine; +package fr.ird.observe.services.binder.data.seine; /*- * #%L @@ -29,7 +29,7 @@ import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.entities.referentiel.Vessel; import fr.ird.observe.entities.seine.Route; import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.HarbourDto; import fr.ird.observe.services.dto.referential.OceanDto; @@ -39,7 +39,7 @@ import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.seine.RouteStubDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TripSeineGearUseDtoBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/TripSeineGearUseDtoBinder.java similarity index 94% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TripSeineGearUseDtoBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/TripSeineGearUseDtoBinder.java index 259a02d..3135f07 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TripSeineGearUseDtoBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/data/seine/TripSeineGearUseDtoBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.data.seine; +package fr.ird.observe.services.binder.data.seine; /*- * #%L @@ -27,7 +27,7 @@ import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ReferentialBinderSupport.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java similarity index 95% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ReferentialBinderSupport.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java index 1a972fc..f41a538 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ReferentialBinderSupport.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential; +package fr.ird.observe.services.binder.referential; /*- * #%L @@ -26,11 +26,11 @@ import fr.ird.observe.entities.referentiel.I18nReferentialEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; -import fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions; +import fr.ird.observe.services.ObserveReferentialReferenceSets; import fr.ird.observe.services.dto.referential.I18nReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.topia.binder.BinderSupport; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.binder.BinderSupport; import java.io.Serializable; @@ -45,7 +45,7 @@ public abstract class ReferentialBinderSupport<E extends ObserveReferentialEntit protected ReferentialBinderSupport(Class<E> entityType, Class<D> dtoType) { super(entityType, dtoType); - this.definition = ReferentialReferenceSetDefinitions.getDefinition(this.dtoType); + this.definition = ObserveReferentialReferenceSets.getDefinition(this.dtoType); } // -------------------------------------------------------------------------------------------------------------- // diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/CountryBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/CountryBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/CountryBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/CountryBinder.java index 306816b..ee8b283 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/CountryBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/CountryBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.common; +package fr.ird.observe.services.binder.referential.common; /*- * #%L @@ -25,8 +25,8 @@ package fr.ird.observe.services.topia.binder.referential.common; import fr.ird.observe.entities.referentiel.Country; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.CountryDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/FpaZoneBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/FpaZoneBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/FpaZoneBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/FpaZoneBinder.java index d98a1ff..8db9c1d 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/FpaZoneBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/FpaZoneBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.common; +package fr.ird.observe.services.binder.referential.common; /*- * #%L @@ -25,8 +25,8 @@ package fr.ird.observe.services.topia.binder.referential.common; import fr.ird.observe.entities.referentiel.FpaZone; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.FpaZoneDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/GearBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/GearBinder.java similarity index 92% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/GearBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/GearBinder.java index 4b167cd..cb1a0f8 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/GearBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/GearBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.common; +package fr.ird.observe.services.binder.referential.common; /*- * #%L @@ -27,8 +27,8 @@ import fr.ird.observe.entities.referentiel.GearCaracteristic; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/GearCaracteristicBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/GearCaracteristicBinder.java similarity index 93% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/GearCaracteristicBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/GearCaracteristicBinder.java index f7fbc2a..bfdf7de 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/GearCaracteristicBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/GearCaracteristicBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.common; +package fr.ird.observe.services.binder.referential.common; /*- * #%L @@ -27,8 +27,8 @@ import fr.ird.observe.entities.referentiel.GearCaracteristicType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/GearCaracteristicTypeBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/GearCaracteristicTypeBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/GearCaracteristicTypeBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/GearCaracteristicTypeBinder.java index bbcb9f8..3bb114a 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/GearCaracteristicTypeBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/GearCaracteristicTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.common; +package fr.ird.observe.services.binder.referential.common; /*- * #%L @@ -25,8 +25,8 @@ package fr.ird.observe.services.topia.binder.referential.common; import fr.ird.observe.entities.referentiel.GearCaracteristicType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/HarbourBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/HarbourBinder.java similarity index 92% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/HarbourBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/HarbourBinder.java index c3f4d9a..ca9e712 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/HarbourBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/HarbourBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.common; +package fr.ird.observe.services.binder.referential.common; /*- * #%L @@ -27,8 +27,8 @@ import fr.ird.observe.entities.referentiel.Harbour; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.HarbourDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/LengthLengthParameterBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/LengthLengthParameterBinder.java similarity index 94% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/LengthLengthParameterBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/LengthLengthParameterBinder.java index 19487e7..1f14232 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/LengthLengthParameterBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/LengthLengthParameterBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.common; +package fr.ird.observe.services.binder.referential.common; /*- * #%L @@ -26,9 +26,9 @@ import fr.ird.observe.entities.referentiel.LengthLengthParameter; import fr.ird.observe.entities.referentiel.SizeMeasureType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.LengthLengthParameterDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/LengthWeightParameterBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/LengthWeightParameterBinder.java similarity index 95% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/LengthWeightParameterBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/LengthWeightParameterBinder.java index 5fd3488..a6e857b 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/LengthWeightParameterBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/LengthWeightParameterBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.common; +package fr.ird.observe.services.binder.referential.common; /*- * #%L @@ -29,10 +29,10 @@ import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; import fr.ird.observe.services.dto.referential.OceanDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SpeciesDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/OceanBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/OceanBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/OceanBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/OceanBinder.java index 2ea7a86..3a6ed26 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/OceanBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/OceanBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.common; +package fr.ird.observe.services.binder.referential.common; /*- * #%L @@ -25,8 +25,8 @@ package fr.ird.observe.services.topia.binder.referential.common; import fr.ird.observe.entities.referentiel.Ocean; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.OceanDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/OrganismBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/OrganismBinder.java similarity index 92% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/OrganismBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/OrganismBinder.java index 7b939ea..adfcc42 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/OrganismBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/OrganismBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.common; +package fr.ird.observe.services.binder.referential.common; /*- * #%L @@ -27,8 +27,8 @@ import fr.ird.observe.entities.referentiel.Organism; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.OrganismDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/PersonBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/PersonBinder.java similarity index 94% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/PersonBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/PersonBinder.java index 47ba913..2fc290a 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/PersonBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/PersonBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.common; +package fr.ird.observe.services.binder.referential.common; /*- * #%L @@ -27,8 +27,8 @@ import fr.ird.observe.entities.referentiel.Person; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.PersonDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/ProgramBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/ProgramBinder.java similarity index 95% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/ProgramBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/ProgramBinder.java index 1e4b7fb..768786d 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/ProgramBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/ProgramBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.common; +package fr.ird.observe.services.binder.referential.common; /*- * #%L @@ -27,8 +27,8 @@ import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.OrganismDto; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SexBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/SexBinder.java similarity index 90% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SexBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/SexBinder.java index 3cdeff9..7e8309a 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SexBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/SexBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.common; +package fr.ird.observe.services.binder.referential.common; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.common; import fr.ird.observe.entities.referentiel.Sex; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SexDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/ShipOwnerBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/ShipOwnerBinder.java similarity index 92% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/ShipOwnerBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/ShipOwnerBinder.java index 5c6364d..1779f5d 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/ShipOwnerBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/ShipOwnerBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.common; +package fr.ird.observe.services.binder.referential.common; /*- * #%L @@ -26,9 +26,9 @@ import fr.ird.observe.entities.referentiel.Country; import fr.ird.observe.entities.referentiel.ShipOwner; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.CountryDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.ShipOwnerDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 02/11/16. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SizeMeasureTypeBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/SizeMeasureTypeBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SizeMeasureTypeBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/SizeMeasureTypeBinder.java index 7b06cd6..cf22772 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SizeMeasureTypeBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/SizeMeasureTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.common; +package fr.ird.observe.services.binder.referential.common; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.common; import fr.ird.observe.entities.referentiel.SizeMeasureType; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SpeciesBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/SpeciesBinder.java similarity index 95% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SpeciesBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/SpeciesBinder.java index 322b022..36e302e 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SpeciesBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/SpeciesBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.common; +package fr.ird.observe.services.binder.referential.common; /*- * #%L @@ -28,11 +28,11 @@ import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.SpeciesGroup; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.OceanDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesGroupDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SpeciesGroupBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/SpeciesGroupBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SpeciesGroupBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/SpeciesGroupBinder.java index a733740..bbb8aed 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SpeciesGroupBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/SpeciesGroupBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.common; +package fr.ird.observe.services.binder.referential.common; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.common; import fr.ird.observe.entities.referentiel.SpeciesGroup; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesGroupDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SpeciesListBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/SpeciesListBinder.java similarity index 92% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SpeciesListBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/SpeciesListBinder.java index 7b3d4f2..58ef595 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/SpeciesListBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/SpeciesListBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.common; +package fr.ird.observe.services.binder.referential.common; /*- * #%L @@ -25,10 +25,10 @@ package fr.ird.observe.services.topia.binder.referential.common; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.SpeciesList; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/VesselBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/VesselBinder.java similarity index 96% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/VesselBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/VesselBinder.java index 082769c..fafdfa4 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/VesselBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/VesselBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.common; +package fr.ird.observe.services.binder.referential.common; /*- * #%L @@ -29,12 +29,12 @@ import fr.ird.observe.entities.referentiel.VesselSizeCategory; import fr.ird.observe.entities.referentiel.VesselType; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.CountryDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.ShipOwnerDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.referential.VesselSizeCategoryDto; import fr.ird.observe.services.dto.referential.VesselTypeDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/VesselSizeCategoryBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/VesselSizeCategoryBinder.java similarity index 92% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/VesselSizeCategoryBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/VesselSizeCategoryBinder.java index ee18c6b..3c99b09 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/VesselSizeCategoryBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/VesselSizeCategoryBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.common; +package fr.ird.observe.services.binder.referential.common; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.common; import fr.ird.observe.entities.referentiel.VesselSizeCategory; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.VesselSizeCategoryDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/VesselTypeBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/VesselTypeBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/VesselTypeBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/VesselTypeBinder.java index 4ac3944..d328397 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/VesselTypeBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/VesselTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.common; +package fr.ird.observe.services.binder.referential.common; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.common; import fr.ird.observe.entities.referentiel.VesselType; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.VesselTypeDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/WeightMeasureTypeBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/WeightMeasureTypeBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/WeightMeasureTypeBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/WeightMeasureTypeBinder.java index acc843d..73caf39 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/WeightMeasureTypeBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/common/WeightMeasureTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.common; +package fr.ird.observe.services.binder.referential.common; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.common; import fr.ird.observe.entities.referentiel.WeightMeasureType; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/BaitHaulingStatusBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/BaitHaulingStatusBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/BaitHaulingStatusBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/BaitHaulingStatusBinder.java index b8cef65..2447d2e 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/BaitHaulingStatusBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/BaitHaulingStatusBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.longline; +package fr.ird.observe.services.binder.referential.longline; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.longline; import fr.ird.observe.entities.referentiel.longline.BaitHaulingStatus; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/BaitSettingStatusBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/BaitSettingStatusBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/BaitSettingStatusBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/BaitSettingStatusBinder.java index 28d60c9..a7a7fe5 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/BaitSettingStatusBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/BaitSettingStatusBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.longline; +package fr.ird.observe.services.binder.referential.longline; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.longline; import fr.ird.observe.entities.referentiel.longline.BaitSettingStatus; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/BaitTypeBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/BaitTypeBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/BaitTypeBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/BaitTypeBinder.java index 6d582b9..25bca95 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/BaitTypeBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/BaitTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.longline; +package fr.ird.observe.services.binder.referential.longline; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.longline; import fr.ird.observe.entities.referentiel.longline.BaitType; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/CatchFateLonglineBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/CatchFateLonglineBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/CatchFateLonglineBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/CatchFateLonglineBinder.java index 112eaa4..122895e 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/CatchFateLonglineBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/CatchFateLonglineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.longline; +package fr.ird.observe.services.binder.referential.longline; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.longline; import fr.ird.observe.entities.referentiel.longline.CatchFateLongline; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/EncounterTypeBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/EncounterTypeBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/EncounterTypeBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/EncounterTypeBinder.java index d3789f3..9e6671b 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/EncounterTypeBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/EncounterTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.longline; +package fr.ird.observe.services.binder.referential.longline; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.longline; import fr.ird.observe.entities.referentiel.longline.EncounterType; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HealthnessBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/HealthnessBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HealthnessBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/HealthnessBinder.java index 3ee1f84..3115de7 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HealthnessBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/HealthnessBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.longline; +package fr.ird.observe.services.binder.referential.longline; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.longline; import fr.ird.observe.entities.referentiel.longline.Healthness; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.HealthnessDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HookPositionBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/HookPositionBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HookPositionBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/HookPositionBinder.java index 204cc0c..58d929d 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HookPositionBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/HookPositionBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.longline; +package fr.ird.observe.services.binder.referential.longline; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.longline; import fr.ird.observe.entities.referentiel.longline.HookPosition; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.HookPositionDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HookSizeBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/HookSizeBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HookSizeBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/HookSizeBinder.java index 3522dad..acfe714 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HookSizeBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/HookSizeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.longline; +package fr.ird.observe.services.binder.referential.longline; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.longline; import fr.ird.observe.entities.referentiel.longline.HookSize; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.HookSizeDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HookTypeBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/HookTypeBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HookTypeBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/HookTypeBinder.java index c6daa09..42e6075 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/HookTypeBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/HookTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.longline; +package fr.ird.observe.services.binder.referential.longline; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.longline; import fr.ird.observe.entities.referentiel.longline.HookType; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.HookTypeDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/ItemHorizontalPositionBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/ItemHorizontalPositionBinder.java similarity index 92% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/ItemHorizontalPositionBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/ItemHorizontalPositionBinder.java index 97dccf6..9a77492 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/ItemHorizontalPositionBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/ItemHorizontalPositionBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.longline; +package fr.ird.observe.services.binder.referential.longline; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.longline; import fr.ird.observe.entities.referentiel.longline.ItemHorizontalPosition; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.ItemHorizontalPositionDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/ItemVerticalPositionBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/ItemVerticalPositionBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/ItemVerticalPositionBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/ItemVerticalPositionBinder.java index 050b983..c863d53 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/ItemVerticalPositionBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/ItemVerticalPositionBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.longline; +package fr.ird.observe.services.binder.referential.longline; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.longline; import fr.ird.observe.entities.referentiel.longline.ItemVerticalPosition; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.ItemVerticalPositionDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/LightsticksColorBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/LightsticksColorBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/LightsticksColorBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/LightsticksColorBinder.java index 5ec6e35..15246ef 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/LightsticksColorBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/LightsticksColorBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.longline; +package fr.ird.observe.services.binder.referential.longline; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.longline; import fr.ird.observe.entities.referentiel.longline.LightsticksColor; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.LightsticksColorDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/LightsticksTypeBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/LightsticksTypeBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/LightsticksTypeBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/LightsticksTypeBinder.java index 06a1c0b..e2d591e 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/LightsticksTypeBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/LightsticksTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.longline; +package fr.ird.observe.services.binder.referential.longline; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.longline; import fr.ird.observe.entities.referentiel.longline.LightsticksType; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.LightsticksTypeDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/LineTypeBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/LineTypeBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/LineTypeBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/LineTypeBinder.java index dd0c666..f86426c 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/LineTypeBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/LineTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.longline; +package fr.ird.observe.services.binder.referential.longline; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.longline; import fr.ird.observe.entities.referentiel.longline.LineType; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.LineTypeDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/MaturityStatusBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/MaturityStatusBinder.java similarity index 92% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/MaturityStatusBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/MaturityStatusBinder.java index 990c095..7461b19 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/MaturityStatusBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/MaturityStatusBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.longline; +package fr.ird.observe.services.binder.referential.longline; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.longline; import fr.ird.observe.entities.referentiel.longline.MaturityStatus; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.MaturityStatusDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/MitigationTypeBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/MitigationTypeBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/MitigationTypeBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/MitigationTypeBinder.java index dfa4d4b..dcdf848 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/MitigationTypeBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/MitigationTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.longline; +package fr.ird.observe.services.binder.referential.longline; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.longline; import fr.ird.observe.entities.referentiel.longline.MitigationType; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.MitigationTypeDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SensorBrandBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/SensorBrandBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SensorBrandBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/SensorBrandBinder.java index b1acdf5..b2402c0 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SensorBrandBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/SensorBrandBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.longline; +package fr.ird.observe.services.binder.referential.longline; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.longline; import fr.ird.observe.entities.referentiel.longline.SensorBrand; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SensorDataFormatBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/SensorDataFormatBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SensorDataFormatBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/SensorDataFormatBinder.java index 1d8c7d9..d21ece4 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SensorDataFormatBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/SensorDataFormatBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.longline; +package fr.ird.observe.services.binder.referential.longline; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.longline; import fr.ird.observe.entities.referentiel.longline.SensorDataFormat; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SensorTypeBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/SensorTypeBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SensorTypeBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/SensorTypeBinder.java index bea9dd1..a6601bb 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SensorTypeBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/SensorTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.longline; +package fr.ird.observe.services.binder.referential.longline; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.longline; import fr.ird.observe.entities.referentiel.longline.SensorType; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SettingShapeBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/SettingShapeBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SettingShapeBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/SettingShapeBinder.java index 9722661..3e898ed 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/SettingShapeBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/SettingShapeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.longline; +package fr.ird.observe.services.binder.referential.longline; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.longline; import fr.ird.observe.entities.referentiel.longline.SettingShape; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/StomacFullnessBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/StomacFullnessBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/StomacFullnessBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/StomacFullnessBinder.java index d0a6453..efabce8 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/StomacFullnessBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/StomacFullnessBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.longline; +package fr.ird.observe.services.binder.referential.longline; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.longline; import fr.ird.observe.entities.referentiel.longline.StomacFullness; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/TripTypeBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/TripTypeBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/TripTypeBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/TripTypeBinder.java index 2159bd2..356f54f 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/TripTypeBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/TripTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.longline; +package fr.ird.observe.services.binder.referential.longline; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.longline; import fr.ird.observe.entities.referentiel.longline.TripType; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.TripTypeDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/VesselActivityLonglineBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/VesselActivityLonglineBinder.java similarity index 92% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/VesselActivityLonglineBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/VesselActivityLonglineBinder.java index a82f05f..43de2e9 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/longline/VesselActivityLonglineBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/longline/VesselActivityLonglineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.longline; +package fr.ird.observe.services.binder.referential.longline; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.longline; import fr.ird.observe.entities.referentiel.longline.VesselActivityLongline; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/DetectionModeBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/DetectionModeBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/DetectionModeBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/DetectionModeBinder.java index 500c982..a5528a8 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/DetectionModeBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/DetectionModeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.seine; +package fr.ird.observe.services.binder.referential.seine; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.seine; import fr.ird.observe.entities.referentiel.seine.DetectionMode; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObjectFateBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectFateBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObjectFateBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectFateBinder.java index c546ecb..48eb5d0 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObjectFateBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectFateBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.seine; +package fr.ird.observe.services.binder.referential.seine; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.seine; import fr.ird.observe.entities.referentiel.seine.ObjectFate; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObjectOperationBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectOperationBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObjectOperationBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectOperationBinder.java index aef4d93..c07ec6d 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObjectOperationBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectOperationBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.seine; +package fr.ird.observe.services.binder.referential.seine; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.seine; import fr.ird.observe.entities.referentiel.seine.ObjectOperation; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObjectTypeBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectTypeBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObjectTypeBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectTypeBinder.java index 0b96fcf..89ad0e7 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObjectTypeBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/ObjectTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.seine; +package fr.ird.observe.services.binder.referential.seine; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.seine; import fr.ird.observe.entities.referentiel.seine.ObjectType; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.ObjectTypeDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObservedSystemBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/ObservedSystemBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObservedSystemBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/ObservedSystemBinder.java index 85461f6..01c3365 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObservedSystemBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/ObservedSystemBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.seine; +package fr.ird.observe.services.binder.referential.seine; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.seine; import fr.ird.observe.entities.referentiel.seine.ObservedSystem; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.ObservedSystemDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ReasonForDiscardBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/ReasonForDiscardBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ReasonForDiscardBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/ReasonForDiscardBinder.java index 9361720..196ef89 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ReasonForDiscardBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/ReasonForDiscardBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.seine; +package fr.ird.observe.services.binder.referential.seine; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.seine; import fr.ird.observe.entities.referentiel.seine.ReasonForDiscard; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ReasonForNoFishingBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/ReasonForNoFishingBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ReasonForNoFishingBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/ReasonForNoFishingBinder.java index 1f2f4fc..ec53903 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ReasonForNoFishingBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/ReasonForNoFishingBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.seine; +package fr.ird.observe.services.binder.referential.seine; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.seine; import fr.ird.observe.entities.referentiel.seine.ReasonForNoFishing; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.ReasonForNoFishingDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ReasonForNullSetBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/ReasonForNullSetBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ReasonForNullSetBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/ReasonForNullSetBinder.java index c75dd54..3db551b 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ReasonForNullSetBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/ReasonForNullSetBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.seine; +package fr.ird.observe.services.binder.referential.seine; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.seine; import fr.ird.observe.entities.referentiel.seine.ReasonForNullSet; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.ReasonForNullSetDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/SpeciesFateBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/SpeciesFateBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/SpeciesFateBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/SpeciesFateBinder.java index f5e6c52..856c29c 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/SpeciesFateBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/SpeciesFateBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.seine; +package fr.ird.observe.services.binder.referential.seine; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.seine; import fr.ird.observe.entities.referentiel.seine.SpeciesFate; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/SpeciesStatusBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/SpeciesStatusBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/SpeciesStatusBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/SpeciesStatusBinder.java index 9939cf3..9489f0b 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/SpeciesStatusBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/SpeciesStatusBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.seine; +package fr.ird.observe.services.binder.referential.seine; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.seine; import fr.ird.observe.entities.referentiel.seine.SpeciesStatus; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/SurroundingActivityBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/SurroundingActivityBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/SurroundingActivityBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/SurroundingActivityBinder.java index 2a927e7..93f0229 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/SurroundingActivityBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/SurroundingActivityBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.seine; +package fr.ird.observe.services.binder.referential.seine; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.seine; import fr.ird.observe.entities.referentiel.seine.SurroundingActivity; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.SurroundingActivityDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/TransmittingBuoyOperationBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/TransmittingBuoyOperationBinder.java similarity index 92% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/TransmittingBuoyOperationBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/TransmittingBuoyOperationBinder.java index ed176c9..220b914 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/TransmittingBuoyOperationBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/TransmittingBuoyOperationBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.seine; +package fr.ird.observe.services.binder.referential.seine; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.seine; import fr.ird.observe.entities.referentiel.seine.TransmittingBuoyOperation; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/TransmittingBuoyTypeBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/TransmittingBuoyTypeBinder.java similarity index 91% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/TransmittingBuoyTypeBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/TransmittingBuoyTypeBinder.java index 644626f..a188ff1 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/TransmittingBuoyTypeBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/TransmittingBuoyTypeBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.seine; +package fr.ird.observe.services.binder.referential.seine; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.seine; import fr.ird.observe.entities.referentiel.seine.TransmittingBuoyType; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/VesselActivitySeineBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/VesselActivitySeineBinder.java similarity index 92% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/VesselActivitySeineBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/VesselActivitySeineBinder.java index c99d89c..caea8d9 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/VesselActivitySeineBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/VesselActivitySeineBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.seine; +package fr.ird.observe.services.binder.referential.seine; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.seine; import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/WeightCategoryBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/WeightCategoryBinder.java similarity index 92% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/WeightCategoryBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/WeightCategoryBinder.java index 518eab5..59c5210 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/WeightCategoryBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/WeightCategoryBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.seine; +package fr.ird.observe.services.binder.referential.seine; /*- * #%L @@ -25,10 +25,10 @@ package fr.ird.observe.services.topia.binder.referential.seine; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.seine.WeightCategory; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/WindBinder.java b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/WindBinder.java similarity index 92% rename from services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/WindBinder.java rename to services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/WindBinder.java index 4879fa1..555fe68 100644 --- a/services-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/WindBinder.java +++ b/services-binder/src/main/java/fr/ird/observe/services/binder/referential/seine/WindBinder.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder.referential.seine; +package fr.ird.observe.services.binder.referential.seine; /*- * #%L @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.binder.referential.seine; import fr.ird.observe.entities.referentiel.seine.Wind; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.WindDto; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; /** * Created on 24/11/15. diff --git a/services-binder/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineMetadataTest.java b/services-binder/src/test/java/fr/ird/observe/services/binder/BinderEngineMetadataTest.java similarity index 97% rename from services-binder/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineMetadataTest.java rename to services-binder/src/test/java/fr/ird/observe/services/binder/BinderEngineMetadataTest.java index d9b9ad5..8129d3e 100644 --- a/services-binder/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineMetadataTest.java +++ b/services-binder/src/test/java/fr/ird/observe/services/binder/BinderEngineMetadataTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder; +package fr.ird.observe.services.binder; /*- * #%L @@ -24,12 +24,12 @@ package fr.ird.observe.services.topia.binder; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; -import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.longline.TdrRecord; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.persistence.ObserveEntityEnum; +import fr.ird.observe.services.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import org.junit.Assert; diff --git a/services-binder/src/test/java/fr/ird/observe/services/topia/binder/ReferenceBinderEngineTest.java b/services-binder/src/test/java/fr/ird/observe/services/binder/ReferenceBinderEngineTest.java similarity index 86% rename from services-binder/src/test/java/fr/ird/observe/services/topia/binder/ReferenceBinderEngineTest.java rename to services-binder/src/test/java/fr/ird/observe/services/binder/ReferenceBinderEngineTest.java index c45e7b1..35a3dbd 100644 --- a/services-binder/src/test/java/fr/ird/observe/services/topia/binder/ReferenceBinderEngineTest.java +++ b/services-binder/src/test/java/fr/ird/observe/services/binder/ReferenceBinderEngineTest.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.binder; +package fr.ird.observe.services.binder; /*- * #%L @@ -22,8 +22,6 @@ package fr.ird.observe.services.topia.binder; * #L% */ -import fr.ird.observe.services.dto.reference.ReferenceBinderEngine; -import fr.ird.observe.services.dto.reference.ReferenceBinderEngineSupplier; import org.junit.Assert; import org.junit.Test; diff --git a/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceFactoryRest.java b/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceFactoryRest.java index 2d94ca8..4ecdace 100644 --- a/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceFactoryRest.java +++ b/services-rest/src/main/java/fr/ird/observe/services/rest/ObserveServiceFactoryRest.java @@ -36,7 +36,7 @@ import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRestConstants; import fr.ird.observe.services.configuration.rest.ObserveDataSourceConnectionRest; -import fr.ird.observe.services.dto.gson.ObserveDtoGsonSupplier; +import fr.ird.observe.services.gson.ObserveDtoGsonSupplier; import fr.ird.observe.services.http.ObserveHttpError; import fr.ird.observe.services.rest.http.ObserveRequest; import fr.ird.observe.services.rest.http.ObserveRequestBuilder; diff --git a/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveRequestBuilder.java b/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveRequestBuilder.java index e4ddd37..d53306e 100644 --- a/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveRequestBuilder.java +++ b/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveRequestBuilder.java @@ -27,7 +27,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.gson.Gson; -import fr.ird.observe.services.dto.gson.ObserveDtoGsonSupplier; +import fr.ird.observe.services.gson.ObserveDtoGsonSupplier; import org.apache.http.NameValuePair; import org.apache.http.message.BasicNameValuePair; diff --git a/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveResponseBuilder.java b/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveResponseBuilder.java index 0b5fa28..7b95673 100644 --- a/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveResponseBuilder.java +++ b/services-rest/src/main/java/fr/ird/observe/services/rest/http/ObserveResponseBuilder.java @@ -25,7 +25,7 @@ package fr.ird.observe.services.rest.http; import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.gson.Gson; -import fr.ird.observe.services.dto.gson.ObserveDtoGsonSupplier; +import fr.ird.observe.services.gson.ObserveDtoGsonSupplier; import fr.ird.observe.services.http.ObserveHttpError; import fr.ird.observe.services.rest.ObserveServiceRestErrorException; import fr.ird.observe.services.rest.ObserveServiceRestNotAvailableException; diff --git a/services-rest/src/test/java/fr/ird/observe/services/rest/service/AbstractServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/AbstractServiceRestTest.java index 212f4c9..73357bb 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/rest/service/AbstractServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/AbstractServiceRestTest.java @@ -25,7 +25,7 @@ package fr.ird.observe.services.rest.service; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.rest.RestTestClassResource; import fr.ird.observe.services.rest.RestTestMethodResource; diff --git a/services-rest/src/test/java/fr/ird/observe/services/rest/service/DataSourceServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/DataSourceServiceRestTest.java index 73b0ee6..8909c12 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/rest/service/DataSourceServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/DataSourceServiceRestTest.java @@ -24,9 +24,9 @@ package fr.ird.observe.services.rest.service; import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; -import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; -import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; -import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; +import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto; +import fr.ird.observe.services.dto.source.DataSourceCreateWithNoReferentialImportException; +import fr.ird.observe.services.dto.source.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DataSourceService; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; diff --git a/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferenceValuesSetServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferenceValuesSetServiceRestTest.java index ba901f6..e43d24a 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferenceValuesSetServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferenceValuesSetServiceRestTest.java @@ -26,8 +26,8 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; -import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; +import fr.ird.observe.services.ObserveFormRequests; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.service.DataSourceService; import fr.ird.observe.services.service.referential.ReferenceSetsRequest; import fr.ird.observe.services.service.referential.ReferentialService; @@ -59,7 +59,7 @@ public class ReferenceValuesSetServiceRestTest extends AbstractServiceRestTest { public void testGetTripSeineRequest() throws Exception { //FIXME - String requestName = ReferenceSetRequestDefinitions.TRIP_SEINE_FORM.name(); + String requestName = ObserveFormRequests.TRIP_SEINE_FORM.name(); //FIXME ReferenceSetsRequest request = new ReferenceSetsRequest(); diff --git a/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferentialServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferentialServiceRestTest.java index 860459e..2c0a4b9 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferentialServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/ReferentialServiceRestTest.java @@ -26,8 +26,8 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.configuration.rest.ObserveDataSourceConfigurationRest; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DataSourceService; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; diff --git a/services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/report/AbstractReportServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/report/AbstractReportServiceRestTest.java index 625f151..1834b42 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/report/AbstractReportServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/report/AbstractReportServiceRestTest.java @@ -22,11 +22,11 @@ package fr.ird.observe.services.rest.service.actions.report; -import fr.ird.observe.services.dto.AbstractReference; -import fr.ird.observe.services.dto.actions.report.DataMatrix; -import fr.ird.observe.services.dto.actions.report.Report; -import fr.ird.observe.services.dto.actions.report.ReportRequest; -import fr.ird.observe.services.dto.actions.report.ReportVariable; +import fr.ird.observe.services.dto.reference.AbstractReference; +import fr.ird.observe.services.service.actions.report.DataMatrix; +import fr.ird.observe.services.service.actions.report.Report; +import fr.ird.observe.services.service.actions.report.ReportRequest; +import fr.ird.observe.services.service.actions.report.ReportVariable; import fr.ird.observe.services.rest.service.AbstractServiceRestTest; import fr.ird.observe.services.service.actions.report.ReportBuilder; import fr.ird.observe.services.service.actions.report.ReportService; diff --git a/services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/report/ReportAccessoryCatchRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/report/ReportAccessoryCatchRestTest.java index 5d4f1b6..69f0638 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/report/ReportAccessoryCatchRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/report/ReportAccessoryCatchRestTest.java @@ -22,9 +22,9 @@ package fr.ird.observe.services.rest.service.actions.report; -import fr.ird.observe.services.dto.actions.report.DataMatrix; -import fr.ird.observe.services.dto.actions.report.Report; -import fr.ird.observe.services.dto.actions.report.ReportRequest; +import fr.ird.observe.services.service.actions.report.DataMatrix; +import fr.ird.observe.services.service.actions.report.Report; +import fr.ird.observe.services.service.actions.report.ReportRequest; import fr.ird.observe.test.ObserveFixtures; import org.junit.Assert; diff --git a/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineGearUseServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineGearUseServiceRestTest.java index fe64581..101f28d 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineGearUseServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineGearUseServiceRestTest.java @@ -22,9 +22,9 @@ package fr.ird.observe.services.rest.service.seine; * #L% */ -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceList; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceList; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; diff --git a/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineServiceRestTest.java index b5eefd1..db92efe 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineServiceRestTest.java @@ -23,9 +23,9 @@ package fr.ird.observe.services.rest.service.seine; */ import com.google.common.collect.Iterables; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceList; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceList; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.referential.HarbourDto; import fr.ird.observe.services.dto.referential.OceanDto; import fr.ird.observe.services.dto.referential.PersonDto; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceFactoryTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceFactoryTopia.java index 239f64b..f558a82 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceFactoryTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceFactoryTopia.java @@ -35,7 +35,7 @@ import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaSupport; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConnectionTopia; -import fr.ird.observe.services.dto.UnauthorizedException; +import fr.ird.observe.services.security.UnauthorizedException; import fr.ird.observe.services.spi.NoDataAccess; import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.ReadReferentialPermission; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java index 7a32e0e..1602500 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java @@ -31,23 +31,23 @@ import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.DataFileDto; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceList; -import fr.ird.observe.services.dto.DataReferenceSet; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceList; +import fr.ird.observe.services.dto.reference.DataReferenceSet; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; +import fr.ird.observe.services.ObserveFormRequests; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultHelper; import fr.ird.observe.services.service.ConcurrentModificationException; import fr.ird.observe.services.service.DataNotFoundException; -import fr.ird.observe.services.topia.binder.BinderEngine; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.BinderEngine; +import fr.ird.observe.services.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaDao; @@ -184,7 +184,7 @@ public abstract class ObserveServiceTopia implements ObserveService { protected <E extends ObserveDataEntity, D extends DataDto> Form<D> dataEntityToForm(Class<D> dtoType, E entity, - ReferenceSetRequestDefinitions referentialRequestDefinition) { + ObserveFormRequests referentialRequestDefinition) { D dto = BINDER_ENGINE.transformEntityToDataDto(serviceContext.getReferentialLocale(), dtoType, entity); @@ -195,7 +195,7 @@ public abstract class ObserveServiceTopia implements ObserveService { protected <E extends ObserveReferentialEntity, D extends ReferentialDto> Form<D> referentialEntityToForm(Class<D> dtoType, E entity, - ReferenceSetRequestDefinitions referentialRequestDefinition) { + ObserveFormRequests referentialRequestDefinition) { D dto = BINDER_ENGINE.transformEntityToReferentialDto(serviceContext.getReferentialLocale(), entity); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java index ac54513..9bd4c30 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java @@ -39,9 +39,9 @@ import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfiguratio import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaSupport; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConnectionTopia; -import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; -import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; -import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; +import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto; +import fr.ird.observe.services.dto.source.DataSourceCreateWithNoReferentialImportException; +import fr.ird.observe.services.dto.source.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.dto.ObserveDbUserDto; import fr.ird.observe.services.dto.ObserveDbUserHelper; import fr.ird.observe.services.dto.referential.ReferentialDto; @@ -56,7 +56,7 @@ import fr.ird.observe.services.topia.ObserveJdbcHelper; import fr.ird.observe.services.topia.ObserveSecurityHelper; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.topia.ObserveTopiaApplicationContextFactory; -import fr.ird.observe.services.topia.binder.BinderEngine; +import fr.ird.observe.services.binder.BinderEngine; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.jdbc.JdbcHelper; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/report/ReportServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/report/ReportServiceTopia.java index 3994035..ac70633 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/report/ReportServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/report/ReportServiceTopia.java @@ -30,20 +30,20 @@ import fr.ird.observe.entities.longline.GearUseFeaturesLongline; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.entities.seine.GearUseFeaturesSeine; import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.services.dto.AbstractReference; +import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.actions.report.DataMatrix; -import fr.ird.observe.services.dto.actions.report.Report; -import fr.ird.observe.services.dto.actions.report.ReportOperation; -import fr.ird.observe.services.dto.actions.report.ReportRequest; -import fr.ird.observe.services.dto.actions.report.ReportVariable; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.service.actions.report.DataMatrix; +import fr.ird.observe.services.service.actions.report.Report; +import fr.ird.observe.services.service.actions.report.ReportOperation; +import fr.ird.observe.services.service.actions.report.ReportRequest; +import fr.ird.observe.services.service.actions.report.ReportVariable; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.service.actions.report.ReportService; import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; import org.apache.commons.lang3.mutable.MutableInt; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java index 20fb79e..378e183 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java @@ -31,13 +31,13 @@ import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialMultimap; -import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialDataSourceState; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialDataSourceStates; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffService; import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.topia.binder.BinderEngine; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.BinderEngine; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaDao; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java index 75ec1b7..e85d616 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java @@ -25,14 +25,14 @@ package fr.ird.observe.services.topia.service.actions.synchro.referential.legacy import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.service.LastUpdateDateService; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalService; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeRequest; import fr.ird.observe.services.topia.ObserveServiceContextTopia; import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.topia.binder.BinderEngine; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.BinderEngine; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.topia.service.actions.synchro.referential.sql.ApplySqlRequestWork; import fr.ird.observe.services.topia.service.actions.synchro.referential.sql.DeleteSqlStatementGenerator; import fr.ird.observe.services.topia.service.actions.synchro.referential.sql.InsertSqlStatementGenerator; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java index 73dd343..69d44b2 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java @@ -28,8 +28,8 @@ import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.dto.referential.ReferentialHelper; import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeRequest; import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeSqlsRequest; -import fr.ird.observe.services.topia.binder.BinderEngine; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.BinderEngine; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.service.actions.synchro.referential.ng.task.ReferentialSynchronizeTask; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java index d20668b..823d3c5 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java @@ -23,9 +23,9 @@ package fr.ird.observe.services.topia.service.actions.synchro.referential.sql; */ import fr.ird.observe.persistence.ObserveEntityEnum; -import fr.ird.observe.services.topia.binder.BinderEngine; +import fr.ird.observe.services.binder.BinderEngine; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java index 1a8e294..d2dbada 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlWithCascadeStatementGenerator.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.topia.service.actions.synchro.referential.sql; import com.google.common.collect.Multimap; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java index 18240ea..e01e7bc 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlStatementGenerator.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.topia.service.actions.synchro.referential.sql; */ import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java index 62c9bb7..d9d8cc3 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/UpdateSqlWithCascadeStatementGenerator.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.topia.service.actions.synchro.referential.sql; import com.google.common.collect.Multimap; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopia.java index f034c27..43d454c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopia.java @@ -33,12 +33,12 @@ import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.Trip; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.actions.validate.ValidateDataRequest; import fr.ird.observe.services.service.actions.validate.ValidateDataResult; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/NavigationServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/NavigationServiceTopia.java index a854838..437a882 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/NavigationServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/NavigationServiceTopia.java @@ -26,13 +26,13 @@ import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceList; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceList; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineHelper; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ProgramHelper; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineHelper; import fr.ird.observe.services.service.data.NavigationRequest; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/ActivityLongLineEncounterServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/ActivityLongLineEncounterServiceTopia.java index 289e402..35a9cab 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/ActivityLongLineEncounterServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/ActivityLongLineEncounterServiceTopia.java @@ -25,9 +25,9 @@ package fr.ird.observe.services.topia.service.data.longline; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.services.service.data.longline.ActivityLongLineEncounterService; import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; +import fr.ird.observe.services.ObserveFormRequests; import fr.ird.observe.services.dto.result.SaveResultDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -50,7 +50,7 @@ public class ActivityLongLineEncounterServiceTopia extends ObserveServiceTopia i return dataEntityToForm( ActivityLonglineEncounterDto.class, activityLongline, - ReferenceSetRequestDefinitions.ACTIVITY_LONGLINE_ENCOUTER_FORM); + ObserveFormRequests.ACTIVITY_LONGLINE_ENCOUTER_FORM); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/ActivityLongLineSensorUsedServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/ActivityLongLineSensorUsedServiceTopia.java index 4895cf7..8a4150a 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/ActivityLongLineSensorUsedServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/ActivityLongLineSensorUsedServiceTopia.java @@ -27,10 +27,10 @@ import fr.ird.observe.entities.longline.SensorUsed; import fr.ird.observe.services.service.data.longline.ActivityLongLineSensorUsedService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.DataFileDto; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; import fr.ird.observe.services.dto.longline.SensorUsedDto; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; +import fr.ird.observe.services.ObserveFormRequests; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.DataFileNotFoundException; import org.apache.commons.logging.Log; @@ -53,7 +53,7 @@ public class ActivityLongLineSensorUsedServiceTopia extends ObserveServiceTopia return dataEntityToForm(ActivityLonglineSensorUsedDto.class, activityLongline, - ReferenceSetRequestDefinitions.ACTIVITY_LONGLINE_SENSOR_USED_FORM); + ObserveFormRequests.ACTIVITY_LONGLINE_SENSOR_USED_FORM); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/ActivityLonglineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/ActivityLonglineServiceTopia.java index c171d52..6eaa90a 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/ActivityLonglineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/ActivityLonglineServiceTopia.java @@ -29,12 +29,12 @@ import fr.ird.observe.entities.longline.ActivityLonglineTopiaDao; import fr.ird.observe.entities.longline.ActivityLonglines; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.longline.TripLonglineTopiaDao; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceSet; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; +import fr.ird.observe.services.ObserveFormRequests; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.dto.result.TripChildSaveResultHelper; @@ -124,7 +124,7 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements Form<ActivityLonglineDto> form = dataEntityToForm(ActivityLonglineDto.class, activityLongline, - ReferenceSetRequestDefinitions.ACTIVITY_LONGLINE_FORM); + ObserveFormRequests.ACTIVITY_LONGLINE_FORM); form.getObject().setHasSetLongline(activityLongline.getSetLongline() != null); @@ -164,7 +164,7 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements return dataEntityToForm(ActivityLonglineDto.class, preCreated, - ReferenceSetRequestDefinitions.ACTIVITY_LONGLINE_FORM); + ObserveFormRequests.ACTIVITY_LONGLINE_FORM); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/BranchlineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/BranchlineServiceTopia.java index 48eeb81..6934deb 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/BranchlineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/BranchlineServiceTopia.java @@ -24,10 +24,10 @@ package fr.ird.observe.services.topia.service.data.longline; import fr.ird.observe.entities.longline.Branchline; import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; +import fr.ird.observe.services.ObserveFormRequests; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.BranchlineService; import fr.ird.observe.services.topia.ObserveServiceTopia; @@ -44,7 +44,7 @@ public class BranchlineServiceTopia extends ObserveServiceTopia implements Branc Branchline entity = loadEntity(BranchlineDto.class, id); - Form<BranchlineDto> form = dataEntityToForm(BranchlineDto.class, entity, ReferenceSetRequestDefinitions.BRANCHLINE_FORM); + Form<BranchlineDto> form = dataEntityToForm(BranchlineDto.class, entity, ObserveFormRequests.BRANCHLINE_FORM); form.getObject().setLastUpdateDate(setLongline.getLastUpdateDate()); return form; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/LonglinePositionSetDtoHelper.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/LonglinePositionSetDtoHelper.java index cfb1c10..9398e80 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/LonglinePositionSetDtoHelper.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/LonglinePositionSetDtoHelper.java @@ -26,13 +26,13 @@ import fr.ird.observe.entities.longline.Basket; import fr.ird.observe.entities.longline.Branchline; import fr.ird.observe.entities.longline.Section; import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.longline.LonglinePositionAwareDto; import fr.ird.observe.services.dto.longline.LonglinePositionSetDto; import fr.ird.observe.services.dto.longline.SectionDto; -import fr.ird.observe.services.dto.reference.DataReferenceSetDefinitions; +import fr.ird.observe.services.ObserveDataReferenceSets; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; /** @@ -106,7 +106,7 @@ public class LonglinePositionSetDtoHelper { reference.setCreateDate(section.getTopiaCreateDate()); reference.setVersion(section.getTopiaVersion()); - ReferenceSetDefinition<SectionDto> definition = DataReferenceSetDefinitions.SECTION.getDefinition(); + ReferenceSetDefinition<SectionDto> definition = ObserveDataReferenceSets.SECTION.getDefinition(); reference.init(definition.getType(), definition.getPropertyNames(), section.getSettingIdentifier(), @@ -123,7 +123,7 @@ public class LonglinePositionSetDtoHelper { reference.setCreateDate(basket.getTopiaCreateDate()); reference.setVersion(basket.getTopiaVersion()); - ReferenceSetDefinition<BasketDto> definition = DataReferenceSetDefinitions.BASKET_WITH_SECTION.getDefinition(); + ReferenceSetDefinition<BasketDto> definition = ObserveDataReferenceSets.BASKET_WITH_SECTION.getDefinition(); reference.init(definition.getType(), definition.getPropertyNames(), basket.getSettingIdentifier(), @@ -141,7 +141,7 @@ public class LonglinePositionSetDtoHelper { reference.setCreateDate(branchline.getTopiaCreateDate()); reference.setVersion(branchline.getTopiaVersion()); - ReferenceSetDefinition<BranchlineDto> definition = DataReferenceSetDefinitions.BRANCHLINE_WITH_BASKET.getDefinition(); + ReferenceSetDefinition<BranchlineDto> definition = ObserveDataReferenceSets.BRANCHLINE_WITH_BASKET.getDefinition(); reference.init(definition.getType(), definition.getPropertyNames(), branchline.getSettingIdentifier(), diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineCatchServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineCatchServiceTopia.java index 76b8c8d..fc2cdb0 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineCatchServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineCatchServiceTopia.java @@ -25,10 +25,10 @@ package fr.ird.observe.services.topia.service.data.longline; import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.services.service.data.longline.SetLonglineCatchService; import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.CatchLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; +import fr.ird.observe.services.ObserveFormRequests; import fr.ird.observe.services.dto.result.SaveResultDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -51,7 +51,7 @@ public class SetLonglineCatchServiceTopia extends ObserveServiceTopia implements Form<SetLonglineCatchDto> form = dataEntityToForm( SetLonglineCatchDto.class, setLongline, - ReferenceSetRequestDefinitions.SET_LONGLINE_CATCH_FORM + ObserveFormRequests.SET_LONGLINE_CATCH_FORM ); LonglinePositionSetDtoHelper.loadPositionSet(setLongline, form.getObject()); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineDetailCompositionServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineDetailCompositionServiceTopia.java index adc1c6e..c801074 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineDetailCompositionServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineDetailCompositionServiceTopia.java @@ -26,12 +26,12 @@ import fr.ird.observe.entities.longline.Basket; import fr.ird.observe.entities.longline.Branchline; import fr.ird.observe.entities.longline.Section; import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; +import fr.ird.observe.services.ObserveFormRequests; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.SetLonglineDetailCompositionService; import fr.ird.observe.services.topia.ObserveServiceTopia; @@ -56,7 +56,7 @@ public class SetLonglineDetailCompositionServiceTopia extends ObserveServiceTopi return dataEntityToForm( SetLonglineDetailCompositionDto.class, setLongline, - ReferenceSetRequestDefinitions.SET_LONGLINE_DETAIL_COMPOSITION_FORM); + ObserveFormRequests.SET_LONGLINE_DETAIL_COMPOSITION_FORM); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineGlobalCompositionServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineGlobalCompositionServiceTopia.java index c610982..030f313 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineGlobalCompositionServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineGlobalCompositionServiceTopia.java @@ -25,9 +25,9 @@ package fr.ird.observe.services.topia.service.data.longline; import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.services.service.data.longline.SetLonglineGlobalCompositionService; import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; +import fr.ird.observe.services.ObserveFormRequests; import fr.ird.observe.services.dto.result.SaveResultDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -49,7 +49,7 @@ public class SetLonglineGlobalCompositionServiceTopia extends ObserveServiceTopi return dataEntityToForm(SetLonglineGlobalCompositionDto.class, setLongline, - ReferenceSetRequestDefinitions.SET_LONGLINE_GLOBAL_COMPOSITION_FORM); + ObserveFormRequests.SET_LONGLINE_GLOBAL_COMPOSITION_FORM); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineServiceTopia.java index 3f206ef..3667174 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineServiceTopia.java @@ -28,17 +28,17 @@ import fr.ird.observe.entities.longline.ActivityLonglineTopiaDao; import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.longline.TripLonglineTopiaDao; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineStubDto; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; +import fr.ird.observe.services.ObserveFormRequests; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.DataNotFoundException; import fr.ird.observe.services.service.data.longline.SetLonglineService; import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -63,7 +63,7 @@ public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetL Form<SetLonglineDto> form = dataEntityToForm(SetLonglineDto.class, setLongline, - ReferenceSetRequestDefinitions.SET_LONGLINE_FORM); + ObserveFormRequests.SET_LONGLINE_FORM); ActivityLonglineTopiaDao activityLonglineDao = getTopiaPersistenceContext().getActivityLonglineDao(); @@ -131,7 +131,7 @@ public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetL Form<SetLonglineDto> form = dataEntityToForm(SetLonglineDto.class, preCreated, - ReferenceSetRequestDefinitions.SET_LONGLINE_FORM); + ObserveFormRequests.SET_LONGLINE_FORM); form.getObject().setOtherSets(getOtherSetLonglineDtos(activityLongline, preCreated)); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TdrServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TdrServiceTopia.java index 1ce2803..32ef52b 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TdrServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TdrServiceTopia.java @@ -27,10 +27,10 @@ import fr.ird.observe.entities.longline.Tdr; import fr.ird.observe.services.service.data.longline.TdrService; import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.DataFileDto; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; import fr.ird.observe.services.dto.longline.TdrDto; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; +import fr.ird.observe.services.ObserveFormRequests; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.DataFileNotFoundException; import org.apache.commons.logging.Log; @@ -54,7 +54,7 @@ public class TdrServiceTopia extends ObserveServiceTopia implements TdrService { Form<SetLonglineTdrDto> form = dataEntityToForm( SetLonglineTdrDto.class, setLongline, - ReferenceSetRequestDefinitions.SET_LONGLINE_TDR_FORM + ObserveFormRequests.SET_LONGLINE_TDR_FORM ); LonglinePositionSetDtoHelper.loadPositionSet(setLongline, form.getObject()); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineGearUseServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineGearUseServiceTopia.java index db87c01..47c0ac8 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineGearUseServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineGearUseServiceTopia.java @@ -27,9 +27,9 @@ import fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLongline; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.services.service.data.longline.TripLonglineGearUseService; import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.TripLonglineGearUseDto; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; +import fr.ird.observe.services.ObserveFormRequests; import fr.ird.observe.services.dto.result.SaveResultDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -55,7 +55,7 @@ public class TripLonglineGearUseServiceTopia extends ObserveServiceTopia impleme return dataEntityToForm( TripLonglineGearUseDto.class, tripLongline, - ReferenceSetRequestDefinitions.TRIP_LONGLINE_GEAR_USE_FORM); + ObserveFormRequests.TRIP_LONGLINE_GEAR_USE_FORM); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineServiceTopia.java index 15baa2f..b24fc68 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineServiceTopia.java @@ -33,21 +33,21 @@ import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.Species2; import fr.ird.observe.entities.referentiel.SpeciesList; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceList; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceList; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; +import fr.ird.observe.services.ObserveFormRequests; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.data.longline.TripLonglineService; import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.topia.service.data.TripMapDtoFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -142,7 +142,7 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri Form<TripLonglineDto> form = dataEntityToForm(TripLonglineDto.class, tripLongline, - ReferenceSetRequestDefinitions.TRIP_LONGLINE_FORM); + ObserveFormRequests.TRIP_LONGLINE_FORM); TripLonglineDto tripLonglineDto = form.getObject(); @@ -175,7 +175,7 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri return dataEntityToForm(TripLonglineDto.class, tripLongline, - ReferenceSetRequestDefinitions.TRIP_LONGLINE_FORM); + ObserveFormRequests.TRIP_LONGLINE_FORM); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/ActivitySeineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/ActivitySeineServiceTopia.java index 684b1c9..3ed564c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/ActivitySeineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/ActivitySeineServiceTopia.java @@ -29,11 +29,11 @@ import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.ActivitySeineTopiaDao; import fr.ird.observe.entities.seine.ActivitySeines; import fr.ird.observe.entities.seine.Route; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceSet; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; +import fr.ird.observe.services.ObserveFormRequests; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; @@ -125,7 +125,7 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac Form<ActivitySeineDto> form = dataEntityToForm(ActivitySeineDto.class, activitySeine, - ReferenceSetRequestDefinitions.ACTIVITY_SEINE_FORM); + ObserveFormRequests.ACTIVITY_SEINE_FORM); form.getObject().setFloatingObjectEmpty(activitySeine.isFloatingObjectEmpty()); @@ -172,7 +172,7 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac Form<ActivitySeineDto> form = dataEntityToForm(ActivitySeineDto.class, preCreated, - ReferenceSetRequestDefinitions.ACTIVITY_SEINE_FORM); + ObserveFormRequests.ACTIVITY_SEINE_FORM); form.getObject().setFloatingObjectEmpty(preCreated.isFloatingObjectEmpty()); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java index 938b503..ae9ba65 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/FloatingObjectServiceTopia.java @@ -27,11 +27,11 @@ import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.entities.seine.FloatingObjectTopiaDao; import fr.ird.observe.services.service.data.seine.FloatingObjectService; import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceSet; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; +import fr.ird.observe.services.ObserveFormRequests; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; @@ -102,7 +102,7 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F return dataEntityToForm(FloatingObjectDto.class, floatingObject, - ReferenceSetRequestDefinitions.FLOATING_OBJECT_FORM); + ObserveFormRequests.FLOATING_OBJECT_FORM); } @Override @@ -115,7 +115,7 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F return dataEntityToForm(FloatingObjectDto.class, floatingObject, - ReferenceSetRequestDefinitions.FLOATING_OBJECT_FORM); + ObserveFormRequests.FLOATING_OBJECT_FORM); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetCatchServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetCatchServiceTopia.java index a49647c..d56d2d4 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetCatchServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetCatchServiceTopia.java @@ -29,9 +29,9 @@ import fr.ird.observe.entities.seine.NonTargetSample; import fr.ird.observe.entities.seine.SetSeine; import fr.ird.observe.services.service.data.seine.NonTargetCatchService; import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.form.Form; +import fr.ird.observe.services.ObserveFormRequests; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.NonTargetCatchDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; @@ -60,7 +60,7 @@ public class NonTargetCatchServiceTopia extends ObserveServiceTopia implements N Form<SetSeineNonTargetCatchDto> form = dataEntityToForm( SetSeineNonTargetCatchDto.class, setSeine, - ReferenceSetRequestDefinitions.SET_SEINE_NON_TARGET_CATCH_FORM + ObserveFormRequests.SET_SEINE_NON_TARGET_CATCH_FORM ); SetSeineNonTargetCatchDto setSeineNonTargetCatchDto = form.getObject(); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetSampleServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetSampleServiceTopia.java index d92dfaa..5724435 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetSampleServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/NonTargetSampleServiceTopia.java @@ -31,11 +31,11 @@ import fr.ird.observe.entities.seine.SetSeine; import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; import fr.ird.observe.services.service.data.seine.NonTargetSampleService; import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.ObserveFormRequests; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.NonTargetSampleDto; @@ -96,7 +96,7 @@ public class NonTargetSampleServiceTopia extends ObserveServiceTopia implements Form<NonTargetSampleDto> form = dataEntityToForm( NonTargetSampleDto.class, nonTargetSample, - ReferenceSetRequestDefinitions.NON_TARGET_SAMPLE_FORM); + ObserveFormRequests.NON_TARGET_SAMPLE_FORM); ReferentialBinderSupport<SpeciesFate, SpeciesFateDto> binder = getReferentialBinder(SpeciesFateDto.class); ReferentialLocale referentialLocale = getReferentialLocale(); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/ObjectObservedSpeciesServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/ObjectObservedSpeciesServiceTopia.java index 8efcde0..dd52b4b 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/ObjectObservedSpeciesServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/ObjectObservedSpeciesServiceTopia.java @@ -25,8 +25,8 @@ package fr.ird.observe.services.topia.service.data.seine; import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.services.service.data.seine.ObjectObservedSpeciesService; import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; +import fr.ird.observe.services.dto.form.Form; +import fr.ird.observe.services.ObserveFormRequests; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; import org.apache.commons.logging.Log; @@ -51,7 +51,7 @@ public class ObjectObservedSpeciesServiceTopia extends ObserveServiceTopia imple return dataEntityToForm( FloatingObjectObservedSpeciesDto.class, floatingObject, - ReferenceSetRequestDefinitions.FLOATING_OBJECT_OBSERVED_SPECIES_FORM); + ObserveFormRequests.FLOATING_OBJECT_OBSERVED_SPECIES_FORM); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/ObjectSchoolEstimateServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/ObjectSchoolEstimateServiceTopia.java index 0ff576b..f7cb552 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/ObjectSchoolEstimateServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/ObjectSchoolEstimateServiceTopia.java @@ -25,8 +25,8 @@ package fr.ird.observe.services.topia.service.data.seine; import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.services.service.data.seine.ObjectSchoolEstimateService; import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; +import fr.ird.observe.services.dto.form.Form; +import fr.ird.observe.services.ObserveFormRequests; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; import org.apache.commons.logging.Log; @@ -51,7 +51,7 @@ public class ObjectSchoolEstimateServiceTopia extends ObserveServiceTopia implem return dataEntityToForm( FloatingObjectSchoolEstimateDto.class, floatingObject, - ReferenceSetRequestDefinitions.FLOATING_OBJECT_SCHOOL_ESTIMATE_FORM + ObserveFormRequests.FLOATING_OBJECT_SCHOOL_ESTIMATE_FORM ); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/RouteServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/RouteServiceTopia.java index e73e5e5..3f5db18 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/RouteServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/RouteServiceTopia.java @@ -35,10 +35,10 @@ import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.entities.seine.TripSeineTopiaDao; import fr.ird.observe.services.service.data.seine.RouteService; import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.binder.data.DataBinderSupport; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceSet; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/SchoolEstimateServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/SchoolEstimateServiceTopia.java index 1874ba7..36a5488 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/SchoolEstimateServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/SchoolEstimateServiceTopia.java @@ -26,8 +26,8 @@ import fr.ird.observe.entities.seine.SchoolEstimate; import fr.ird.observe.entities.seine.SetSeine; import fr.ird.observe.services.service.data.seine.SchoolEstimateService; import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; +import fr.ird.observe.services.dto.form.Form; +import fr.ird.observe.services.ObserveFormRequests; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; import org.apache.commons.logging.Log; @@ -51,7 +51,7 @@ public class SchoolEstimateServiceTopia extends ObserveServiceTopia implements S return dataEntityToForm( SetSeineSchoolEstimateDto.class, setSeine, - ReferenceSetRequestDefinitions.SET_SEINE_SCHOOL_ESTIMATE_FORM + ObserveFormRequests.SET_SEINE_SCHOOL_ESTIMATE_FORM ); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/SetSeineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/SetSeineServiceTopia.java index a5beb6c..bb73280 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/SetSeineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/SetSeineServiceTopia.java @@ -26,10 +26,10 @@ import fr.ird.observe.common.constants.seine.SchoolType; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.Route; import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; +import fr.ird.observe.services.ObserveFormRequests; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; @@ -37,7 +37,7 @@ import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.service.DataNotFoundException; import fr.ird.observe.services.service.data.seine.SetSeineService; import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.topia.binder.data.DataBinderSupport; +import fr.ird.observe.services.binder.data.DataBinderSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; @@ -94,7 +94,7 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein return dataEntityToForm(SetSeineDto.class, setSeine, - ReferenceSetRequestDefinitions.SET_SEINE_FORM); + ObserveFormRequests.SET_SEINE_FORM); } @Override @@ -134,7 +134,7 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein return dataEntityToForm(SetSeineDto.class, preCreated, - ReferenceSetRequestDefinitions.SET_SEINE_FORM); + ObserveFormRequests.SET_SEINE_FORM); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TargetCatchServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TargetCatchServiceTopia.java index 72391e2..4265434 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TargetCatchServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TargetCatchServiceTopia.java @@ -30,9 +30,9 @@ import fr.ird.observe.entities.seine.TargetLength; import fr.ird.observe.entities.seine.TargetSample; import fr.ird.observe.services.service.data.seine.TargetCatchService; import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; -import fr.ird.observe.services.dto.referential.ReferentialReferences; +import fr.ird.observe.services.dto.form.Form; +import fr.ird.observe.services.ObserveFormRequests; +import fr.ird.observe.services.dto.reference.ReferentialReferences; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; import fr.ird.observe.services.dto.seine.TargetCatchDto; @@ -63,7 +63,7 @@ public class TargetCatchServiceTopia extends ObserveServiceTopia implements Targ Form<SetSeineTargetCatchDto> form = dataEntityToForm( SetSeineTargetCatchDto.class, setSeine, - ReferenceSetRequestDefinitions.SET_SEINE_TARGET_CATCH_FORM + ObserveFormRequests.SET_SEINE_TARGET_CATCH_FORM ); SetSeineTargetCatchDto setSeineTargetCatchDto = form.getObject(); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TargetSampleServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TargetSampleServiceTopia.java index e560c40..57fd5ba 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TargetSampleServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TargetSampleServiceTopia.java @@ -32,11 +32,11 @@ import fr.ird.observe.entities.seine.TargetLength; import fr.ird.observe.entities.seine.TargetSample; import fr.ird.observe.services.service.data.seine.TargetSampleService; import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.ObserveFormRequests; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.SetSeineDto; @@ -93,7 +93,7 @@ public class TargetSampleServiceTopia extends ObserveServiceTopia implements Tar return dataEntityToForm( TargetSampleDto.class, targetSample, - ReferenceSetRequestDefinitions.TARGET_SAMPLE_FORM); + ObserveFormRequests.TARGET_SAMPLE_FORM); } @Override diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TransmittingBuoyOperationServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TransmittingBuoyOperationServiceTopia.java index b5ead73..b37be1b 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TransmittingBuoyOperationServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TransmittingBuoyOperationServiceTopia.java @@ -25,8 +25,8 @@ package fr.ird.observe.services.topia.service.data.seine; import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.services.service.data.seine.TransmittingBuoyOperationService; import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; +import fr.ird.observe.services.dto.form.Form; +import fr.ird.observe.services.ObserveFormRequests; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; import org.apache.commons.logging.Log; @@ -51,7 +51,7 @@ public class TransmittingBuoyOperationServiceTopia extends ObserveServiceTopia i return dataEntityToForm( FloatingObjectTransmittingBuoyDto.class, floatingObject, - ReferenceSetRequestDefinitions.FLOATING_OBJECT_TRANSMITTING_BUOY_FORM); + ObserveFormRequests.FLOATING_OBJECT_TRANSMITTING_BUOY_FORM); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineGearUseServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineGearUseServiceTopia.java index 21ced57..2ba9474 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineGearUseServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineGearUseServiceTopia.java @@ -27,8 +27,8 @@ import fr.ird.observe.entities.seine.GearUseFeaturesSeine; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.service.data.seine.TripSeineGearUseService; import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; +import fr.ird.observe.services.dto.form.Form; +import fr.ird.observe.services.ObserveFormRequests; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; import org.apache.commons.logging.Log; @@ -55,7 +55,7 @@ public class TripSeineGearUseServiceTopia extends ObserveServiceTopia implements return dataEntityToForm( TripSeineGearUseDto.class, tripSeine, - ReferenceSetRequestDefinitions.TRIP_SEINE_GEAR_USE_FORM); + ObserveFormRequests.TRIP_SEINE_GEAR_USE_FORM); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopia.java index eb2cf3a..b0b2b4b 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopia.java @@ -32,21 +32,21 @@ import fr.ird.observe.entities.referentiel.Species2; import fr.ird.observe.entities.referentiel.SpeciesList; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.entities.seine.TripSeineTopiaDao; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceList; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceList; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; +import fr.ird.observe.services.ObserveFormRequests; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.data.seine.TripSeineService; import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.topia.service.data.TripMapDtoFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -101,7 +101,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe Form<TripSeineDto> form = dataEntityToForm(TripSeineDto.class, tripSeine, - ReferenceSetRequestDefinitions.TRIP_SEINE_FORM); + ObserveFormRequests.TRIP_SEINE_FORM); TripSeineDto tripSeineDto = form.getObject(); @@ -176,7 +176,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe return dataEntityToForm(TripSeineDto.class, tripSeine, - ReferenceSetRequestDefinitions.TRIP_SEINE_FORM); + ObserveFormRequests.TRIP_SEINE_FORM); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java index 93806cf..4a7b98c 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java @@ -36,16 +36,16 @@ import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.persistence.Entities; import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.DataReferenceSet; -import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.ReferenceMap; +import fr.ird.observe.services.dto.reference.DataReferenceSet; +import fr.ird.observe.services.dto.form.Form; +import fr.ird.observe.services.dto.reference.ReferenceMap; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinition; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; +import fr.ird.observe.services.dto.form.FormRequestDefinition; +import fr.ird.observe.services.ObserveFormRequests; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TripSeineDto; @@ -57,7 +57,7 @@ import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; import fr.ird.observe.services.service.sql.AddSqlScriptProducerResult; import fr.ird.observe.services.service.sql.SqlScriptProducerService; import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport; +import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.topia.service.actions.synchro.referential.sql.ReplaceSqlStatementGenerator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -115,7 +115,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe String requestName = request.getRequestName(); - ReferenceSetRequestDefinition requestDefinition = ReferenceSetRequestDefinitions.get(requestName); + FormRequestDefinition requestDefinition = ObserveFormRequests.get(requestName); ImmutableSet.Builder<ReferentialReferenceSet<?>> resultBuilder = ImmutableSet.builder(); @@ -156,7 +156,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe } ObserveReferentialEntity entity = loadEntity(type, id); - ReferenceSetRequestDefinitions request = ReferenceSetRequestDefinitions.get(type); + ObserveFormRequests request = ObserveFormRequests.get(type); Form<D> form = referentialEntityToForm(type, entity, request); D dto = form.getObject(); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialsShellBuilder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialsShellBuilder.java index a6a25e1..d1ecaa3 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialsShellBuilder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialsShellBuilder.java @@ -30,7 +30,7 @@ import com.google.common.collect.SetMultimap; import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.topia.binder.BinderEngine; +import fr.ird.observe.services.binder.BinderEngine; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityVisitor; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestClassResource.java b/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestClassResource.java index 4b088d2..14979de 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestClassResource.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestClassResource.java @@ -27,9 +27,9 @@ import fr.ird.observe.services.ObserveServiceInitializer; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; -import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; -import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; -import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; +import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto; +import fr.ird.observe.services.dto.source.DataSourceCreateWithNoReferentialImportException; +import fr.ird.observe.services.dto.source.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.dto.ObserveSpeciesListConfiguration; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.service.BabModelVersionException; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java index 363c8f0..df26b54 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java @@ -25,6 +25,7 @@ package fr.ird.observe.services.topia.binder; import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; +import fr.ird.observe.services.binder.BinderEngine; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTestSupport.java b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTestSupport.java index 3150fa1..d1a210b 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTestSupport.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTestSupport.java @@ -27,8 +27,8 @@ import com.google.common.io.Files; import fr.ird.observe.persistence.ObserveTopiaApplicationContext; import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; -import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; -import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; +import fr.ird.observe.services.dto.source.DataSourceCreateWithNoReferentialImportException; +import fr.ird.observe.services.dto.source.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTripLonglineTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTripLonglineTest.java index 3bc778d..2972732 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTripLonglineTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTripLonglineTest.java @@ -23,8 +23,8 @@ package fr.ird.observe.services.topia.entity; */ import com.google.common.collect.ImmutableMap; -import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; -import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; +import fr.ird.observe.services.dto.source.DataSourceCreateWithNoReferentialImportException; +import fr.ird.observe.services.dto.source.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/AbstractServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/AbstractServiceTopiaTest.java index 82fa211..98edee6 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/AbstractServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/AbstractServiceTopiaTest.java @@ -24,10 +24,10 @@ package fr.ird.observe.services.topia.service; import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.ObserveEntity; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/DataSourceServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/DataSourceServiceTopiaTest.java index 78e5148..4b8d1f0 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/DataSourceServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/DataSourceServiceTopiaTest.java @@ -26,9 +26,9 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.persistence.ObserveTopiaApplicationContext; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; -import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; -import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; -import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; +import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto; +import fr.ird.observe.services.dto.source.DataSourceCreateWithNoReferentialImportException; +import fr.ird.observe.services.dto.source.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DataSourceService; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/ReferentialServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/ReferentialServiceTopiaTest.java index 5eb409c..3480a1e 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/ReferentialServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/ReferentialServiceTopiaTest.java @@ -26,14 +26,14 @@ import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.referentiel.LengthWeightParameter; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.LengthWeightParameterDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.service.DataNotFoundException; import fr.ird.observe.services.service.referential.ReferentialService; -import fr.ird.observe.services.topia.binder.BinderEngine; +import fr.ird.observe.services.binder.BinderEngine; import fr.ird.observe.services.topia.service.referential.ReferentialServiceTopia; import fr.ird.observe.test.spi.CopyDatabaseConfiguration; import org.apache.commons.logging.Log; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/RigthTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/RigthTest.java index 7517102..fd979d7 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/RigthTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/RigthTest.java @@ -25,8 +25,8 @@ package fr.ird.observe.services.topia.service; import fr.ird.observe.persistence.migration.ObserveMigrationConfigurationProvider; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; -import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.UnauthorizedException; +import fr.ird.observe.services.dto.form.Form; +import fr.ird.observe.services.security.UnauthorizedException; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.BabModelVersionException; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/AbstractReportServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/AbstractReportServiceTopiaTest.java index d2fbb52..369893d 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/AbstractReportServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/AbstractReportServiceTopiaTest.java @@ -22,11 +22,11 @@ package fr.ird.observe.services.topia.service.actions.report; -import fr.ird.observe.services.dto.AbstractReference; -import fr.ird.observe.services.dto.actions.report.DataMatrix; -import fr.ird.observe.services.dto.actions.report.Report; -import fr.ird.observe.services.dto.actions.report.ReportRequest; -import fr.ird.observe.services.dto.actions.report.ReportVariable; +import fr.ird.observe.services.dto.reference.AbstractReference; +import fr.ird.observe.services.service.actions.report.DataMatrix; +import fr.ird.observe.services.service.actions.report.Report; +import fr.ird.observe.services.service.actions.report.ReportRequest; +import fr.ird.observe.services.service.actions.report.ReportVariable; import fr.ird.observe.services.service.actions.report.ReportBuilder; import fr.ird.observe.services.service.actions.report.ReportService; import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatch2Test.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatch2Test.java index 1d355a5..6a33f2c 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatch2Test.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatch2Test.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.topia.service.actions.report; -import fr.ird.observe.services.dto.actions.report.DataMatrix; +import fr.ird.observe.services.service.actions.report.DataMatrix; /** * Test du report {@code discardedAccessoire}. diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchByGroup2Test.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchByGroup2Test.java index b0994e6..b47ff26 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchByGroup2Test.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchByGroup2Test.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.topia.service.actions.report; -import fr.ird.observe.services.dto.actions.report.DataMatrix; +import fr.ird.observe.services.service.actions.report.DataMatrix; /** * Pour tester le report {@code discardedAccessoireByGroup} diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchByGroupTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchByGroupTest.java index 2f54732..4531f08 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchByGroupTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchByGroupTest.java @@ -21,9 +21,9 @@ */ package fr.ird.observe.services.topia.service.actions.report; -import fr.ird.observe.services.dto.actions.report.DataMatrix; -import fr.ird.observe.services.dto.actions.report.Report; -import fr.ird.observe.services.dto.actions.report.ReportRequest; +import fr.ird.observe.services.service.actions.report.DataMatrix; +import fr.ird.observe.services.service.actions.report.Report; +import fr.ird.observe.services.service.actions.report.ReportRequest; import org.junit.Assert; /** diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchTest.java index 7cbf3aa..a4b1684 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchTest.java @@ -22,9 +22,9 @@ package fr.ird.observe.services.topia.service.actions.report; -import fr.ird.observe.services.dto.actions.report.DataMatrix; -import fr.ird.observe.services.dto.actions.report.Report; -import fr.ird.observe.services.dto.actions.report.ReportRequest; +import fr.ird.observe.services.service.actions.report.DataMatrix; +import fr.ird.observe.services.service.actions.report.Report; +import fr.ird.observe.services.service.actions.report.ReportRequest; import org.junit.Assert; /** diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportActivityWithCommentTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportActivityWithCommentTest.java index 915e25c..c313ec2 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportActivityWithCommentTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportActivityWithCommentTest.java @@ -21,9 +21,9 @@ */ package fr.ird.observe.services.topia.service.actions.report; -import fr.ird.observe.services.dto.actions.report.DataMatrix; -import fr.ird.observe.services.dto.actions.report.Report; -import fr.ird.observe.services.dto.actions.report.ReportRequest; +import fr.ird.observe.services.service.actions.report.DataMatrix; +import fr.ird.observe.services.service.actions.report.Report; +import fr.ird.observe.services.service.actions.report.ReportRequest; import org.junit.Assert; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAllActivitysTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAllActivitysTest.java index 6ab8522..b151476 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAllActivitysTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAllActivitysTest.java @@ -22,9 +22,9 @@ package fr.ird.observe.services.topia.service.actions.report; * #L% */ -import fr.ird.observe.services.dto.actions.report.DataMatrix; -import fr.ird.observe.services.dto.actions.report.Report; -import fr.ird.observe.services.dto.actions.report.ReportRequest; +import fr.ird.observe.services.service.actions.report.DataMatrix; +import fr.ird.observe.services.service.actions.report.Report; +import fr.ird.observe.services.service.actions.report.ReportRequest; import org.junit.Assert; /** diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportDailySetAndCatchTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportDailySetAndCatchTest.java index eb24b77..70add1b 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportDailySetAndCatchTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportDailySetAndCatchTest.java @@ -22,9 +22,9 @@ package fr.ird.observe.services.topia.service.actions.report; -import fr.ird.observe.services.dto.actions.report.DataMatrix; -import fr.ird.observe.services.dto.actions.report.Report; -import fr.ird.observe.services.dto.actions.report.ReportRequest; +import fr.ird.observe.services.service.actions.report.DataMatrix; +import fr.ird.observe.services.service.actions.report.Report; +import fr.ird.observe.services.service.actions.report.ReportRequest; import org.junit.Assert; /** diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportDcpUsageTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportDcpUsageTest.java index 36b6156..b28450a 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportDcpUsageTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportDcpUsageTest.java @@ -21,9 +21,9 @@ */ package fr.ird.observe.services.topia.service.actions.report; -import fr.ird.observe.services.dto.actions.report.DataMatrix; -import fr.ird.observe.services.dto.actions.report.Report; -import fr.ird.observe.services.dto.actions.report.ReportRequest; +import fr.ird.observe.services.service.actions.report.DataMatrix; +import fr.ird.observe.services.service.actions.report.Report; +import fr.ird.observe.services.service.actions.report.ReportRequest; import org.junit.Assert; /** diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportSeineEquipmentsTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportSeineEquipmentsTest.java index 8d21ab9..4daf00c 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportSeineEquipmentsTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportSeineEquipmentsTest.java @@ -22,9 +22,9 @@ package fr.ird.observe.services.topia.service.actions.report; -import fr.ird.observe.services.dto.actions.report.DataMatrix; -import fr.ird.observe.services.dto.actions.report.Report; -import fr.ird.observe.services.dto.actions.report.ReportRequest; +import fr.ird.observe.services.service.actions.report.DataMatrix; +import fr.ird.observe.services.service.actions.report.Report; +import fr.ird.observe.services.service.actions.report.ReportRequest; import org.junit.Assert; /** diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportSetByAssociationTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportSetByAssociationTest.java index a9bb1ff..9ced831 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportSetByAssociationTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportSetByAssociationTest.java @@ -21,9 +21,9 @@ */ package fr.ird.observe.services.topia.service.actions.report; -import fr.ird.observe.services.dto.actions.report.DataMatrix; -import fr.ird.observe.services.dto.actions.report.Report; -import fr.ird.observe.services.dto.actions.report.ReportRequest; +import fr.ird.observe.services.service.actions.report.DataMatrix; +import fr.ird.observe.services.service.actions.report.Report; +import fr.ird.observe.services.service.actions.report.ReportRequest; import org.junit.Assert; /** diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportTargetCatchByAssociationTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportTargetCatchByAssociationTest.java index a68d3e6..e80f643 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportTargetCatchByAssociationTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportTargetCatchByAssociationTest.java @@ -21,9 +21,9 @@ */ package fr.ird.observe.services.topia.service.actions.report; -import fr.ird.observe.services.dto.actions.report.DataMatrix; -import fr.ird.observe.services.dto.actions.report.Report; -import fr.ird.observe.services.dto.actions.report.ReportRequest; +import fr.ird.observe.services.service.actions.report.DataMatrix; +import fr.ird.observe.services.service.actions.report.Report; +import fr.ird.observe.services.service.actions.report.ReportRequest; import org.junit.Assert; /** diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportTargetDiscardedByAssociationTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportTargetDiscardedByAssociationTest.java index 0afc915..ca83060 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportTargetDiscardedByAssociationTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportTargetDiscardedByAssociationTest.java @@ -21,9 +21,9 @@ */ package fr.ird.observe.services.topia.service.actions.report; -import fr.ird.observe.services.dto.actions.report.DataMatrix; -import fr.ird.observe.services.dto.actions.report.Report; -import fr.ird.observe.services.dto.actions.report.ReportRequest; +import fr.ird.observe.services.service.actions.report.DataMatrix; +import fr.ird.observe.services.service.actions.report.Report; +import fr.ird.observe.services.service.actions.report.ReportRequest; import org.junit.Assert; /** diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java index a72fe20..13c2a2d 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java @@ -38,7 +38,7 @@ import fr.ird.observe.services.service.actions.synchro.referential.legacy.Unidir import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeResult; import fr.ird.observe.services.topia.TopiaTestClassResource; import fr.ird.observe.services.topia.TopiaTestMethodResource; -import fr.ird.observe.services.topia.binder.BinderEngine; +import fr.ird.observe.services.binder.BinderEngine; import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.ObserveTestConfiguration; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/TripManagementServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/TripManagementServiceTopiaTest.java index 1093099..a32439e 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/TripManagementServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/TripManagementServiceTopiaTest.java @@ -24,10 +24,10 @@ package fr.ird.observe.services.topia.service.data; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; -import fr.ird.observe.services.dto.DataReferenceList; -import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; -import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; -import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; +import fr.ird.observe.services.dto.reference.DataReferenceList; +import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto; +import fr.ird.observe.services.dto.source.DataSourceCreateWithNoReferentialImportException; +import fr.ird.observe.services.dto.source.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DataSourceService; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineDetailCompositionServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineDetailCompositionServiceTopiaTest.java index c13c004..b38e46a 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineDetailCompositionServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineDetailCompositionServiceTopiaTest.java @@ -26,12 +26,12 @@ import fr.ird.observe.entities.longline.Basket; import fr.ird.observe.entities.longline.Branchline; import fr.ird.observe.entities.longline.Section; import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto; import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/RouteServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/RouteServiceTopiaTest.java index e6953fa..491fa29 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/RouteServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/RouteServiceTopiaTest.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.topia.service.data.seine; * #L% */ -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.service.data.seine.RouteService; import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TargetSampleServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TargetSampleServiceTopiaTest.java index c69a980..97f6ba1 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TargetSampleServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TargetSampleServiceTopiaTest.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.topia.service.data.seine; * #L% */ -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.seine.TargetSampleDto; import fr.ird.observe.services.service.data.seine.TargetSampleService; import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TripSeineGearUseServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TripSeineGearUseServiceTopiaTest.java index 7a28eaa..3bb5401 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TripSeineGearUseServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TripSeineGearUseServiceTopiaTest.java @@ -25,7 +25,7 @@ package fr.ird.observe.services.topia.service.data.seine; import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; import fr.ird.observe.entities.seine.GearUseFeaturesSeine; import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopiaTest.java index 774d0c8..3bc0740 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopiaTest.java @@ -23,9 +23,8 @@ package fr.ird.observe.services.topia.service.data.seine; */ import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceList; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReferenceList; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.referential.HarbourDto; import fr.ird.observe.services.dto.referential.OceanDto; import fr.ird.observe.services.dto.referential.PersonDto; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/sql/MigrateTestsDatabases.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/sql/MigrateTestsDatabases.java index 4556dad..159100f 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/sql/MigrateTestsDatabases.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/sql/MigrateTestsDatabases.java @@ -22,8 +22,8 @@ package fr.ird.observe.services.topia.service.sql; * #L% */ -import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; -import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; +import fr.ird.observe.services.dto.source.DataSourceCreateWithNoReferentialImportException; +import fr.ird.observe.services.dto.source.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DataSourceService; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; diff --git a/services-topia/src/test/resources/validators.xml b/services-topia/src/test/resources/validators.xml index a099d3e..8cc8f67 100644 --- a/services-topia/src/test/resources/validators.xml +++ b/services-topia/src/test/resources/validators.xml @@ -52,15 +52,15 @@ <validator name="fieldexpressionwithparams" class="org.nuiton.validator.xwork2.field.FieldExpressionWithParamsValidator"/> <!-- Les validateurs spécifique aux entitées dans observe --> - <validator name="observeCollectionUniqueKey" class="fr.ird.observe.services.topia.validators.ObserveCollectionUniqueKeyValidator"/> - <validator name="collectionUniqueKey" class="fr.ird.observe.services.topia.validators.CollectionUniqueKeyValidator2"/> - <validator name="species_length" class="fr.ird.observe.services.topia.validators.SpeciesLengthFieldValidator"/> - <validator name="species_weight" class="fr.ird.observe.services.topia.validators.SpeciesWeightFieldValidator"/> - <validator name="activitySpeed" class="fr.ird.observe.services.topia.validators.ActivitySpeedValidator"/> - <validator name="activitySimpleSpeed" class="fr.ird.observe.services.topia.validators.ActivitySimpleSpeedValidator"/> - <validator name="activityFinDeVeilleExists" class="fr.ird.observe.services.topia.validators.ActivityFinDeVeilleExistsValidator"/> - <validator name="setLonglineUniqueHomeId" class="fr.ird.observe.services.topia.validators.SetLonglineUniqueHomeIdValidator"/> - <validator name="setLonglineUniqueNumber" class="fr.ird.observe.services.topia.validators.SetLonglineUniqueNumberValidator"/> - <validator name="quadrant" class="fr.ird.observe.services.topia.validators.QuadrantFieldValidator"/> + <validator name="observeCollectionUniqueKey" class="fr.ird.observe.services.validators.ObserveCollectionUniqueKeyValidator"/> + <validator name="collectionUniqueKey" class="fr.ird.observe.services.validators.CollectionUniqueKeyValidator2"/> + <validator name="species_length" class="fr.ird.observe.services.validators.SpeciesLengthFieldValidator"/> + <validator name="species_weight" class="fr.ird.observe.services.validators.SpeciesWeightFieldValidator"/> + <validator name="activitySpeed" class="fr.ird.observe.services.validators.ActivitySpeedValidator"/> + <validator name="activitySimpleSpeed" class="fr.ird.observe.services.validators.ActivitySimpleSpeedValidator"/> + <validator name="activityFinDeVeilleExists" class="fr.ird.observe.services.validators.ActivityFinDeVeilleExistsValidator"/> + <validator name="setLonglineUniqueHomeId" class="fr.ird.observe.services.validators.SetLonglineUniqueHomeIdValidator"/> + <validator name="setLonglineUniqueNumber" class="fr.ird.observe.services.validators.SetLonglineUniqueNumberValidator"/> + <validator name="quadrant" class="fr.ird.observe.services.validators.QuadrantFieldValidator"/> </validators> diff --git a/services-validation/src/test/resources/validators.xml b/services-validation/src/test/resources/validators.xml index 544d7b1..d8361ae 100644 --- a/services-validation/src/test/resources/validators.xml +++ b/services-validation/src/test/resources/validators.xml @@ -52,15 +52,15 @@ <validator name="fieldexpressionwithparams" class="org.nuiton.validator.xwork2.field.FieldExpressionWithParamsValidator"/> <!-- Les validateurs spécifique aux entitées dans observe --> - <validator name="observeCollectionUniqueKey" class="fr.ird.observe.services.topia.validators.ObserveCollectionUniqueKeyValidator"/> - <validator name="collectionUniqueKey" class="fr.ird.observe.services.topia.validators.CollectionUniqueKeyValidator2"/> - <validator name="species_length" class="fr.ird.observe.services.topia.validators.SpeciesLengthFieldValidator"/> - <validator name="species_weight" class="fr.ird.observe.services.topia.validators.SpeciesWeightFieldValidator"/> - <validator name="activitySpeed" class="fr.ird.observe.services.topia.validators.ActivitySpeedValidator"/> - <validator name="activitySimpleSpeed" class="fr.ird.observe.services.topia.validators.ActivitySimpleSpeedValidator"/> - <validator name="activityFinDeVeilleExists" class="fr.ird.observe.services.topia.validators.ActivityFinDeVeilleExistsValidator"/> - <validator name="setLonglineUniqueHomeId" class="fr.ird.observe.services.topia.validators.SetLonglineUniqueHomeIdValidator"/> - <validator name="setLonglineUniqueNumber" class="fr.ird.observe.services.topia.validators.SetLonglineUniqueNumberValidator"/> - <validator name="quadrant" class="fr.ird.observe.services.topia.validators.QuadrantFieldValidator"/> + <validator name="observeCollectionUniqueKey" class="fr.ird.observe.services.validators.ObserveCollectionUniqueKeyValidator"/> + <validator name="collectionUniqueKey" class="fr.ird.observe.services.validators.CollectionUniqueKeyValidator2"/> + <validator name="species_length" class="fr.ird.observe.services.validators.SpeciesLengthFieldValidator"/> + <validator name="species_weight" class="fr.ird.observe.services.validators.SpeciesWeightFieldValidator"/> + <validator name="activitySpeed" class="fr.ird.observe.services.validators.ActivitySpeedValidator"/> + <validator name="activitySimpleSpeed" class="fr.ird.observe.services.validators.ActivitySimpleSpeedValidator"/> + <validator name="activityFinDeVeilleExists" class="fr.ird.observe.services.validators.ActivityFinDeVeilleExistsValidator"/> + <validator name="setLonglineUniqueHomeId" class="fr.ird.observe.services.validators.SetLonglineUniqueHomeIdValidator"/> + <validator name="setLonglineUniqueNumber" class="fr.ird.observe.services.validators.SetLonglineUniqueNumberValidator"/> + <validator name="quadrant" class="fr.ird.observe.services.validators.QuadrantFieldValidator"/> </validators> diff --git a/services-validators/src/main/java/fr/ird/observe/services/topia/validators/AbstractSpeciesFieldValidator.java b/services-validators/src/main/java/fr/ird/observe/services/validators/AbstractSpeciesFieldValidator.java similarity index 99% rename from services-validators/src/main/java/fr/ird/observe/services/topia/validators/AbstractSpeciesFieldValidator.java rename to services-validators/src/main/java/fr/ird/observe/services/validators/AbstractSpeciesFieldValidator.java index f794f17..f22af0b 100644 --- a/services-validators/src/main/java/fr/ird/observe/services/topia/validators/AbstractSpeciesFieldValidator.java +++ b/services-validators/src/main/java/fr/ird/observe/services/validators/AbstractSpeciesFieldValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.validators; +package fr.ird.observe.services.validators; /* * #%L diff --git a/services-validators/src/main/java/fr/ird/observe/services/topia/validators/ActivityFinDeVeilleExistsValidator.java b/services-validators/src/main/java/fr/ird/observe/services/validators/ActivityFinDeVeilleExistsValidator.java similarity index 99% rename from services-validators/src/main/java/fr/ird/observe/services/topia/validators/ActivityFinDeVeilleExistsValidator.java rename to services-validators/src/main/java/fr/ird/observe/services/validators/ActivityFinDeVeilleExistsValidator.java index a224a9b..6657e98 100644 --- a/services-validators/src/main/java/fr/ird/observe/services/topia/validators/ActivityFinDeVeilleExistsValidator.java +++ b/services-validators/src/main/java/fr/ird/observe/services/validators/ActivityFinDeVeilleExistsValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.validators; +package fr.ird.observe.services.validators; /* * #%L diff --git a/services-validators/src/main/java/fr/ird/observe/services/topia/validators/ActivitySimpleSpeedValidator.java b/services-validators/src/main/java/fr/ird/observe/services/validators/ActivitySimpleSpeedValidator.java similarity index 99% rename from services-validators/src/main/java/fr/ird/observe/services/topia/validators/ActivitySimpleSpeedValidator.java rename to services-validators/src/main/java/fr/ird/observe/services/validators/ActivitySimpleSpeedValidator.java index ddacea2..37ec74e 100644 --- a/services-validators/src/main/java/fr/ird/observe/services/topia/validators/ActivitySimpleSpeedValidator.java +++ b/services-validators/src/main/java/fr/ird/observe/services/validators/ActivitySimpleSpeedValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.validators; +package fr.ird.observe.services.validators; /* * #%L diff --git a/services-validators/src/main/java/fr/ird/observe/services/topia/validators/ActivitySpeedValidator.java b/services-validators/src/main/java/fr/ird/observe/services/validators/ActivitySpeedValidator.java similarity index 99% rename from services-validators/src/main/java/fr/ird/observe/services/topia/validators/ActivitySpeedValidator.java rename to services-validators/src/main/java/fr/ird/observe/services/validators/ActivitySpeedValidator.java index 47f723d..4890777 100644 --- a/services-validators/src/main/java/fr/ird/observe/services/topia/validators/ActivitySpeedValidator.java +++ b/services-validators/src/main/java/fr/ird/observe/services/validators/ActivitySpeedValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.validators; +package fr.ird.observe.services.validators; /* * #%L diff --git a/services-validators/src/main/java/fr/ird/observe/services/topia/validators/CollectionUniqueKeyValidator2.java b/services-validators/src/main/java/fr/ird/observe/services/validators/CollectionUniqueKeyValidator2.java similarity index 96% rename from services-validators/src/main/java/fr/ird/observe/services/topia/validators/CollectionUniqueKeyValidator2.java rename to services-validators/src/main/java/fr/ird/observe/services/validators/CollectionUniqueKeyValidator2.java index ab4d701..f62c2e3 100644 --- a/services-validators/src/main/java/fr/ird/observe/services/topia/validators/CollectionUniqueKeyValidator2.java +++ b/services-validators/src/main/java/fr/ird/observe/services/validators/CollectionUniqueKeyValidator2.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.validators; +package fr.ird.observe.services.validators; /* * #%L diff --git a/services-validators/src/main/java/fr/ird/observe/services/topia/validators/ObserveCollectionUniqueKeyValidator.java b/services-validators/src/main/java/fr/ird/observe/services/validators/ObserveCollectionUniqueKeyValidator.java similarity index 99% rename from services-validators/src/main/java/fr/ird/observe/services/topia/validators/ObserveCollectionUniqueKeyValidator.java rename to services-validators/src/main/java/fr/ird/observe/services/validators/ObserveCollectionUniqueKeyValidator.java index fd40fed..c4ca3b8 100644 --- a/services-validators/src/main/java/fr/ird/observe/services/topia/validators/ObserveCollectionUniqueKeyValidator.java +++ b/services-validators/src/main/java/fr/ird/observe/services/validators/ObserveCollectionUniqueKeyValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.validators; +package fr.ird.observe.services.validators; /* * #%L diff --git a/services-validators/src/main/java/fr/ird/observe/services/topia/validators/QuadrantFieldValidator.java b/services-validators/src/main/java/fr/ird/observe/services/validators/QuadrantFieldValidator.java similarity index 97% rename from services-validators/src/main/java/fr/ird/observe/services/topia/validators/QuadrantFieldValidator.java rename to services-validators/src/main/java/fr/ird/observe/services/validators/QuadrantFieldValidator.java index e6854cf..92956d0 100644 --- a/services-validators/src/main/java/fr/ird/observe/services/topia/validators/QuadrantFieldValidator.java +++ b/services-validators/src/main/java/fr/ird/observe/services/validators/QuadrantFieldValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.validators; +package fr.ird.observe.services.validators; /*- * #%L diff --git a/services-validators/src/main/java/fr/ird/observe/services/topia/validators/SetLonglineUniqueHomeIdValidator.java b/services-validators/src/main/java/fr/ird/observe/services/validators/SetLonglineUniqueHomeIdValidator.java similarity index 98% rename from services-validators/src/main/java/fr/ird/observe/services/topia/validators/SetLonglineUniqueHomeIdValidator.java rename to services-validators/src/main/java/fr/ird/observe/services/validators/SetLonglineUniqueHomeIdValidator.java index 1620072..a86679e 100644 --- a/services-validators/src/main/java/fr/ird/observe/services/topia/validators/SetLonglineUniqueHomeIdValidator.java +++ b/services-validators/src/main/java/fr/ird/observe/services/validators/SetLonglineUniqueHomeIdValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.validators; +package fr.ird.observe.services.validators; /* * #%L diff --git a/services-validators/src/main/java/fr/ird/observe/services/topia/validators/SetLonglineUniqueNumberValidator.java b/services-validators/src/main/java/fr/ird/observe/services/validators/SetLonglineUniqueNumberValidator.java similarity index 98% rename from services-validators/src/main/java/fr/ird/observe/services/topia/validators/SetLonglineUniqueNumberValidator.java rename to services-validators/src/main/java/fr/ird/observe/services/validators/SetLonglineUniqueNumberValidator.java index 1fa9f4e..ad2f803 100644 --- a/services-validators/src/main/java/fr/ird/observe/services/topia/validators/SetLonglineUniqueNumberValidator.java +++ b/services-validators/src/main/java/fr/ird/observe/services/validators/SetLonglineUniqueNumberValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.validators; +package fr.ird.observe.services.validators; /* * #%L diff --git a/services-validators/src/main/java/fr/ird/observe/services/topia/validators/SpeciesLengthFieldValidator.java b/services-validators/src/main/java/fr/ird/observe/services/validators/SpeciesLengthFieldValidator.java similarity index 96% rename from services-validators/src/main/java/fr/ird/observe/services/topia/validators/SpeciesLengthFieldValidator.java rename to services-validators/src/main/java/fr/ird/observe/services/validators/SpeciesLengthFieldValidator.java index d8bd0bc..cd32a52 100644 --- a/services-validators/src/main/java/fr/ird/observe/services/topia/validators/SpeciesLengthFieldValidator.java +++ b/services-validators/src/main/java/fr/ird/observe/services/validators/SpeciesLengthFieldValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.validators; +package fr.ird.observe.services.validators; /* * #%L diff --git a/services-validators/src/main/java/fr/ird/observe/services/topia/validators/SpeciesWeightFieldValidator.java b/services-validators/src/main/java/fr/ird/observe/services/validators/SpeciesWeightFieldValidator.java similarity index 96% rename from services-validators/src/main/java/fr/ird/observe/services/topia/validators/SpeciesWeightFieldValidator.java rename to services-validators/src/main/java/fr/ird/observe/services/validators/SpeciesWeightFieldValidator.java index 73e0436..e0814bb 100644 --- a/services-validators/src/main/java/fr/ird/observe/services/topia/validators/SpeciesWeightFieldValidator.java +++ b/services-validators/src/main/java/fr/ird/observe/services/validators/SpeciesWeightFieldValidator.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.topia.validators; +package fr.ird.observe.services.validators; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java b/services/src/main/java/fr/ird/observe/services/ObserveDataReferenceSets.java similarity index 97% rename from services/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java rename to services/src/main/java/fr/ird/observe/services/ObserveDataReferenceSets.java index 50eed12..9a46562 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java +++ b/services/src/main/java/fr/ird/observe/services/ObserveDataReferenceSets.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.reference; +package fr.ird.observe.services; /*- * #%L @@ -24,7 +24,7 @@ package fr.ird.observe.services.dto.reference; import com.google.common.base.Preconditions; import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; @@ -55,7 +55,8 @@ import fr.ird.observe.services.dto.longline.TripLonglineActivityDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineGearUseDto; import fr.ird.observe.services.dto.longline.WeightMeasureDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; @@ -95,7 +96,7 @@ import java.util.TreeMap; * * @author Tony Chemit - dev@tchemit.fr */ -public enum DataReferenceSetDefinitions { +public enum ObserveDataReferenceSets { // -------------------------------------------------------------------------------------------------------------- // // -- SEINE ----------------------------------------------------------------------------------------------------- // @@ -280,7 +281,7 @@ public enum DataReferenceSetDefinitions { static { - for (DataReferenceSetDefinitions definitions : DataReferenceSetDefinitions.values()) { + for (ObserveDataReferenceSets definitions : ObserveDataReferenceSets.values()) { ReferenceSetDefinition<? extends DataDto> definition = definitions.getDefinition(); @@ -312,7 +313,7 @@ public enum DataReferenceSetDefinitions { return referenceSetDefinition; } - DataReferenceSetDefinitions(ReferenceSetDefinition.Builder builder) { + ObserveDataReferenceSets(ReferenceSetDefinition.Builder builder) { this.definition = builder.build(); } diff --git a/services/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java b/services/src/main/java/fr/ird/observe/services/ObserveFormRequests.java similarity index 77% rename from services/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java rename to services/src/main/java/fr/ird/observe/services/ObserveFormRequests.java index d19ab15..b36afaf 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinitions.java +++ b/services/src/main/java/fr/ird/observe/services/ObserveFormRequests.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.reference.request; +package fr.ird.observe.services; /*- * #%L @@ -23,6 +23,7 @@ package fr.ird.observe.services.dto.reference.request; */ import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.form.FormRequestDefinition; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.BaitsCompositionDto; import fr.ird.observe.services.dto.longline.BranchlineDto; @@ -41,7 +42,6 @@ import fr.ird.observe.services.dto.longline.SizeMeasureDto; import fr.ird.observe.services.dto.longline.TdrDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.longline.WeightMeasureDto; -import fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions; import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.FpaZoneDto; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; @@ -118,67 +118,67 @@ import fr.ird.observe.services.dto.seine.TargetLengthDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.BAIT_HAULING_STATUS; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.BAIT_SETTING_STATUS; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.BAIT_TYPE; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.CATCH_FATE_LONGLINE; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.COUNTRY; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.DETECTION_MODE; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.ENCOUNTER_TYPE; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.FPA_ZONE; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.GEAR; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.GEAR_CARACTERISTIC; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.GEAR_CARACTERISTIC_TYPE; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.HARBOUR; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.HEALTHNESS; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.HOOK_POSITION; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.HOOK_SIZE; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.HOOK_TYPE; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.ITEM_HORIZONTAL_POSITION; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.ITEM_VERTICAL_POSITION; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.LENGTH_LENGTH_PARAMETER; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.LENGTH_WEIGHT_PARAMETER; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.LIGHTSTICKS_COLOR; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.LIGHTSTICKS_TYPE; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.LINE_TYPE; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.MATURITY_STATUS; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.MITIGATION_TYPE; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.OBJECT_FATE; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.OBJECT_OPERATION; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.OBJECT_TYPE; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.OBSERVED_SYSTEM; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.OCEAN; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.ORGANISM; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.PERSON; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.PROGRAM; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.REASON_FOR_DISCARD; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.REASON_FOR_NO_FISHING; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.REASON_FOR_NULL_SET; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.SENSOR_BRAND; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.SENSOR_DATA_FORMAT; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.SENSOR_TYPE; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.SETTING_SHAPE; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.SEX; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.SHIP_OWNER; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.SIZE_MEASURE_TYPE; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.SPECIES; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.SPECIES_FATE; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.SPECIES_GROUP; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.SPECIES_LIST; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.SPECIES_STATUS; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.STOMAC_FULLNESS; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.SURROUNDING_ACTIVITY; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.TRANSMITTING_BUOY_OPERATION; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.TRANSMITTING_BUOY_TYPE; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.TRIP_TYPE; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.VESSEL; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.VESSEL_ACTIVITY_LONGLINE; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.VESSEL_ACTIVITY_SEINE; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.VESSEL_SIZE_CATEGORY; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.VESSEL_TYPE; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.WEIGHT_CATEGORY; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.WEIGHT_MEASURE_TYPE; -import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions.WIND; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.BAIT_HAULING_STATUS; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.BAIT_SETTING_STATUS; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.BAIT_TYPE; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.CATCH_FATE_LONGLINE; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.COUNTRY; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.DETECTION_MODE; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.ENCOUNTER_TYPE; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.FPA_ZONE; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.GEAR; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.GEAR_CARACTERISTIC; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.GEAR_CARACTERISTIC_TYPE; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.HARBOUR; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.HEALTHNESS; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.HOOK_POSITION; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.HOOK_SIZE; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.HOOK_TYPE; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.ITEM_HORIZONTAL_POSITION; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.ITEM_VERTICAL_POSITION; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.LENGTH_LENGTH_PARAMETER; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.LENGTH_WEIGHT_PARAMETER; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.LIGHTSTICKS_COLOR; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.LIGHTSTICKS_TYPE; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.LINE_TYPE; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.MATURITY_STATUS; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.MITIGATION_TYPE; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.OBJECT_FATE; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.OBJECT_OPERATION; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.OBJECT_TYPE; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.OBSERVED_SYSTEM; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.OCEAN; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.ORGANISM; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.PERSON; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.PROGRAM; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.REASON_FOR_DISCARD; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.REASON_FOR_NO_FISHING; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.REASON_FOR_NULL_SET; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.SENSOR_BRAND; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.SENSOR_DATA_FORMAT; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.SENSOR_TYPE; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.SETTING_SHAPE; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.SEX; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.SHIP_OWNER; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.SIZE_MEASURE_TYPE; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.SPECIES; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.SPECIES_FATE; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.SPECIES_GROUP; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.SPECIES_LIST; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.SPECIES_STATUS; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.STOMAC_FULLNESS; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.SURROUNDING_ACTIVITY; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.TRANSMITTING_BUOY_OPERATION; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.TRANSMITTING_BUOY_TYPE; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.TRIP_TYPE; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.VESSEL; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.VESSEL_ACTIVITY_LONGLINE; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.VESSEL_ACTIVITY_SEINE; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.VESSEL_SIZE_CATEGORY; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.VESSEL_TYPE; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.WEIGHT_CATEGORY; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.WEIGHT_MEASURE_TYPE; +import static fr.ird.observe.services.ObserveReferentialReferenceSets.WIND; /** * Contient les définitions de tous les requêtes que les services proposent. @@ -190,7 +190,7 @@ import static fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefin * * @author Tony Chemit - dev@tchemit.fr */ -public enum ReferenceSetRequestDefinitions { +public enum ObserveFormRequests { // LONGLINE DATA @@ -487,27 +487,27 @@ public enum ReferenceSetRequestDefinitions { .addKey(WeightCategoryDto.PROPERTY_SPECIES, SPECIES)), WIND_FORM(newReferentialBuilder(WindDto.class, WIND)); - private final ReferenceSetRequestDefinition definition; + private final FormRequestDefinition definition; - private static ReferenceSetRequestDefinition.Builder newBuilder(Class<? extends IdDto> type) { - return new ReferenceSetRequestDefinition.Builder(type); + private static FormRequestDefinition.Builder newBuilder(Class<? extends IdDto> type) { + return new FormRequestDefinition.Builder(type); } - private static ReferenceSetRequestDefinition.Builder newReferentialBuilder(Class<? extends ReferentialDto> type, ReferentialReferenceSetDefinitions propertyDefinition) { - return new ReferenceSetRequestDefinition.Builder(type).addKey("referentialListHeader", propertyDefinition); + private static FormRequestDefinition.Builder newReferentialBuilder(Class<? extends ReferentialDto> type, ObserveReferentialReferenceSets propertyDefinition) { + return new FormRequestDefinition.Builder(type).addKey("referentialListHeader", propertyDefinition); } - ReferenceSetRequestDefinitions(ReferenceSetRequestDefinition.Builder definitionBuilder) { + ObserveFormRequests(FormRequestDefinition.Builder definitionBuilder) { this.definition = definitionBuilder.build(); } - public ReferenceSetRequestDefinition getDefinition() { + public FormRequestDefinition getDefinition() { return definition; } - public static ReferenceSetRequestDefinition get(String definitionName) { + public static FormRequestDefinition get(String definitionName) { - ReferenceSetRequestDefinitions requestDefinitions = valueOf(definitionName); + ObserveFormRequests requestDefinitions = valueOf(definitionName); if (requestDefinitions == null) { throw new IllegalArgumentException("No definition with name " + definitionName + " registred"); } @@ -516,11 +516,11 @@ public enum ReferenceSetRequestDefinitions { } - public static ReferenceSetRequestDefinitions get(Class<? extends IdDto> type) { + public static ObserveFormRequests get(Class<? extends IdDto> type) { - ReferenceSetRequestDefinitions requestDefinitions = null; + ObserveFormRequests requestDefinitions = null; - for (ReferenceSetRequestDefinitions definitions : values()) { + for (ObserveFormRequests definitions : values()) { if (type.equals(definitions.getDefinition().getType())) { requestDefinitions = definitions; break; diff --git a/services/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java b/services/src/main/java/fr/ird/observe/services/ObserveReferentialReferenceSets.java similarity index 98% rename from services/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java rename to services/src/main/java/fr/ird/observe/services/ObserveReferentialReferenceSets.java index 16c9dfa..bb456ec 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java +++ b/services/src/main/java/fr/ird/observe/services/ObserveReferentialReferenceSets.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.reference; +package fr.ird.observe.services; /*- * #%L @@ -23,6 +23,7 @@ package fr.ird.observe.services.dto.reference; */ import fr.ird.observe.common.constants.GearType; +import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.FpaZoneDto; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; @@ -98,7 +99,7 @@ import java.util.TreeMap; * * @author Tony Chemit - dev@tchemit.fr */ -public enum ReferentialReferenceSetDefinitions { +public enum ObserveReferentialReferenceSets { // -------------------------------------------------------------------------------------------------------------- // // -- REFERENTIAL COMMON ---------------------------------------------------------------------------------------- // @@ -278,7 +279,7 @@ public enum ReferentialReferenceSetDefinitions { static { - for (ReferentialReferenceSetDefinitions definitions : ReferentialReferenceSetDefinitions.values()) { + for (ObserveReferentialReferenceSets definitions : ObserveReferentialReferenceSets.values()) { ReferenceSetDefinition<? extends ReferentialDto> definition = definitions.getDefinition(); MAPPING.put(definition.getType().getName(), definition); @@ -318,7 +319,7 @@ public enum ReferentialReferenceSetDefinitions { return builder; } - ReferentialReferenceSetDefinitions(ReferenceSetDefinition.Builder definition) { + ObserveReferentialReferenceSets(ReferenceSetDefinition.Builder definition) { this.definition = definition.build(); } diff --git a/services/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngine.java b/services/src/main/java/fr/ird/observe/services/binder/ReferenceBinderEngine.java similarity index 89% rename from services/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngine.java rename to services/src/main/java/fr/ird/observe/services/binder/ReferenceBinderEngine.java index 2ffb8ff..d7e44cd 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngine.java +++ b/services/src/main/java/fr/ird/observe/services/binder/ReferenceBinderEngine.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.reference; +package fr.ird.observe.services.binder; /*- * #%L @@ -23,10 +23,10 @@ package fr.ird.observe.services.dto.reference; */ import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; /** * Pour transformer des dto en références. diff --git a/services/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngineSupplier.java b/services/src/main/java/fr/ird/observe/services/binder/ReferenceBinderEngineSupplier.java similarity index 98% rename from services/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngineSupplier.java rename to services/src/main/java/fr/ird/observe/services/binder/ReferenceBinderEngineSupplier.java index 8b3e806..47d8aca 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/reference/ReferenceBinderEngineSupplier.java +++ b/services/src/main/java/fr/ird/observe/services/binder/ReferenceBinderEngineSupplier.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.reference; +package fr.ird.observe.services.binder; /*- * #%L diff --git a/services/src/main/java/fr/ird/observe/services/dto/IdHelper.java b/services/src/main/java/fr/ird/observe/services/dto/IdHelper.java index 7340597..cc7f6f4 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/IdHelper.java +++ b/services/src/main/java/fr/ird/observe/services/dto/IdHelper.java @@ -26,6 +26,7 @@ import com.google.common.collect.Maps; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.TripSeineDto; @@ -34,8 +35,6 @@ import java.util.Collection; import java.util.Map; import java.util.function.Predicate; -import static fr.ird.observe.services.dto.AbstractReference.newIdPredicate; - public class IdHelper extends GeneratedIdHelper { public static <BeanType extends IdDto> BeanType findById(Collection<BeanType> source, String id) { diff --git a/services/src/main/java/fr/ird/observe/services/dto/ObserveModelType.java b/services/src/main/java/fr/ird/observe/services/dto/constants/ObserveModelType.java similarity index 95% rename from services/src/main/java/fr/ird/observe/services/dto/ObserveModelType.java rename to services/src/main/java/fr/ird/observe/services/dto/constants/ObserveModelType.java index c8de165..d5449e7 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/ObserveModelType.java +++ b/services/src/main/java/fr/ird/observe/services/dto/constants/ObserveModelType.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto; +package fr.ird.observe.services.dto.constants; /*- * #%L diff --git a/services/src/main/java/fr/ird/observe/services/dto/Form.java b/services/src/main/java/fr/ird/observe/services/dto/form/Form.java similarity index 96% rename from services/src/main/java/fr/ird/observe/services/dto/Form.java rename to services/src/main/java/fr/ird/observe/services/dto/form/Form.java index be3cf30..7a0c717 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/Form.java +++ b/services/src/main/java/fr/ird/observe/services/dto/form/Form.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto; +package fr.ird.observe.services.dto.form; /* * #%L @@ -23,6 +23,8 @@ package fr.ird.observe.services.dto; */ import com.google.common.base.MoreObjects; +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.ObserveDto; import java.io.Serializable; diff --git a/services/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinition.java b/services/src/main/java/fr/ird/observe/services/dto/form/FormRequestDefinition.java similarity index 73% rename from services/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinition.java rename to services/src/main/java/fr/ird/observe/services/dto/form/FormRequestDefinition.java index ed293ba..6cd2d2e 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestDefinition.java +++ b/services/src/main/java/fr/ird/observe/services/dto/form/FormRequestDefinition.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.reference.request; +package fr.ird.observe.services.dto.form; /*- * #%L @@ -26,7 +26,7 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; -import fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions; +import fr.ird.observe.services.ObserveReferentialReferenceSets; import fr.ird.observe.services.dto.referential.ReferentialDto; import java.io.Serializable; @@ -38,7 +38,7 @@ import java.io.Serializable; * * @author Tony Chemit - dev@tchemit.fr */ -public class ReferenceSetRequestDefinition implements Serializable { +public class FormRequestDefinition implements Serializable { private static final long serialVersionUID = 1L; @@ -46,7 +46,7 @@ public class ReferenceSetRequestDefinition implements Serializable { private final Class<? extends IdDto> type; - private final ImmutableSet<ReferenceSetRequestKeyDefinition<?>> propertyDefinitions; + private final ImmutableSet<FormRequestKeyDefinition<?>> propertyDefinitions; private final ImmutableSet<ReferenceSetDefinition<? extends ReferentialDto>> referentialReferenceSetDefinitions; @@ -54,8 +54,8 @@ public class ReferenceSetRequestDefinition implements Serializable { return new Builder(type); } - public ReferenceSetRequestDefinition(Class<? extends IdDto> type, ImmutableSet<ReferenceSetRequestKeyDefinition<?>> propertyDefinitions, ImmutableSet<ReferenceSetDefinition<? extends ReferentialDto>> referentialReferenceSetDefinitions, - ImmutableSet<ReferenceSetDefinition<? extends DataDto>> dataReferenceSetDefinitions) { + public FormRequestDefinition(Class<? extends IdDto> type, ImmutableSet<FormRequestKeyDefinition<?>> propertyDefinitions, ImmutableSet<ReferenceSetDefinition<? extends ReferentialDto>> referentialReferenceSetDefinitions, + ImmutableSet<ReferenceSetDefinition<? extends DataDto>> dataReferenceSetDefinitions) { this.type = type; this.propertyDefinitions = propertyDefinitions; this.referentialReferenceSetDefinitions = referentialReferenceSetDefinitions; @@ -70,7 +70,7 @@ public class ReferenceSetRequestDefinition implements Serializable { return dataReferenceSetDefinitions; } - public ImmutableSet<ReferenceSetRequestKeyDefinition<?>> getPropertyDefinitions() { + public ImmutableSet<FormRequestKeyDefinition<?>> getPropertyDefinitions() { return propertyDefinitions; } @@ -82,7 +82,7 @@ public class ReferenceSetRequestDefinition implements Serializable { private final Class<? extends IdDto> type; - private final ImmutableSet.Builder<ReferenceSetRequestKeyDefinition<?>> propertiesBuilder; + private final ImmutableSet.Builder<FormRequestKeyDefinition<?>> propertiesBuilder; private final ImmutableSet.Builder<ReferenceSetDefinition<? extends ReferentialDto>> referentialSetsBuilder; @@ -95,18 +95,18 @@ public class ReferenceSetRequestDefinition implements Serializable { this.dataSetsBuilder = ImmutableSet.builder(); } - public Builder addKey(String name, ReferentialReferenceSetDefinitions propertyDefinition) { + public Builder addKey(String name, ObserveReferentialReferenceSets propertyDefinition) { ReferenceSetDefinition definition = propertyDefinition.getDefinition(); addKey(name, definition); return this; } - public ReferenceSetRequestDefinition build() { - return new ReferenceSetRequestDefinition(type, propertiesBuilder.build(), referentialSetsBuilder.build(), dataSetsBuilder.build()); + public FormRequestDefinition build() { + return new FormRequestDefinition(type, propertiesBuilder.build(), referentialSetsBuilder.build(), dataSetsBuilder.build()); } protected <D extends IdDto> void addKey(String name, ReferenceSetDefinition<D> definition) { - ReferenceSetRequestKeyDefinition<D> propertyDefinition = new ReferenceSetRequestKeyDefinition<>(definition, name); + FormRequestKeyDefinition<D> propertyDefinition = new FormRequestKeyDefinition<>(definition, name); propertiesBuilder.add(propertyDefinition); if (ReferentialDto.class.isAssignableFrom(definition.getType())) { referentialSetsBuilder.add((ReferenceSetDefinition) definition); diff --git a/services/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestKeyDefinition.java b/services/src/main/java/fr/ird/observe/services/dto/form/FormRequestKeyDefinition.java similarity index 84% rename from services/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestKeyDefinition.java rename to services/src/main/java/fr/ird/observe/services/dto/form/FormRequestKeyDefinition.java index 9e930ac..1e9126d 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/reference/request/ReferenceSetRequestKeyDefinition.java +++ b/services/src/main/java/fr/ird/observe/services/dto/form/FormRequestKeyDefinition.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.reference.request; +package fr.ird.observe.services.dto.form; /*- * #%L @@ -38,18 +38,18 @@ import java.util.Objects; * * @author Tony Chemit - dev@tchemit.fr */ -public class ReferenceSetRequestKeyDefinition<D extends IdDto> implements Serializable { +public class FormRequestKeyDefinition<D extends IdDto> implements Serializable { private static final long serialVersionUID = 1L; /** Logger. */ - private static final Log log = LogFactory.getLog(ReferenceSetRequestKeyDefinition.class); + private static final Log log = LogFactory.getLog(FormRequestKeyDefinition.class); private final ReferenceSetDefinition<D> referenceSetDefinition; private final String name; - public ReferenceSetRequestKeyDefinition(ReferenceSetDefinition<D> referenceSetDefinition, String name) { + public FormRequestKeyDefinition(ReferenceSetDefinition<D> referenceSetDefinition, String name) { this.referenceSetDefinition = referenceSetDefinition; this.name = name; } @@ -69,8 +69,8 @@ public class ReferenceSetRequestKeyDefinition<D extends IdDto> implements Serial @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof ReferenceSetRequestKeyDefinition)) return false; - ReferenceSetRequestKeyDefinition that = (ReferenceSetRequestKeyDefinition) o; + if (!(o instanceof FormRequestKeyDefinition)) return false; + FormRequestKeyDefinition that = (FormRequestKeyDefinition) o; return Objects.equals(referenceSetDefinition.getType(), that.referenceSetDefinition.getType()) && Objects.equals(name, that.name); } diff --git a/services/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineHelper.java b/services/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineHelper.java index 18eeee5..9b79ebd 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineHelper.java +++ b/services/src/main/java/fr/ird/observe/services/dto/longline/ActivityLonglineHelper.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.dto.longline; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; public class ActivityLonglineHelper extends GeneratedActivityLonglineHelper { diff --git a/services/src/main/java/fr/ird/observe/services/dto/longline/LonglinePositionAwareDto.java b/services/src/main/java/fr/ird/observe/services/dto/longline/LonglinePositionAwareDto.java index cc32b29..837eee3 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/longline/LonglinePositionAwareDto.java +++ b/services/src/main/java/fr/ird/observe/services/dto/longline/LonglinePositionAwareDto.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.dto.longline; * #L% */ -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import java.beans.PropertyChangeListener; diff --git a/services/src/main/java/fr/ird/observe/services/dto/longline/LonglinePositionSetDto.java b/services/src/main/java/fr/ird/observe/services/dto/longline/LonglinePositionSetDto.java index a7179b5..ee23c35 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/longline/LonglinePositionSetDto.java +++ b/services/src/main/java/fr/ird/observe/services/dto/longline/LonglinePositionSetDto.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.dto.longline; * #L% */ -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import java.util.Collection; diff --git a/services/src/main/java/fr/ird/observe/services/dto/longline/TripLonglineHelper.java b/services/src/main/java/fr/ird/observe/services/dto/longline/TripLonglineHelper.java index 9d6cb1f..e58bdaa 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/longline/TripLonglineHelper.java +++ b/services/src/main/java/fr/ird/observe/services/dto/longline/TripLonglineHelper.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.dto.longline; * #L% */ -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import java.util.ArrayList; import java.util.List; diff --git a/services/src/main/java/fr/ird/observe/services/dto/AbstractReference.java b/services/src/main/java/fr/ird/observe/services/dto/reference/AbstractReference.java similarity index 97% rename from services/src/main/java/fr/ird/observe/services/dto/AbstractReference.java rename to services/src/main/java/fr/ird/observe/services/dto/reference/AbstractReference.java index 9013c28..767d1f2 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/AbstractReference.java +++ b/services/src/main/java/fr/ird/observe/services/dto/reference/AbstractReference.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto; +package fr.ird.observe.services.dto.reference; /*- * #%L @@ -23,6 +23,8 @@ package fr.ird.observe.services.dto; */ import com.google.common.collect.Maps; +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.ObserveDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/services/src/main/java/fr/ird/observe/services/dto/DataReference.java b/services/src/main/java/fr/ird/observe/services/dto/reference/DataReference.java similarity index 93% rename from services/src/main/java/fr/ird/observe/services/dto/DataReference.java rename to services/src/main/java/fr/ird/observe/services/dto/reference/DataReference.java index 04c88e8..66ac5fd 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/DataReference.java +++ b/services/src/main/java/fr/ird/observe/services/dto/reference/DataReference.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto; +package fr.ird.observe.services.dto.reference; /*- * #%L @@ -23,6 +23,9 @@ package fr.ird.observe.services.dto; */ import com.google.common.base.MoreObjects; +import fr.ird.observe.services.dto.DataDto; +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.IdHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/services/src/main/java/fr/ird/observe/services/dto/DataReferenceList.java b/services/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceList.java similarity index 94% rename from services/src/main/java/fr/ird/observe/services/dto/DataReferenceList.java rename to services/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceList.java index df5fddc..e179f6c 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/DataReferenceList.java +++ b/services/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceList.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto; +package fr.ird.observe.services.dto.reference; /* * #%L @@ -24,6 +24,7 @@ package fr.ird.observe.services.dto; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; +import fr.ird.observe.services.dto.DataDto; public class DataReferenceList<R extends DataDto> extends ReferenceCollectionSupport<R, DataReference<R>, ImmutableList<DataReference<R>>> { diff --git a/services/src/main/java/fr/ird/observe/services/dto/DataReferenceSet.java b/services/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSet.java similarity index 94% rename from services/src/main/java/fr/ird/observe/services/dto/DataReferenceSet.java rename to services/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSet.java index b5b07a7..550bc61 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/DataReferenceSet.java +++ b/services/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSet.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto; +package fr.ird.observe.services.dto.reference; /* * #%L @@ -24,6 +24,7 @@ package fr.ird.observe.services.dto; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableSet; +import fr.ird.observe.services.dto.DataDto; public class DataReferenceSet<R extends DataDto> extends ReferenceCollectionSupport<R, DataReference<R>, ImmutableSet<DataReference<R>>> { diff --git a/services/src/main/java/fr/ird/observe/services/dto/ReferenceCollectionSupport.java b/services/src/main/java/fr/ird/observe/services/dto/reference/ReferenceCollectionSupport.java similarity index 93% rename from services/src/main/java/fr/ird/observe/services/dto/ReferenceCollectionSupport.java rename to services/src/main/java/fr/ird/observe/services/dto/reference/ReferenceCollectionSupport.java index cbad237..5f7f3dc 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/ReferenceCollectionSupport.java +++ b/services/src/main/java/fr/ird/observe/services/dto/reference/ReferenceCollectionSupport.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto; +package fr.ird.observe.services.dto.reference; /* * #%L @@ -24,6 +24,8 @@ package fr.ird.observe.services.dto; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.Iterables; +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.ObserveDto; import java.io.Serializable; import java.util.Optional; diff --git a/services/src/main/java/fr/ird/observe/services/dto/ReferenceMap.java b/services/src/main/java/fr/ird/observe/services/dto/reference/ReferenceMap.java similarity index 87% rename from services/src/main/java/fr/ird/observe/services/dto/ReferenceMap.java rename to services/src/main/java/fr/ird/observe/services/dto/reference/ReferenceMap.java index f3f8a2b..1adbd1d 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/ReferenceMap.java +++ b/services/src/main/java/fr/ird/observe/services/dto/reference/ReferenceMap.java @@ -19,7 +19,10 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.services.dto; +package fr.ird.observe.services.dto.reference; + +import fr.ird.observe.services.dto.IdDto; +import fr.ird.observe.services.dto.reference.AbstractReference; import java.util.HashMap; import java.util.Set; diff --git a/services/src/main/java/fr/ird/observe/services/dto/ReferenceValueNotFoundException.java b/services/src/main/java/fr/ird/observe/services/dto/reference/ReferenceValueNotFoundException.java similarity index 94% rename from services/src/main/java/fr/ird/observe/services/dto/ReferenceValueNotFoundException.java rename to services/src/main/java/fr/ird/observe/services/dto/reference/ReferenceValueNotFoundException.java index b06b2ec..1d419dc 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/ReferenceValueNotFoundException.java +++ b/services/src/main/java/fr/ird/observe/services/dto/reference/ReferenceValueNotFoundException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto; +package fr.ird.observe.services.dto.reference; /* * #%L @@ -22,6 +22,8 @@ package fr.ird.observe.services.dto; * #L% */ +import fr.ird.observe.services.dto.IdDto; + /** * Created on 18/08/15. * diff --git a/services/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReference.java b/services/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReference.java similarity index 96% rename from services/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReference.java rename to services/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReference.java index a6c3daf..17c6798 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReference.java +++ b/services/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReference.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.referential; +package fr.ird.observe.services.dto.reference; /*- * #%L @@ -23,7 +23,7 @@ package fr.ird.observe.services.dto.referential; */ import com.google.common.base.MoreObjects; -import fr.ird.observe.services.dto.AbstractReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/services/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceSet.java b/services/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSet.java similarity index 95% rename from services/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceSet.java rename to services/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSet.java index f777ee7..112dd29 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceSet.java +++ b/services/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSet.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.referential; +package fr.ird.observe.services.dto.reference; /* * #%L @@ -24,7 +24,7 @@ package fr.ird.observe.services.dto.referential; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.dto.ReferenceCollectionSupport; +import fr.ird.observe.services.dto.referential.ReferentialDto; import java.util.Date; diff --git a/services/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferences.java b/services/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferences.java similarity index 94% rename from services/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferences.java rename to services/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferences.java index 7e86920..03e2335 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferences.java +++ b/services/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferences.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.referential; +package fr.ird.observe.services.dto.reference; /*- * #%L @@ -22,7 +22,7 @@ package fr.ird.observe.services.dto.referential; * #L% */ -import fr.ird.observe.services.dto.AbstractReference; +import fr.ird.observe.services.dto.referential.ReferentialDto; import java.util.Collection; import java.util.List; diff --git a/services/src/main/java/fr/ird/observe/services/dto/referential/PersonHelper.java b/services/src/main/java/fr/ird/observe/services/dto/referential/PersonHelper.java index e57d875..0dc0d36 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/referential/PersonHelper.java +++ b/services/src/main/java/fr/ird/observe/services/dto/referential/PersonHelper.java @@ -23,6 +23,8 @@ package fr.ird.observe.services.dto.referential; */ +import fr.ird.observe.services.dto.reference.ReferentialReference; + import java.util.Collection; import java.util.List; import java.util.Objects; diff --git a/services/src/main/java/fr/ird/observe/services/dto/referential/ProgramHelper.java b/services/src/main/java/fr/ird/observe/services/dto/referential/ProgramHelper.java index 44a8203..c308f0c 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/referential/ProgramHelper.java +++ b/services/src/main/java/fr/ird/observe/services/dto/referential/ProgramHelper.java @@ -23,6 +23,7 @@ package fr.ird.observe.services.dto.referential; */ import fr.ird.observe.common.constants.GearType; +import fr.ird.observe.services.dto.reference.ReferentialReference; import java.util.ArrayList; import java.util.List; diff --git a/services/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java b/services/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java index 02e875b..5f390b0 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java +++ b/services/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java @@ -25,7 +25,7 @@ package fr.ird.observe.services.dto.referential; import com.google.common.base.MoreObjects; import fr.ird.observe.common.constants.ReferenceStatus; -import static fr.ird.observe.services.dto.referential.ReferentialReference.PROPERTY_ENABLED; +import static fr.ird.observe.services.dto.reference.ReferentialReference.PROPERTY_ENABLED; public abstract class ReferentialDto extends GeneratedReferentialDto { diff --git a/services/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java b/services/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java index 6bf447d..4777da6 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java +++ b/services/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java @@ -23,6 +23,7 @@ package fr.ird.observe.services.dto.referential; */ import com.google.common.collect.ImmutableSet; +import fr.ird.observe.services.dto.reference.ReferentialReference; import java.util.Collection; import java.util.List; diff --git a/services/src/main/java/fr/ird/observe/services/dto/referential/SpeciesListDto.java b/services/src/main/java/fr/ird/observe/services/dto/referential/SpeciesListDto.java index 60350b3..e4ef236 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/referential/SpeciesListDto.java +++ b/services/src/main/java/fr/ird/observe/services/dto/referential/SpeciesListDto.java @@ -22,6 +22,8 @@ package fr.ird.observe.services.dto.referential; * #L% */ +import fr.ird.observe.services.dto.reference.ReferentialReference; + import java.util.Set; import java.util.stream.Collectors; diff --git a/services/src/main/java/fr/ird/observe/services/dto/referential/VesselHelper.java b/services/src/main/java/fr/ird/observe/services/dto/referential/VesselHelper.java index 3164b66..3068b7b 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/referential/VesselHelper.java +++ b/services/src/main/java/fr/ird/observe/services/dto/referential/VesselHelper.java @@ -23,6 +23,8 @@ package fr.ird.observe.services.dto.referential; */ +import fr.ird.observe.services.dto.reference.ReferentialReference; + import java.util.Collection; import java.util.List; import java.util.Set; diff --git a/services/src/main/java/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineHelper.java b/services/src/main/java/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineHelper.java index e9764f1..4cec5fb 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineHelper.java +++ b/services/src/main/java/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineHelper.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.dto.referential.longline; * #L% */ -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; public class VesselActivityLonglineHelper extends GeneratedVesselActivityLonglineHelper { diff --git a/services/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineHelper.java b/services/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineHelper.java index 673970d..cee9d44 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineHelper.java +++ b/services/src/main/java/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineHelper.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.dto.referential.seine; * #L% */ -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; public class VesselActivitySeineHelper extends GeneratedVesselActivitySeineHelper { diff --git a/services/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryHelper.java b/services/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryHelper.java index 6b9d53b..bcbff3e 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryHelper.java +++ b/services/src/main/java/fr/ird/observe/services/dto/referential/seine/WeightCategoryHelper.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.dto.referential.seine; * #L% */ -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/services/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java b/services/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java index 8eddb3d..73982cb 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java +++ b/services/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineDto.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.dto.seine; * #L% */ -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineHelper; import org.nuiton.util.DateUtil; diff --git a/services/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineHelper.java b/services/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineHelper.java index 8281a3a..ea29fd2 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineHelper.java +++ b/services/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineHelper.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.dto.seine; * #L% */ -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; public class ActivitySeineHelper extends GeneratedActivitySeineHelper { diff --git a/services/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java b/services/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java index 7186107..2c33514 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java +++ b/services/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.dto.seine; import com.google.common.collect.Iterables; import fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto; public class FloatingObjectTransmittingBuoyDto extends GeneratedFloatingObjectTransmittingBuoyDto { diff --git a/services/src/main/java/fr/ird/observe/services/dto/seine/TargetCatchHelper.java b/services/src/main/java/fr/ird/observe/services/dto/seine/TargetCatchHelper.java index 0a8dc48..6f56d15 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/seine/TargetCatchHelper.java +++ b/services/src/main/java/fr/ird/observe/services/dto/seine/TargetCatchHelper.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.dto.seine; * #L% */ -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; import java.util.Collection; diff --git a/services/src/main/java/fr/ird/observe/services/dto/seine/TripSeineHelper.java b/services/src/main/java/fr/ird/observe/services/dto/seine/TripSeineHelper.java index 48c5651..e32b876 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/seine/TripSeineHelper.java +++ b/services/src/main/java/fr/ird/observe/services/dto/seine/TripSeineHelper.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.dto.seine; * #L% */ -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import java.util.ArrayList; import java.util.List; diff --git a/services/src/main/java/fr/ird/observe/services/dto/DataSourceCreateConfigurationDto.java b/services/src/main/java/fr/ird/observe/services/dto/source/DataSourceCreateConfigurationDto.java similarity index 98% rename from services/src/main/java/fr/ird/observe/services/dto/DataSourceCreateConfigurationDto.java rename to services/src/main/java/fr/ird/observe/services/dto/source/DataSourceCreateConfigurationDto.java index f7cc33a..072a2f4 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/DataSourceCreateConfigurationDto.java +++ b/services/src/main/java/fr/ird/observe/services/dto/source/DataSourceCreateConfigurationDto.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto; +package fr.ird.observe.services.dto.source; /* * #%L @@ -24,6 +24,7 @@ package fr.ird.observe.services.dto; import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; +import fr.ird.observe.services.dto.AbstractObserveDto; import java.util.Objects; diff --git a/services/src/main/java/fr/ird/observe/services/dto/DataSourceCreateWithNoReferentialImportException.java b/services/src/main/java/fr/ird/observe/services/dto/source/DataSourceCreateWithNoReferentialImportException.java similarity index 91% rename from services/src/main/java/fr/ird/observe/services/dto/DataSourceCreateWithNoReferentialImportException.java rename to services/src/main/java/fr/ird/observe/services/dto/source/DataSourceCreateWithNoReferentialImportException.java index f215e9f..266807b 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/DataSourceCreateWithNoReferentialImportException.java +++ b/services/src/main/java/fr/ird/observe/services/dto/source/DataSourceCreateWithNoReferentialImportException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto; +package fr.ird.observe.services.dto.source; /* * #%L @@ -22,6 +22,8 @@ package fr.ird.observe.services.dto; * #L% */ +import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto; + /** * Created on 23/08/15. * diff --git a/services/src/main/java/fr/ird/observe/services/dto/IncompatibleDataSourceCreateConfigurationException.java b/services/src/main/java/fr/ird/observe/services/dto/source/IncompatibleDataSourceCreateConfigurationException.java similarity index 91% rename from services/src/main/java/fr/ird/observe/services/dto/IncompatibleDataSourceCreateConfigurationException.java rename to services/src/main/java/fr/ird/observe/services/dto/source/IncompatibleDataSourceCreateConfigurationException.java index 3e5a828..410117c 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/IncompatibleDataSourceCreateConfigurationException.java +++ b/services/src/main/java/fr/ird/observe/services/dto/source/IncompatibleDataSourceCreateConfigurationException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto; +package fr.ird.observe.services.dto.source; /* * #%L @@ -22,6 +22,8 @@ package fr.ird.observe.services.dto; * #L% */ +import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto; + /** * Created on 23/08/15. * diff --git a/services/src/main/java/fr/ird/observe/services/dto/gson/ArrayListMultimapAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/ArrayListMultimapAdapter.java similarity index 96% rename from services/src/main/java/fr/ird/observe/services/dto/gson/ArrayListMultimapAdapter.java rename to services/src/main/java/fr/ird/observe/services/gson/ArrayListMultimapAdapter.java index 8615b69..eb67af1 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/gson/ArrayListMultimapAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/ArrayListMultimapAdapter.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.gson; +package fr.ird.observe.services.gson; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/dto/gson/BlobAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/BlobAdapter.java similarity index 98% rename from services/src/main/java/fr/ird/observe/services/dto/gson/BlobAdapter.java rename to services/src/main/java/fr/ird/observe/services/gson/BlobAdapter.java index 1ff6293..5bc1661 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/gson/BlobAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/BlobAdapter.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.gson; +package fr.ird.observe.services.gson; /*- * #%L diff --git a/services/src/main/java/fr/ird/observe/services/dto/gson/ClassAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/ClassAdapter.java similarity index 98% rename from services/src/main/java/fr/ird/observe/services/dto/gson/ClassAdapter.java rename to services/src/main/java/fr/ird/observe/services/gson/ClassAdapter.java index f15b7ad..0eed5e0 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/gson/ClassAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/ClassAdapter.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.gson; +package fr.ird.observe.services.gson; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/dto/gson/DateAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/DateAdapter.java similarity index 99% rename from services/src/main/java/fr/ird/observe/services/dto/gson/DateAdapter.java rename to services/src/main/java/fr/ird/observe/services/gson/DateAdapter.java index 53f04b0..9e04461 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/gson/DateAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/DateAdapter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package fr.ird.observe.services.dto.gson; +package fr.ird.observe.services.gson; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/dto/gson/FormAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/FormAdapter.java similarity index 96% rename from services/src/main/java/fr/ird/observe/services/dto/gson/FormAdapter.java rename to services/src/main/java/fr/ird/observe/services/gson/FormAdapter.java index ad02d97..39d2a24 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/gson/FormAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/FormAdapter.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.gson; +package fr.ird.observe.services.gson; /*- * #%L @@ -27,7 +27,7 @@ import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.IdDto; import java.lang.reflect.Type; diff --git a/services/src/main/java/fr/ird/observe/services/dto/gson/ImmutableListAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/ImmutableListAdapter.java similarity index 97% rename from services/src/main/java/fr/ird/observe/services/dto/gson/ImmutableListAdapter.java rename to services/src/main/java/fr/ird/observe/services/gson/ImmutableListAdapter.java index d4a28f8..125cdab 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/gson/ImmutableListAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/ImmutableListAdapter.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.gson; +package fr.ird.observe.services.gson; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMapAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/ImmutableMapAdapter.java similarity index 97% rename from services/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMapAdapter.java rename to services/src/main/java/fr/ird/observe/services/gson/ImmutableMapAdapter.java index d639373..d435c30 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMapAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/ImmutableMapAdapter.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.gson; +package fr.ird.observe.services.gson; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMultimapAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/ImmutableMultimapAdapter.java similarity index 98% rename from services/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMultimapAdapter.java rename to services/src/main/java/fr/ird/observe/services/gson/ImmutableMultimapAdapter.java index 71d6429..5823b1c 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMultimapAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/ImmutableMultimapAdapter.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.gson; +package fr.ird.observe.services.gson; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/dto/gson/ImmutableSetAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/ImmutableSetAdapter.java similarity index 97% rename from services/src/main/java/fr/ird/observe/services/dto/gson/ImmutableSetAdapter.java rename to services/src/main/java/fr/ird/observe/services/gson/ImmutableSetAdapter.java index 904546f..1037203 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/gson/ImmutableSetAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/ImmutableSetAdapter.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.gson; +package fr.ird.observe.services.gson; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/dto/gson/IntegerAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/IntegerAdapter.java similarity index 97% rename from services/src/main/java/fr/ird/observe/services/dto/gson/IntegerAdapter.java rename to services/src/main/java/fr/ird/observe/services/gson/IntegerAdapter.java index ff3872f..3c41660 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/gson/IntegerAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/IntegerAdapter.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.gson; +package fr.ird.observe.services.gson; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/dto/gson/MultimapAdapterSupport.java b/services/src/main/java/fr/ird/observe/services/gson/MultimapAdapterSupport.java similarity index 98% rename from services/src/main/java/fr/ird/observe/services/dto/gson/MultimapAdapterSupport.java rename to services/src/main/java/fr/ird/observe/services/gson/MultimapAdapterSupport.java index ab6141d..a94bd77 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/gson/MultimapAdapterSupport.java +++ b/services/src/main/java/fr/ird/observe/services/gson/MultimapAdapterSupport.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.gson; +package fr.ird.observe.services.gson; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/dto/gson/ObserveBlobsContainerAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/ObserveBlobsContainerAdapter.java similarity index 98% rename from services/src/main/java/fr/ird/observe/services/dto/gson/ObserveBlobsContainerAdapter.java rename to services/src/main/java/fr/ird/observe/services/gson/ObserveBlobsContainerAdapter.java index a38f1b0..7704aea 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/gson/ObserveBlobsContainerAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/ObserveBlobsContainerAdapter.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.gson; +package fr.ird.observe.services.gson; /*- * #%L diff --git a/services/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java b/services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java similarity index 85% rename from services/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java rename to services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java index 91fae31..c213d78 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java +++ b/services/src/main/java/fr/ird/observe/services/gson/ObserveDtoGsonSupplier.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.gson; +package fr.ird.observe.services.gson; /* * #%L @@ -32,22 +32,22 @@ import com.google.common.reflect.TypeParameter; import com.google.common.reflect.TypeToken; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import fr.ird.observe.services.dto.AbstractReference; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceList; -import fr.ird.observe.services.dto.DataReferenceSet; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.AbstractReference; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceList; +import fr.ird.observe.services.dto.reference.DataReferenceSet; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.ObserveBlobsContainer; -import fr.ird.observe.services.dto.actions.report.ReportVariable; -import fr.ird.observe.services.dto.gson.reference.DataReferenceAdapter; -import fr.ird.observe.services.dto.gson.reference.DataReferenceListAdapter; -import fr.ird.observe.services.dto.gson.reference.DataReferenceSetAdapter; -import fr.ird.observe.services.dto.gson.reference.ReferentialReferenceAdapter; -import fr.ird.observe.services.dto.gson.reference.ReferentialReferenceSetAdapter; -import fr.ird.observe.services.dto.gson.reference.UnknownReferenceAdapter; +import fr.ird.observe.services.service.actions.report.ReportVariable; +import fr.ird.observe.services.gson.reference.DataReferenceAdapter; +import fr.ird.observe.services.gson.reference.DataReferenceListAdapter; +import fr.ird.observe.services.gson.reference.DataReferenceSetAdapter; +import fr.ird.observe.services.gson.reference.ReferentialReferenceAdapter; +import fr.ird.observe.services.gson.reference.ReferentialReferenceSetAdapter; +import fr.ird.observe.services.gson.reference.UnknownReferenceAdapter; import fr.ird.observe.services.dto.referential.ReferentialMultimap; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import org.nuiton.version.Version; import java.sql.Blob; diff --git a/services/src/main/java/fr/ird/observe/services/dto/gson/ReferentialMultimapAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/ReferentialMultimapAdapter.java similarity index 98% rename from services/src/main/java/fr/ird/observe/services/dto/gson/ReferentialMultimapAdapter.java rename to services/src/main/java/fr/ird/observe/services/gson/ReferentialMultimapAdapter.java index 5ca0fb7..a4cb912 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/gson/ReferentialMultimapAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/ReferentialMultimapAdapter.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.gson; +package fr.ird.observe.services.gson; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/dto/gson/ReportVariableAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/ReportVariableAdapter.java similarity index 92% rename from services/src/main/java/fr/ird/observe/services/dto/gson/ReportVariableAdapter.java rename to services/src/main/java/fr/ird/observe/services/gson/ReportVariableAdapter.java index 48031ab..4c46f9b 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/gson/ReportVariableAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/ReportVariableAdapter.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.gson; +package fr.ird.observe.services.gson; /* * #%L @@ -29,10 +29,10 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.actions.report.ReportVariable; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.service.actions.report.ReportVariable; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import java.lang.reflect.Type; import java.util.Set; diff --git a/services/src/main/java/fr/ird/observe/services/dto/gson/SetMultimapAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/SetMultimapAdapter.java similarity index 96% rename from services/src/main/java/fr/ird/observe/services/dto/gson/SetMultimapAdapter.java rename to services/src/main/java/fr/ird/observe/services/gson/SetMultimapAdapter.java index 1a17cbf..22e065f 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/gson/SetMultimapAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/SetMultimapAdapter.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.gson; +package fr.ird.observe.services.gson; /* * #%L diff --git a/services/src/main/java/fr/ird/observe/services/dto/gson/VersionAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/VersionAdapter.java similarity index 97% rename from services/src/main/java/fr/ird/observe/services/dto/gson/VersionAdapter.java rename to services/src/main/java/fr/ird/observe/services/gson/VersionAdapter.java index 4f802e5..6fa3a9b 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/gson/VersionAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/VersionAdapter.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.gson; +package fr.ird.observe.services.gson; /*- * #%L diff --git a/services/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/reference/AbstractReferenceAdapter.java similarity index 97% rename from services/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceAdapter.java rename to services/src/main/java/fr/ird/observe/services/gson/reference/AbstractReferenceAdapter.java index 6befe54..d638827 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/reference/AbstractReferenceAdapter.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.gson.reference; +package fr.ird.observe.services.gson.reference; /* * #%L @@ -30,7 +30,7 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParseException; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -import fr.ird.observe.services.dto.AbstractReference; +import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; diff --git a/services/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/reference/DataReferenceAdapter.java similarity index 85% rename from services/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceAdapter.java rename to services/src/main/java/fr/ird/observe/services/gson/reference/DataReferenceAdapter.java index 0b4793b..f66db99 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/reference/DataReferenceAdapter.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.gson.reference; +package fr.ird.observe.services.gson.reference; /* * #%L @@ -23,8 +23,8 @@ package fr.ird.observe.services.dto.gson.reference; */ import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.reference.DataReferenceSetDefinitions; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.ObserveDataReferenceSets; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; import java.io.Serializable; @@ -36,7 +36,7 @@ public class DataReferenceAdapter<D extends DataDto> extends AbstractReferenceAd @Override protected ReferenceSetDefinition<D> getDefinition(Class<D> dtoType) { - return DataReferenceSetDefinitions.getDefinition(dtoType); + return ObserveDataReferenceSets.getDefinition(dtoType); } @Override diff --git a/services/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceListAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/reference/DataReferenceListAdapter.java similarity index 93% rename from services/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceListAdapter.java rename to services/src/main/java/fr/ird/observe/services/gson/reference/DataReferenceListAdapter.java index f512534..1949fe1 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceListAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/reference/DataReferenceListAdapter.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.gson.reference; +package fr.ird.observe.services.gson.reference; /*- * #%L @@ -28,8 +28,8 @@ import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceList; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceList; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; /** diff --git a/services/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceSetAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/reference/DataReferenceSetAdapter.java similarity index 93% rename from services/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceSetAdapter.java rename to services/src/main/java/fr/ird/observe/services/gson/reference/DataReferenceSetAdapter.java index 360e34e..bce7bda 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceSetAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/reference/DataReferenceSetAdapter.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.gson.reference; +package fr.ird.observe.services.gson.reference; /*- * #%L @@ -28,8 +28,8 @@ import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import fr.ird.observe.services.dto.DataDto; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceSet; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; /** diff --git a/services/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferenceCollectionSupportAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/reference/ReferenceCollectionSupportAdapter.java similarity index 94% rename from services/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferenceCollectionSupportAdapter.java rename to services/src/main/java/fr/ird/observe/services/gson/reference/ReferenceCollectionSupportAdapter.java index 334aa0d..dee2f0f 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferenceCollectionSupportAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/reference/ReferenceCollectionSupportAdapter.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.gson.reference; +package fr.ird.observe.services.gson.reference; /* * #%L @@ -29,9 +29,9 @@ import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; -import fr.ird.observe.services.dto.AbstractReference; +import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.ReferenceCollectionSupport; +import fr.ird.observe.services.dto.reference.ReferenceCollectionSupport; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; import java.lang.reflect.Type; diff --git a/services/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/reference/ReferentialReferenceAdapter.java similarity index 94% rename from services/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceAdapter.java rename to services/src/main/java/fr/ird/observe/services/gson/reference/ReferentialReferenceAdapter.java index 850440c..1a7de3f 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/reference/ReferentialReferenceAdapter.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.gson.reference; +package fr.ird.observe.services.gson.reference; /* * #%L @@ -27,9 +27,9 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; -import fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions; +import fr.ird.observe.services.ObserveReferentialReferenceSets; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import java.io.Serializable; import java.lang.reflect.Type; @@ -87,7 +87,7 @@ public class ReferentialReferenceAdapter<D extends ReferentialDto> extends Abstr @Override protected ReferenceSetDefinition<D> getDefinition(Class<D> dtoType) { - return ReferentialReferenceSetDefinitions.getDefinition(dtoType); + return ObserveReferentialReferenceSets.getDefinition(dtoType); } @Override diff --git a/services/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceSetAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/reference/ReferentialReferenceSetAdapter.java similarity index 93% rename from services/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceSetAdapter.java rename to services/src/main/java/fr/ird/observe/services/gson/reference/ReferentialReferenceSetAdapter.java index 21692a0..18063f9 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceSetAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/reference/ReferentialReferenceSetAdapter.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.gson.reference; +package fr.ird.observe.services.gson.reference; /*- * #%L @@ -29,8 +29,8 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import java.util.Date; diff --git a/services/src/main/java/fr/ird/observe/services/dto/gson/reference/UnknownReferenceAdapter.java b/services/src/main/java/fr/ird/observe/services/gson/reference/UnknownReferenceAdapter.java similarity index 90% rename from services/src/main/java/fr/ird/observe/services/dto/gson/reference/UnknownReferenceAdapter.java rename to services/src/main/java/fr/ird/observe/services/gson/reference/UnknownReferenceAdapter.java index b61cd15..bb369b0 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/gson/reference/UnknownReferenceAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/reference/UnknownReferenceAdapter.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto.gson.reference; +package fr.ird.observe.services.gson.reference; /*- * #%L @@ -27,11 +27,11 @@ import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; -import fr.ird.observe.services.dto.AbstractReference; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.AbstractReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import java.lang.reflect.Type; diff --git a/services/src/main/java/fr/ird/observe/services/dto/UnauthorizedException.java b/services/src/main/java/fr/ird/observe/services/security/UnauthorizedException.java similarity index 96% rename from services/src/main/java/fr/ird/observe/services/dto/UnauthorizedException.java rename to services/src/main/java/fr/ird/observe/services/security/UnauthorizedException.java index 2b6a7c7..15ac927 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/UnauthorizedException.java +++ b/services/src/main/java/fr/ird/observe/services/security/UnauthorizedException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.services.dto; +package fr.ird.observe.services.security; /*- * #%L diff --git a/services/src/main/java/fr/ird/observe/services/service/DataSourceService.java b/services/src/main/java/fr/ird/observe/services/service/DataSourceService.java index f29de94..7d3cb22 100644 --- a/services/src/main/java/fr/ird/observe/services/service/DataSourceService.java +++ b/services/src/main/java/fr/ird/observe/services/service/DataSourceService.java @@ -26,9 +26,9 @@ import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.configuration.ObserveDataSourceInformation; -import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; -import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; -import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; +import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto; +import fr.ird.observe.services.dto.source.DataSourceCreateWithNoReferentialImportException; +import fr.ird.observe.services.dto.source.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.dto.ObserveDbUserDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.spi.NoDataAccess; diff --git a/services/src/main/java/fr/ird/observe/services/dto/actions/report/DataMatrix.java b/services/src/main/java/fr/ird/observe/services/service/actions/report/DataMatrix.java similarity index 99% rename from services/src/main/java/fr/ird/observe/services/dto/actions/report/DataMatrix.java rename to services/src/main/java/fr/ird/observe/services/service/actions/report/DataMatrix.java index 7c4bc86..b8c9fa2 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/actions/report/DataMatrix.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/report/DataMatrix.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.services.dto.actions.report; +package fr.ird.observe.services.service.actions.report; import fr.ird.observe.services.dto.ObserveDto; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/services/src/main/java/fr/ird/observe/services/dto/actions/report/Report.java b/services/src/main/java/fr/ird/observe/services/service/actions/report/Report.java similarity index 97% rename from services/src/main/java/fr/ird/observe/services/dto/actions/report/Report.java rename to services/src/main/java/fr/ird/observe/services/service/actions/report/Report.java index 292094d..299da9b 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/actions/report/Report.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/report/Report.java @@ -19,12 +19,12 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.services.dto.actions.report; +package fr.ird.observe.services.service.actions.report; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import fr.ird.observe.services.dto.ObserveDto; -import fr.ird.observe.services.dto.ObserveModelType; +import fr.ird.observe.services.dto.constants.ObserveModelType; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java b/services/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java index 17d5209..f6b856e 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/report/ReportBuilder.java @@ -22,11 +22,7 @@ package fr.ird.observe.services.service.actions.report; -import fr.ird.observe.services.dto.ObserveModelType; -import fr.ird.observe.services.dto.actions.report.Report; -import fr.ird.observe.services.dto.actions.report.ReportOperation; -import fr.ird.observe.services.dto.actions.report.ReportRequest; -import fr.ird.observe.services.dto.actions.report.ReportVariable; +import fr.ird.observe.services.dto.constants.ObserveModelType; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.SortedProperties; diff --git a/services/src/main/java/fr/ird/observe/services/dto/actions/report/ReportOperation.java b/services/src/main/java/fr/ird/observe/services/service/actions/report/ReportOperation.java similarity index 95% rename from services/src/main/java/fr/ird/observe/services/dto/actions/report/ReportOperation.java rename to services/src/main/java/fr/ird/observe/services/service/actions/report/ReportOperation.java index 9f6e867..9c3a074 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/actions/report/ReportOperation.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/report/ReportOperation.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.services.dto.actions.report; +package fr.ird.observe.services.service.actions.report; import fr.ird.observe.services.dto.ObserveDto; diff --git a/services/src/main/java/fr/ird/observe/services/dto/actions/report/ReportRequest.java b/services/src/main/java/fr/ird/observe/services/service/actions/report/ReportRequest.java similarity index 98% rename from services/src/main/java/fr/ird/observe/services/dto/actions/report/ReportRequest.java rename to services/src/main/java/fr/ird/observe/services/service/actions/report/ReportRequest.java index 4de9807..360c7c2 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/actions/report/ReportRequest.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/report/ReportRequest.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.services.dto.actions.report; +package fr.ird.observe.services.service.actions.report; import com.google.common.collect.Maps; import fr.ird.observe.services.dto.ObserveDto; diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/report/ReportService.java b/services/src/main/java/fr/ird/observe/services/service/actions/report/ReportService.java index fe59729..2424bc0 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/report/ReportService.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/report/ReportService.java @@ -23,8 +23,6 @@ package fr.ird.observe.services.service.actions.report; */ import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.actions.report.DataMatrix; -import fr.ird.observe.services.dto.actions.report.Report; import fr.ird.observe.services.spi.PostRequest; import fr.ird.observe.services.spi.ReadDataPermission; import fr.ird.observe.services.spi.ReadReferentialPermission; diff --git a/services/src/main/java/fr/ird/observe/services/dto/actions/report/ReportVariable.java b/services/src/main/java/fr/ird/observe/services/service/actions/report/ReportVariable.java similarity index 97% rename from services/src/main/java/fr/ird/observe/services/dto/actions/report/ReportVariable.java rename to services/src/main/java/fr/ird/observe/services/service/actions/report/ReportVariable.java index 77ad71f..75308d7 100644 --- a/services/src/main/java/fr/ird/observe/services/dto/actions/report/ReportVariable.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/report/ReportVariable.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.services.dto.actions.report; +package fr.ird.observe.services.service.actions.report; import fr.ird.observe.services.dto.ObserveDto; diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffService.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffService.java index 996bfd1..a19bdf7 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffService.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffService.java @@ -26,7 +26,7 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialMultimap; -import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.spi.PostRequest; import fr.ird.observe.services.spi.ReadReferentialPermission; diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffsEngine.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffsEngine.java index 586ac4d..0dd26f8 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffsEngine.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffsEngine.java @@ -26,7 +26,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialMultimap; -import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import java.util.Set; import java.util.stream.Collectors; diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequest.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequest.java index 011002c..8f34e49 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequest.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequest.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.service.actions.synchro.referential.legacy; import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import java.util.Collection; diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequests.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequests.java index 7b6abe0..f0bff02 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequests.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeCallbackRequests.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.service.actions.synchro.referential.legacy; */ import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import java.util.Collection; import java.util.HashMap; diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java index 5d1d427..264fd49 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java @@ -25,8 +25,8 @@ package fr.ird.observe.services.service.actions.synchro.referential.legacy; import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialHelper; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffState; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffs; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffsEngine; diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java index 7f702f3..12ef073 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalService.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.service.actions.synchro.referential.legacy; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.spi.PostRequest; import fr.ird.observe.services.spi.ReadReferentialPermission; import fr.ird.observe.services.spi.Write; diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDto.java b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDto.java index ced5691..ab00ea1 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDto.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDto.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.service.actions.validate; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.dto.AbstractReference; +import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ObserveDto; diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java index 84d3572..939036b 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateResultForDtoType.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.service.actions.validate; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.dto.AbstractReference; +import fr.ird.observe.services.dto.reference.AbstractReference; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ObserveDto; diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceUtils.java b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceUtils.java index 8224bb0..43a61fa 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceUtils.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceUtils.java @@ -25,7 +25,7 @@ package fr.ird.observe.services.service.actions.validate; import com.google.common.collect.ImmutableSet; import com.google.gson.Gson; import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.gson.ObserveDtoGsonSupplier; +import fr.ird.observe.services.gson.ObserveDtoGsonSupplier; import java.io.InputStreamReader; import java.io.Reader; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/NavigationResult.java b/services/src/main/java/fr/ird/observe/services/service/data/NavigationResult.java index a28525f..61fb8c9 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/NavigationResult.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/NavigationResult.java @@ -25,11 +25,11 @@ package fr.ird.observe.services.service.data; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; -import fr.ird.observe.services.dto.DataReference; +import fr.ird.observe.services.dto.reference.DataReference; import fr.ird.observe.services.dto.ObserveDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.seine.TripSeineDto; /** diff --git a/services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLongLineEncounterService.java b/services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLongLineEncounterService.java index 73d50f4..2bf6c00 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLongLineEncounterService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLongLineEncounterService.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.service.data.longline; */ import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineEncounterDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.spi.PostRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLongLineSensorUsedService.java b/services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLongLineSensorUsedService.java index b273318..0968a9a 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLongLineSensorUsedService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLongLineSensorUsedService.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.service.data.longline; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.DataFileDto; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.spi.PostRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLonglineService.java b/services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLonglineService.java index edeff78..a65bbcd 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLonglineService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/longline/ActivityLonglineService.java @@ -23,9 +23,9 @@ package fr.ird.observe.services.service.data.longline; */ import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceSet; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.spi.DeleteRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/longline/BranchlineService.java b/services/src/main/java/fr/ird/observe/services/service/data/longline/BranchlineService.java index f29dba3..e1a9748 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/longline/BranchlineService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/longline/BranchlineService.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.service.data.longline; */ import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.spi.PostRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineCatchService.java b/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineCatchService.java index 5efc91b..2b568b2 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineCatchService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineCatchService.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.service.data.longline; */ import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.spi.PostRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineDetailCompositionService.java b/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineDetailCompositionService.java index f3e9145..ca41fae 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineDetailCompositionService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineDetailCompositionService.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.service.data.longline; */ import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.spi.PostRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineGlobalCompositionService.java b/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineGlobalCompositionService.java index 6fc79ed..874a377 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineGlobalCompositionService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineGlobalCompositionService.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.service.data.longline; */ import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.spi.PostRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineService.java b/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineService.java index 26d2f7e..6b07fbb 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/longline/SetLonglineService.java @@ -23,8 +23,8 @@ package fr.ird.observe.services.service.data.longline; */ import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.spi.DeleteRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/longline/TdrService.java b/services/src/main/java/fr/ird/observe/services/service/data/longline/TdrService.java index 4ea5636..fd5b69b 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/longline/TdrService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/longline/TdrService.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.service.data.longline; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.DataFileDto; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.spi.PostRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/longline/TripLonglineGearUseService.java b/services/src/main/java/fr/ird/observe/services/service/data/longline/TripLonglineGearUseService.java index 7ba64ff..8339845 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/longline/TripLonglineGearUseService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/longline/TripLonglineGearUseService.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.service.data.longline; */ import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.longline.TripLonglineGearUseDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.spi.PostRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/longline/TripLonglineService.java b/services/src/main/java/fr/ird/observe/services/service/data/longline/TripLonglineService.java index 07624ce..4a886e0 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/longline/TripLonglineService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/longline/TripLonglineService.java @@ -24,12 +24,12 @@ package fr.ird.observe.services.service.data.longline; import com.google.common.collect.ImmutableList; import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceList; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceList; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.spi.DeleteRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/seine/ActivitySeineService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/ActivitySeineService.java index 1916b44..c754b7a 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/seine/ActivitySeineService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/ActivitySeineService.java @@ -23,9 +23,9 @@ package fr.ird.observe.services.service.data.seine; */ import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceSet; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.spi.DeleteRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/seine/FloatingObjectService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/FloatingObjectService.java index cf651c2..79d9341 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/seine/FloatingObjectService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/FloatingObjectService.java @@ -23,9 +23,9 @@ package fr.ird.observe.services.service.data.seine; */ import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceSet; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.spi.DeleteRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/seine/NonTargetCatchService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/NonTargetCatchService.java index 8ad9b8f..fda4947 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/seine/NonTargetCatchService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/NonTargetCatchService.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.service.data.seine; */ import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; import fr.ird.observe.services.spi.PostRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/seine/NonTargetSampleService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/NonTargetSampleService.java index 68f1772..ed31e10 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/seine/NonTargetSampleService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/NonTargetSampleService.java @@ -23,8 +23,8 @@ package fr.ird.observe.services.service.data.seine; */ import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.form.Form; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.NonTargetSampleDto; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/seine/ObjectObservedSpeciesService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/ObjectObservedSpeciesService.java index b7769b9..afd0874 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/seine/ObjectObservedSpeciesService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/ObjectObservedSpeciesService.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.service.data.seine; */ import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; import fr.ird.observe.services.spi.PostRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/seine/ObjectSchoolEstimateService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/ObjectSchoolEstimateService.java index de6af77..38d98ad 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/seine/ObjectSchoolEstimateService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/ObjectSchoolEstimateService.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.service.data.seine; */ import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; import fr.ird.observe.services.spi.PostRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/seine/RouteService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/RouteService.java index 2a011d3..b7c7606 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/seine/RouteService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/RouteService.java @@ -23,9 +23,9 @@ package fr.ird.observe.services.service.data.seine; */ import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceSet; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceSet; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.spi.DeleteRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/seine/SchoolEstimateService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/SchoolEstimateService.java index c0fcb69..f7b5b2a 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/seine/SchoolEstimateService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/SchoolEstimateService.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.service.data.seine; */ import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; import fr.ird.observe.services.spi.PostRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/seine/SetSeineService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/SetSeineService.java index 8c27aed..c15eb78 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/seine/SetSeineService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/SetSeineService.java @@ -23,8 +23,8 @@ package fr.ird.observe.services.service.data.seine; */ import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.spi.DeleteRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/seine/TargetCatchService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/TargetCatchService.java index 8e9caf2..03d3f49 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/seine/TargetCatchService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/TargetCatchService.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.service.data.seine; */ import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; import fr.ird.observe.services.spi.PostRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/seine/TargetSampleService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/TargetSampleService.java index abe1537..b8e57ce 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/seine/TargetSampleService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/TargetSampleService.java @@ -24,8 +24,8 @@ package fr.ird.observe.services.service.data.seine; import com.google.common.collect.ImmutableList; import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.form.Form; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TargetSampleDto; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/seine/TransmittingBuoyOperationService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/TransmittingBuoyOperationService.java index 5bbfee3..955b083 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/seine/TransmittingBuoyOperationService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/TransmittingBuoyOperationService.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.service.data.seine; */ import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; import fr.ird.observe.services.spi.PostRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineGearUseService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineGearUseService.java index 5fc318d..95524d4 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineGearUseService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineGearUseService.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.service.data.seine; */ import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; import fr.ird.observe.services.spi.PostRequest; diff --git a/services/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineService.java index c2e9c38..0a2abc4 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineService.java @@ -24,11 +24,11 @@ package fr.ird.observe.services.service.data.seine; import com.google.common.collect.ImmutableList; import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.DataReferenceList; -import fr.ird.observe.services.dto.Form; +import fr.ird.observe.services.dto.reference.DataReference; +import fr.ird.observe.services.dto.reference.DataReferenceList; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.TripMapDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReference; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TripSeineDto; diff --git a/services/src/main/java/fr/ird/observe/services/service/referential/ObserveReferentialCache.java b/services/src/main/java/fr/ird/observe/services/service/referential/ObserveReferentialCache.java index 58744cb..8e9d93c 100644 --- a/services/src/main/java/fr/ird/observe/services/service/referential/ObserveReferentialCache.java +++ b/services/src/main/java/fr/ird/observe/services/service/referential/ObserveReferentialCache.java @@ -25,10 +25,10 @@ package fr.ird.observe.services.service.referential; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinition; -import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; +import fr.ird.observe.services.dto.form.FormRequestDefinition; +import fr.ird.observe.services.ObserveFormRequests; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -88,7 +88,7 @@ public class ObserveReferentialCache implements Closeable, Serializable { if (log.isInfoEnabled()) { log.info("Loading referantialReferenceSetRequest: " + referentialRequestName); } - ReferenceSetRequestDefinition requestDefinition = ReferenceSetRequestDefinitions.get(referentialRequestName); + FormRequestDefinition requestDefinition = ObserveFormRequests.get(referentialRequestName); ImmutableMap<Class<?>, Date> lastUpdateDates = getLastUpdateDates(referentialRequestName); @@ -125,7 +125,7 @@ public class ObserveReferentialCache implements Closeable, Serializable { */ public ImmutableMap<Class<?>, Date> getLastUpdateDates(String requestName) { - ReferenceSetRequestDefinition requestDefinition = ReferenceSetRequestDefinitions.get(requestName); + FormRequestDefinition requestDefinition = ObserveFormRequests.get(requestName); ImmutableMap.Builder<Class<?>, Date> builder = ImmutableMap.builder(); diff --git a/services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java b/services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java index 5b77a81..0c9cdc2 100644 --- a/services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java +++ b/services/src/main/java/fr/ird/observe/services/service/referential/ReferentialService.java @@ -25,11 +25,11 @@ package fr.ird.observe.services.service.referential; import com.google.common.collect.ImmutableSet; import com.google.common.collect.SetMultimap; import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.Form; -import fr.ird.observe.services.dto.ReferenceMap; +import fr.ird.observe.services.dto.form.Form; +import fr.ird.observe.services.dto.reference.ReferenceMap; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; +import fr.ird.observe.services.dto.reference.ReferentialReference; +import fr.ird.observe.services.dto.reference.ReferentialReferenceSet; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.service.DataNotFoundException; diff --git a/services/src/main/xmi/observe-services-dto-common.zargo b/services/src/main/xmi/observe-services-dto-common.zargo index 1310fe4..2a78e26 100644 Binary files a/services/src/main/xmi/observe-services-dto-common.zargo and b/services/src/main/xmi/observe-services-dto-common.zargo differ diff --git a/services/src/main/xmi/observe-services-dto-longline.zargo b/services/src/main/xmi/observe-services-dto-longline.zargo index c887dd5..cd65a93 100644 Binary files a/services/src/main/xmi/observe-services-dto-longline.zargo and b/services/src/main/xmi/observe-services-dto-longline.zargo differ diff --git a/services/src/main/xmi/observe-services-dto-seine.zargo b/services/src/main/xmi/observe-services-dto-seine.zargo index b514077..fc5e29d 100644 Binary files a/services/src/main/xmi/observe-services-dto-seine.zargo and b/services/src/main/xmi/observe-services-dto-seine.zargo differ diff --git a/services/src/test/java/fr/ird/observe/services/service/actions/report/ReportBuilderTest.java b/services/src/test/java/fr/ird/observe/services/service/actions/report/ReportBuilderTest.java index fccb6f7..2250787 100644 --- a/services/src/test/java/fr/ird/observe/services/service/actions/report/ReportBuilderTest.java +++ b/services/src/test/java/fr/ird/observe/services/service/actions/report/ReportBuilderTest.java @@ -22,10 +22,6 @@ package fr.ird.observe.services.service.actions.report; * #L% */ -import fr.ird.observe.services.dto.actions.report.Report; -import fr.ird.observe.services.dto.actions.report.ReportOperation; -import fr.ird.observe.services.dto.actions.report.ReportRequest; -import fr.ird.observe.services.dto.actions.report.ReportVariable; import fr.ird.observe.services.dto.referential.SpeciesGroupDto; import org.junit.Assert; import org.junit.Before; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.