This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from d65d8e3 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new ac9f784 Ajout du batchId sur l'entitié IndividualObservation (See #8023) new 7560d97 o Modification du modèle pour avoir les identifiants des lots dans les observations individuelles o Amélioration de l'API de persistence pour utiliser les bons types d'identifiants (Integer au lieu de String) o Nettoyage de code (java 8, variables inline, imports non optimisés, variables non utilisées) new ef6e386 Fixes #8023 Merge branch 'feature/8023' into develop The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit ef6e38657a9c3413e70997150db3a72e1c6a55e1 Merge: d65d8e3 7560d97 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Feb 27 08:24:35 2016 +0100 Fixes #8023 Merge branch 'feature/8023' into develop commit 7560d9797ab141f8af8179dd5c1ea38767850c63 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 26 12:42:09 2016 +0100 o Modification du modèle pour avoir les identifiants des lots dans les observations individuelles o Amélioration de l'API de persistence pour utiliser les bons types d'identifiants (Integer au lieu de String) o Nettoyage de code (java 8, variables inline, imports non optimisés, variables non utilisées) commit ac9f78414833fedcc4d4ebc29307012fc780ade6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 26 07:38:45 2016 +0100 Ajout du batchId sur l'entitié IndividualObservation (See #8023) Summary of changes: .../ichtyometer/interactive/CommandEngine.java | 6 +- .../tutti/ichtyometer/tool/FeedReaderTool.java | 49 +- .../tutti/ichtyometer/tool/SendCommandTool.java | 37 +- .../java/fr/ifremer/tutti/ichtyometer/BigFins.java | 19 +- .../tutti/ichtyometer/feed/FeedReaderTest.java | 9 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 68 +-- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 2 +- .../tutti/persistence/TuttiPersistence.java | 4 +- .../tutti/persistence/TuttiPersistenceImpl.java | 133 +++--- .../persistence/TuttiPersistenceNoDbImpl.java | 93 ++-- .../persistence/dao/TaxonNameDaoTuttiImpl.java | 9 +- .../tutti/persistence/entities/TuttiEntities.java | 35 +- .../tutti/persistence/entities/data/Cruises.java | 16 +- .../entities/data/FishingOperations.java | 9 +- .../tutti/persistence/entities/data/Programs.java | 17 +- .../persistence/entities/data/SampleCategory.java | 2 +- .../entities/data/SampleCategoryModel.java | 3 +- .../entities/data/SpeciesAbleBatchs.java | 3 +- .../persistence/entities/data/SpeciesBatchs.java | 8 +- .../entities/protocol/SpeciesProtocols.java | 8 +- .../entities/protocol/TuttiProtocols.java | 18 +- .../entities/protocol/v1/TuttiProtocolBean1.java | 75 +-- .../entities/protocol/v2/TuttiProtocolBean2.java | 102 ++-- .../entities/protocol/v3/SpeciesProtocolBean3.java | 34 +- .../entities/protocol/v3/TuttiProtocolBean3.java | 136 ++---- .../persistence/entities/referential/Gears.java | 44 +- .../persistence/entities/referential/Persons.java | 14 +- .../persistence/entities/referential/Speciess.java | 76 +-- .../entities/referential/TaxonCache.java | 6 +- .../entities/referential/TaxonCaches.java | 12 +- .../entities/referential/TuttiLocations.java | 32 +- .../persistence/entities/referential/Vessels.java | 52 +-- .../tutti/persistence/model/DataModelSupport.java | 5 + .../persistence/model/OperationDataModel.java | 11 +- .../service/AbstractPersistenceService.java | 62 ++- .../service/AccidentalBatchPersistenceService.java | 6 +- .../AccidentalBatchPersistenceServiceImpl.java | 8 +- .../service/AttachmentPersistenceServiceImpl.java | 10 +- .../service/BenthosBatchPersistenceService.java | 21 +- .../BenthosBatchPersistenceServiceImpl.java | 40 +- .../service/CatchBatchPersistenceService.java | 8 +- .../service/CatchBatchPersistenceServiceImpl.java | 16 +- .../service/CruisePersistenceService.java | 6 +- .../service/CruisePersistenceServiceImpl.java | 40 +- .../FishingOperationPersistenceService.java | 12 +- .../FishingOperationPersistenceServiceImpl.java | 66 ++- ...dividualObservationBatchPersistenceService.java | 14 +- ...dualObservationBatchPersistenceServiceImpl.java | 137 ++++-- .../MarineLitterBatchPersistenceService.java | 6 +- .../MarineLitterBatchPersistenceServiceImpl.java | 14 +- .../service/ProgramPersistenceServiceImpl.java | 16 +- .../service/ProtocolPersistenceServiceImpl.java | 11 +- .../service/SpeciesBatchPersistenceService.java | 21 +- .../SpeciesBatchPersistenceServiceImpl.java | 46 +- .../service/TechnicalPersistenceServiceImpl.java | 3 +- .../service/TuttiPersistenceServiceLocator.java | 6 +- .../CaracteristicPersistenceServiceImpl.java | 42 +- .../referential/GearPersistenceServiceImpl.java | 6 +- .../ObjectTypePersistenceServiceImpl.java | 3 +- .../referential/PersonPersistenceServiceImpl.java | 6 +- .../ReferentialPersistenceServiceSupport.java | 6 +- .../referential/SpeciesPersistenceServiceImpl.java | 3 +- .../service/util/BatchPersistenceHelper.java | 73 ++- .../persistence/service/util/BatchTreeHelper.java | 3 +- .../service/util/MeasurementPersistenceHelper.java | 3 +- .../tutti/persistence/test/DatabaseFixtures.java | 21 +- .../main/java/fr/ifremer/tutti/util/Numbers.java | 3 +- .../main/java/fr/ifremer/tutti/util/Weights.java | 3 +- .../src/main/resources/queries-failsafe.hbm.xml | 21 +- .../src/main/xmi/tutti-persistence.zargo | Bin 62284 -> 62341 bytes .../config/TuttiPersistenceConfigTest.java | 3 +- ...AccidentalBatchPersistenceServiceWriteTest.java | 60 ++- .../BenthosBatchPersistenceServiceReadTest.java | 10 +- .../BenthosBatchPersistenceServiceWriteTest.java | 46 +- .../CatchBatchPersistenceServiceReadTest.java | 2 +- .../CatchBatchPersistenceServiceWriteTest.java | 18 +- .../service/CruisePersistenceServiceReadTest.java | 2 +- .../service/CruisePersistenceServiceWriteTest.java | 6 +- ...hingOperationPersistenceServiceAno4995Test.java | 5 +- ...ishingOperationPersistenceServiceWriteTest.java | 16 +- ...bservationBatchPersistenceServiceWriteTest.java | 50 +- ...rineLitterBatchPersistenceServiceWriteTest.java | 16 +- .../SpeciesBatchPersistenceServiceReadTest.java | 10 +- .../SpeciesBatchPersistenceServiceWriteTest.java | 42 +- .../tutti/service/AbstractTuttiService.java | 37 +- .../fr/ifremer/tutti/service/DecoratorService.java | 7 +- .../ifremer/tutti/service/PersistenceService.java | 131 +++--- .../fr/ifremer/tutti/service/TuttiDataContext.java | 96 ++-- .../fr/ifremer/tutti/service/TuttiDecorator.java | 8 +- .../ifremer/tutti/service/TuttiServiceContext.java | 6 +- .../ifremer/tutti/service/ValidationService.java | 54 +-- .../tutti/service/bigfin/BigfinImportContext.java | 37 +- .../tutti/service/bigfin/BigfinImportService.java | 33 +- .../service/bigfin/csv/BigfinDataRowModel.java | 3 +- .../fr/ifremer/tutti/service/bigfin/signs/Sex.java | 8 +- .../ifremer/tutti/service/bigfin/signs/Size.java | 8 +- .../tutti/service/bigfin/signs/VracHorsVrac.java | 8 +- .../catches/ValidateCruiseOperationsService.java | 34 +- .../service/catches/WeightCleaningService.java | 50 +- .../service/catches/WeightComputingService.java | 13 +- .../catches/multipost/AttachmentRowModel.java | 9 +- .../catches/multipost/MultiPostExportService.java | 18 +- .../catches/multipost/MultiPostImportService.java | 512 ++++++++++----------- .../csv/AbstractTuttiImportExportModel.java | 4 +- .../service/csv/AbstractTuttiImportModel.java | 4 +- .../fr/ifremer/tutti/service/csv/CsvComsumer.java | 6 +- .../tutti/service/csv/GearParserFormatter.java | 3 +- .../tutti/service/csv/HarbourParserFormatter.java | 3 +- .../service/csv/IntegerListParserFormatter.java | 9 +- .../fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 29 +- .../tutti/service/csv/VesselParserFormatter.java | 3 +- .../tutti/service/export/ExportBatchEntry.java | 3 +- .../tutti/service/export/ExportCatchContext.java | 28 +- .../export/pdf/CatchesPdfExportService.java | 13 +- .../sumatra/CatchesSumatraExportService.java | 16 +- .../ToConfirmReportFishingOperationData.java | 2 +- .../toconfirmreport/ToConfirmReportService.java | 21 +- .../genericformat/GenericFormatArchive.java | 13 +- .../GenericFormatCheckDataService.java | 14 +- .../genericformat/GenericFormatContextSupport.java | 57 +-- .../genericformat/GenericFormatExportContext.java | 21 +- .../GenericFormatExportOperationContext.java | 10 +- .../genericformat/GenericFormatExportService.java | 25 +- .../GenericFormatImportCruiseContext.java | 18 +- .../GenericFormatImportOperationContext.java | 13 +- .../genericformat/GenericFormatImportService.java | 60 +-- .../GenericFormatImportValidationHelper.java | 9 +- .../genericformat/GenericFormatResultSupport.java | 3 +- .../GenericFormatValidateFileContext.java | 60 ++- .../GenericformatImportPersistenceHelper.java | 39 +- .../consumer/CruiseNotValidException.java | 3 +- .../consumer/CsvConsumerForCatch.java | 10 +- .../FishingOperationNotValidException.java | 3 +- .../genericformat/csv/AccidentalCatchModel.java | 3 +- .../service/genericformat/csv/AttachmentModel.java | 3 +- .../service/genericformat/csv/CatchModel.java | 12 +- .../tutti/service/genericformat/csv/CatchRow.java | 3 +- .../genericformat/csv/GearCaracteristicModel.java | 3 +- .../csv/IndividualObservationModel.java | 3 +- .../genericformat/csv/MarineLitterModel.java | 3 +- .../service/genericformat/csv/OperationModel.java | 3 +- .../service/genericformat/csv/ParameterModel.java | 3 +- .../genericformat/csv/SpeciesExportModel.java | 3 +- .../service/genericformat/csv/SurveyModel.java | 3 +- .../exportactions/CreateCatchBatchRowsAction.java | 3 +- .../ExportGearCaracteristicAction.java | 2 +- .../exportactions/LoadDataAction.java | 4 +- .../importactions/DoCheckWeightAction.java | 18 +- .../importactions/DoCleanWeightAction.java | 18 +- .../importactions/ImportAccidentalCatchAction.java | 2 +- .../importactions/ImportCatchAction.java | 16 +- .../ImportGearCaracteristicAction.java | 25 +- .../ImportIndividualObservationAction.java | 2 +- .../importactions/ImportMarineLitterAction.java | 2 +- .../importactions/ImportOperationAction.java | 55 ++- .../importactions/ImportParameterAction.java | 60 ++- .../ImportReferentialPersonAction.java | 1 - .../ImportReferentialVesselAction.java | 1 - .../importactions/ImportSurveyAction.java | 2 +- .../importactions/RestoreAfterImportAction.java | 14 +- .../importactions/RestoreAfterValidateAction.java | 62 +-- .../importactions/ValidateSurveyAction.java | 2 +- .../producer/CsvProducerForCatch.java | 4 +- .../producer/CsvProducerForSpecies.java | 8 +- .../FishingOperationImportService.java | 8 +- .../operationimport/ImportFromColumnFileModel.java | 67 ++- .../protocol/ProtocolImportExportService.java | 23 +- .../service/psionimport/PsionImportModel.java | 3 +- .../service/psionimport/PsionImportService.java | 8 +- .../service/pupitri/PupitriExportService.java | 10 +- .../service/pupitri/PupitriImportService.java | 8 +- .../service/pupitri/PupitriSpeciesContext.java | 3 +- .../tutti/service/pupitri/csv/CarrouselRow.java | 3 +- .../pupitri/report/PupitriImportReportModel.java | 6 +- .../referential/ReferentialImportRequest.java | 4 +- .../ReferentialTemporaryGearService.java | 6 +- .../ReferentialTemporaryPersonService.java | 6 +- .../ReferentialTemporarySpeciesService.java | 3 +- .../ReferentialTemporaryVesselService.java | 3 +- .../TuttiReferentialSynchronizeService.java | 3 +- .../tutti/service/referential/csv/PersonRow.java | 3 +- .../producer/CsvProducerForTemporaryGear.java | 10 +- .../producer/CsvProducerForTemporaryPerson.java | 10 +- .../producer/CsvProducerForTemporarySpecies.java | 10 +- .../producer/CsvProducerForTemporaryVessel.java | 10 +- .../service/report/ReportGenerationRequest.java | 12 +- .../service/report/ReportGenerationResult.java | 4 +- .../service/report/ReportGenerationService.java | 16 +- .../tutti/service/PersistenceServiceTest.java | 94 ++-- .../ifremer/tutti/service/ServiceDbResource.java | 49 +- .../service/bigfin/BigfinImportService2Test.java | 8 +- .../service/bigfin/BigfinImportServiceTest.java | 12 +- .../catches/WeightComputingServiceTest.java | 16 +- .../multipost/MultiPostExportServiceTest.java | 6 +- .../multipost/MultiPostImportServiceTest.java | 2 +- .../export/pdf/CatchesPdfExportServiceTest.java | 4 +- .../sumatra/CatchesSumatraExportServiceTest.java | 12 +- .../GenericFormatExportServiceAno5804Test.java | 10 +- .../GenericFormatExportServiceAno7992Test.java | 10 +- .../GenericFormatExportServiceTest.java | 10 +- .../psionimport/PsionImportServiceTest.java | 40 +- .../pupitri/PupitriImportServiceAno3898Test.java | 6 +- .../pupitri/PupitriImportServiceAno5032Test.java | 6 +- .../pupitri/PupitriImportServiceAno5079Test.java | 6 +- .../pupitri/PupitriImportServiceEvo5060Test.java | 6 +- .../pupitri/PupitriImportServiceEvo5062Test.java | 6 +- .../pupitri/PupitriImportServiceEvo6116Test.java | 6 +- .../pupitri/PupitriImportServiceEvo6149Test.java | 6 +- .../pupitri/PupitriImportServiceEvo6592Test.java | 6 +- .../service/pupitri/PupitriImportServiceTest.java | 10 +- .../pupitri/PupitryImportServiceTestSupport.java | 6 +- .../ReferentialTemporarySpeciesServiceTest.java | 2 +- .../report/ReportGenerationServiceTest.java | 4 +- .../tutti/ui/swing/updater/UpdateModule.java | 3 +- .../ui/swing/updater/UpdaterFileSystemPathes.java | 24 +- .../java/fr/ifremer/tutti/ui/swing/RunTutti.java | 7 +- .../ifremer/tutti/ui/swing/TuttiActionFactory.java | 3 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 35 +- .../content/actions/ConnectIchtyometerAction.java | 33 +- .../EditCatchesForSelectedCruiseAction.java | 23 +- .../OpenTemporaryReferentialScreenAction.java | 7 +- .../ui/swing/content/actions/ShowAboutAction.java | 48 +- .../category/EditSampleCategoryModelUIHandler.java | 27 +- .../actions/AddSampleCategoryRowAction.java | 11 +- .../swing/content/config/TuttiConfigUIHandler.java | 37 +- .../swing/content/cruise/EditCruiseUIHandler.java | 54 +-- .../cruise/GearCaracteristicsEditorTableModel.java | 3 +- .../cruise/GearCaracteristicsEditorUIHandler.java | 23 +- .../actions/EditGearCaracteristicsAction.java | 4 +- .../content/cruise/actions/SaveCruiseAction.java | 4 +- .../actions/ViewGearCaracteristicsAction.java | 4 +- .../ui/swing/content/db/DbManagerUIHandler.java | 34 +- .../genericformat/tree/ProgramSelectTreeNode.java | 5 +- .../swing/content/home/SelectCruiseUIHandler.java | 119 ++--- .../content/home/actions/CloneProtocolAction.java | 2 +- .../content/home/actions/EditCatchesAction.java | 23 +- .../content/home/actions/EditProtocolAction.java | 2 +- .../home/actions/ExportCruiseForSumatraAction.java | 2 +- .../home/actions/SendCruiseReportAction.java | 2 +- .../SpeciesToConfirmReportForCruiseAction.java | 2 +- .../operation/EditFishingOperationUIHandler.java | 200 ++++---- .../operation/EditFishingOperationUIModel.java | 3 +- .../operation/FishingOperationsUIHandler.java | 120 +++-- .../operation/FishingOperationsUIModel.java | 10 +- .../catches/AbstractTuttiBatchTableUIHandler.java | 44 +- .../content/operation/catches/CatchCustomTab.java | 13 +- .../operation/catches/EditCatchesSvgHandler.java | 330 ++++++------- .../operation/catches/EditCatchesUIHandler.java | 20 +- .../operation/catches/EditCatchesUIModel.java | 24 +- .../catches/MultiPostImportLogDialogHandler.java | 5 - .../catches/SampleCategoryColumnIdentifier.java | 15 +- .../operation/catches/SampleCategoryComponent.java | 26 +- .../catches/SpeciesAbleBatchRowHelper.java | 5 +- .../operation/catches/SpeciesBatchDecorator.java | 2 +- .../accidental/AccidentalBatchTableModel.java | 9 +- .../accidental/AccidentalBatchUIHandler.java | 5 +- .../actions/CancelEditCatchBatchAction.java | 12 +- .../catches/actions/CleanBatchWeightsAction.java | 4 +- .../catches/actions/ComputeBatchWeightsAction.java | 4 +- .../ExportFishingOperationForSumatraAction.java | 4 +- .../ExportFishingOperationReportAction.java | 2 +- .../actions/ExportMultiPostActionSupport.java | 3 +- .../actions/ExportMultiPostCatchAction.java | 3 +- .../actions/ImportMultiPostActionSupport.java | 3 +- .../actions/ImportMultiPostCatchAction.java | 6 +- .../catches/benthos/BenthosBatchRowModel.java | 17 +- .../catches/benthos/BenthosBatchUIHandler.java | 175 +++---- .../benthos/actions/CreateBenthosMelagAction.java | 10 +- .../actions/ImportMultiPostBenthosAction.java | 3 +- .../OpenEditBenthosBatchFrequencyUIAction.java | 5 - .../benthos/actions/RemoveBenthosBatchAction.java | 6 +- .../actions/RemoveBenthosSubBatchAction.java | 2 +- .../benthos/actions/RenameBenthosBatchAction.java | 2 +- .../benthos/create/CreateBenthosBatchUIModel.java | 6 +- .../CreateBenthosBatchAndFrequenciesAction.java | 1 - .../frequency/BenthosFrequencyCellComponent.java | 1 - .../frequency/BenthosFrequencyLogsTableModel.java | 3 +- .../frequency/BenthosFrequencyRowModel.java | 3 +- .../frequency/BenthosFrequencyTableModel.java | 108 ++--- .../frequency/BenthosFrequencyUIHandler.java | 92 ++-- .../benthos/frequency/BenthosFrequencyUIModel.java | 5 +- .../frequency/BenthosFrequencyUIModelCache.java | 7 +- ...thosFrequencyLengthStepCaracteristicAction.java | 2 +- .../benthos/split/SplitBenthosBatchRowModel.java | 6 +- .../benthos/split/SplitBenthosBatchUIHandler.java | 8 +- .../IndividualObservationBatchRowModel.java | 10 + .../IndividualObservationBatchUIHandler.java | 5 +- .../IndividualObservationBatchUIModel.java | 5 +- ...enCreateIndividualObservationBatchUIAction.java | 5 - .../RemoveAllIndividualObservationBatchAction.java | 2 +- .../RemoveIndividualObservationBatchAction.java | 2 +- .../CreateIndividualObservationBatchUIHandler.java | 114 ++--- .../marinelitter/MarineLitterBatchUIHandler.java | 5 +- .../actions/ImportMultiPostMarineLitterAction.java | 3 +- .../OpenCreateMarineLitterBatchUIAction.java | 5 - .../actions/RemoveMarineLitterBatchAction.java | 7 +- .../create/CreateMarineLitterBatchUIModel.java | 6 +- .../ImportPupitriMelagWeightPopupUIHandler.java | 5 - .../ImportPupitriMelagWeightPopupUIModel.java | 2 +- .../species/ImportPupitriPopupUIHandler.java | 18 +- .../catches/species/SpeciesBatchRowModel.java | 18 +- .../catches/species/SpeciesBatchUIHandler.java | 187 +++----- .../actions/ImportMultiPostSpeciesAction.java | 3 +- .../actions/OpenCreateSpeciesBatchUIAction.java | 5 - .../OpenEditSpeciesBatchFrequencyUIAction.java | 5 - .../species/actions/RemoveSpeciesBatchAction.java | 6 +- .../actions/RemoveSpeciesSubBatchAction.java | 2 +- .../species/actions/RenameSpeciesBatchAction.java | 2 +- .../species/create/CreateSpeciesBatchUIModel.java | 6 +- .../frequency/SpeciesFrequencyCellComponent.java | 1 - .../frequency/SpeciesFrequencyLogsTableModel.java | 3 +- .../frequency/SpeciesFrequencyRowModel.java | 3 +- .../frequency/SpeciesFrequencyTableModel.java | 108 ++--- .../frequency/SpeciesFrequencyUIHandler.java | 115 ++--- .../species/frequency/SpeciesFrequencyUIModel.java | 5 +- .../frequency/SpeciesFrequencyUIModelCache.java | 7 +- ...ciesFrequencyLengthStepCaracteristicAction.java | 2 +- .../species/split/SplitSpeciesBatchRowModel.java | 6 +- .../species/split/SplitSpeciesBatchUIHandler.java | 8 +- .../fishing/AbstractCaracteristicRowModel.java | 10 +- .../fishing/AbstractCaracteristicTabUIModel.java | 6 +- .../fishing/GearUseFeatureTabUIHandler.java | 7 - .../fishing/GearUseFeatureTableModel.java | 3 +- .../fishing/VesselUseFeatureTabUIHandler.java | 7 - .../fishing/VesselUseFeatureTableModel.java | 3 +- .../actions/DeleteFishingOperationAction.java | 2 +- .../actions/EditFishingOperationAction.java | 65 ++- ...perationCaracteristicsFromColumnFileAction.java | 11 +- .../content/program/EditProgramUIHandler.java | 3 +- .../EditProtocolCaracteristicsRowModel.java | 2 +- .../protocol/EditProtocolSpeciesRowModel.java | 36 +- .../protocol/EditProtocolSpeciesTableModel.java | 25 +- .../content/protocol/EditProtocolUIHandler.java | 3 +- .../content/protocol/EditProtocolUIModel.java | 24 +- .../MandatorySampleCategoryColumnIdentifier.java | 3 +- .../actions/ExportProtocolBenthosAction.java | 14 +- .../actions/ExportProtocolSpeciesAction.java | 12 +- .../protocol/actions/ExportPupitriAction.java | 16 +- .../actions/ImportProtocolBenthosAction.java | 2 +- .../actions/ImportProtocolSpeciesAction.java | 2 +- .../actions/RemoveCaracteristicMappingAction.java | 6 +- .../MinSizePopupUIHandler.java | 6 - .../actions/DeleteRowAction.java | 8 +- .../actions/DeleteSpeciesAction.java | 5 - .../actions/ExportProtocolCpsAction.java | 3 +- .../actions/ImportProtocolCpsAction.java | 5 +- .../actions/SplitSpeciesAction.java | 5 - .../ui/swing/content/protocol/rtp/RtpButton.java | 23 +- .../content/protocol/rtp/RtpCellRenderer.java | 5 - .../content/protocol/rtp/RtpEditorUIHandler.java | 22 +- .../protocol/zones/actions/AddStratasAction.java | 5 - .../protocol/zones/actions/CreateZoneAction.java | 5 - .../protocol/zones/actions/DeleteZoneAction.java | 5 - .../protocol/zones/actions/RenameZoneAction.java | 5 - .../zones/tree/AbstractZoneEditorTreeModel.java | 6 - .../protocol/zones/tree/StratasTreeModel.java | 7 +- .../protocol/zones/tree/ZoneEditorNode.java | 6 - .../zones/tree/ZoneEditorTreeCellRenderer.java | 5 - .../protocol/zones/tree/ZonesTreeModel.java | 2 +- .../actions/ImportTemporaryGearAction.java | 6 +- .../actions/ImportTemporaryPersonAction.java | 6 +- .../actions/ImportTemporarySpeciesAction.java | 6 +- .../actions/ImportTemporaryVesselAction.java | 6 +- .../actions/OpenReplaceTemporaryGearUIAction.java | 3 +- .../OpenReplaceTemporaryPersonUIAction.java | 3 +- .../OpenReplaceTemporarySpeciesUIAction.java | 3 +- .../OpenReplaceTemporaryVesselUIAction.java | 3 +- .../ui/swing/content/report/ReportUIHandler.java | 2 +- .../ui/swing/content/report/ReportUIModel.java | 10 +- .../validation/ValidateCruiseUIHandler.java | 4 +- .../content/validation/ValidateCruiseUIModel.java | 4 +- .../actions/SaveCruiseToReadyToSynchAction.java | 6 +- .../content/validation/tree/MessageTreeNode.java | 6 +- .../fr/ifremer/tutti/ui/swing/update/Updates.java | 3 +- .../ui/swing/update/module/DbModuleUpdater.java | 12 +- .../ui/swing/util/AbstractTuttiUIHandler.java | 114 ++--- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 12 +- .../ui/swing/util/actions/SimpleActionSupport.java | 12 +- .../ui/swing/util/attachment/ButtonAttachment.java | 14 +- .../CaracteristicMapCellComponent.java | 3 +- .../CaracteristicMapEditorTableModel.java | 3 +- .../caracteristics/CaracteristicValueEditor.java | 3 +- .../computable/ComputableDataEditorHandler.java | 36 +- .../util/computable/ComputableDataTableCell.java | 16 +- .../swing/util/editor/TuttiLocationTableCell.java | 2 +- .../ui/swing/util/editor/VesselTableCell.java | 2 +- .../swing/util/species/SelectSpeciesUIHandler.java | 9 +- .../util/table/AbstractTuttiTableUIHandler.java | 13 +- .../util/table/CaracteristicColumnIdentifier.java | 3 +- 389 files changed, 3214 insertions(+), 4756 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit ac9f78414833fedcc4d4ebc29307012fc780ade6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 26 07:38:45 2016 +0100 Ajout du batchId sur l'entitié IndividualObservation (See #8023) --- .../src/main/xmi/tutti-persistence.zargo | Bin 62284 -> 62341 bytes .../IndividualObservationBatchRowModel.java | 10 ++++++++++ 2 files changed, 10 insertions(+) diff --git a/tutti-persistence/src/main/xmi/tutti-persistence.zargo b/tutti-persistence/src/main/xmi/tutti-persistence.zargo index 65cbeed..0224e4f 100644 Binary files a/tutti-persistence/src/main/xmi/tutti-persistence.zargo and b/tutti-persistence/src/main/xmi/tutti-persistence.zargo differ diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java index 9f7b526..a681389 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java @@ -163,6 +163,16 @@ public class IndividualObservationBatchRowModel extends AbstractTuttiBeanUIModel //------------------------------------------------------------------------// @Override + public Integer getBatchId() { + return editObject.getBatchId(); + } + + @Override + public void setBatchId(Integer batchId) { + editObject.setBatchId(batchId); + } + + @Override public FishingOperation getFishingOperation() { return editObject.getFishingOperation(); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 7560d9797ab141f8af8179dd5c1ea38767850c63 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 26 12:42:09 2016 +0100 o Modification du modèle pour avoir les identifiants des lots dans les observations individuelles o Amélioration de l'API de persistence pour utiliser les bons types d'identifiants (Integer au lieu de String) o Nettoyage de code (java 8, variables inline, imports non optimisés, variables non utilisées) --- .../ichtyometer/interactive/CommandEngine.java | 6 +- .../tutti/ichtyometer/tool/FeedReaderTool.java | 49 +- .../tutti/ichtyometer/tool/SendCommandTool.java | 37 +- .../java/fr/ifremer/tutti/ichtyometer/BigFins.java | 19 +- .../tutti/ichtyometer/feed/FeedReaderTest.java | 9 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 68 +-- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 2 +- .../tutti/persistence/TuttiPersistence.java | 4 +- .../tutti/persistence/TuttiPersistenceImpl.java | 133 +++--- .../persistence/TuttiPersistenceNoDbImpl.java | 93 ++-- .../persistence/dao/TaxonNameDaoTuttiImpl.java | 9 +- .../tutti/persistence/entities/TuttiEntities.java | 35 +- .../tutti/persistence/entities/data/Cruises.java | 16 +- .../entities/data/FishingOperations.java | 9 +- .../tutti/persistence/entities/data/Programs.java | 17 +- .../persistence/entities/data/SampleCategory.java | 2 +- .../entities/data/SampleCategoryModel.java | 3 +- .../entities/data/SpeciesAbleBatchs.java | 3 +- .../persistence/entities/data/SpeciesBatchs.java | 8 +- .../entities/protocol/SpeciesProtocols.java | 8 +- .../entities/protocol/TuttiProtocols.java | 18 +- .../entities/protocol/v1/TuttiProtocolBean1.java | 75 +-- .../entities/protocol/v2/TuttiProtocolBean2.java | 102 ++-- .../entities/protocol/v3/SpeciesProtocolBean3.java | 34 +- .../entities/protocol/v3/TuttiProtocolBean3.java | 136 ++---- .../persistence/entities/referential/Gears.java | 44 +- .../persistence/entities/referential/Persons.java | 14 +- .../persistence/entities/referential/Speciess.java | 76 +-- .../entities/referential/TaxonCache.java | 6 +- .../entities/referential/TaxonCaches.java | 12 +- .../entities/referential/TuttiLocations.java | 32 +- .../persistence/entities/referential/Vessels.java | 52 +-- .../tutti/persistence/model/DataModelSupport.java | 5 + .../persistence/model/OperationDataModel.java | 11 +- .../service/AbstractPersistenceService.java | 62 ++- .../service/AccidentalBatchPersistenceService.java | 6 +- .../AccidentalBatchPersistenceServiceImpl.java | 8 +- .../service/AttachmentPersistenceServiceImpl.java | 10 +- .../service/BenthosBatchPersistenceService.java | 21 +- .../BenthosBatchPersistenceServiceImpl.java | 40 +- .../service/CatchBatchPersistenceService.java | 8 +- .../service/CatchBatchPersistenceServiceImpl.java | 16 +- .../service/CruisePersistenceService.java | 6 +- .../service/CruisePersistenceServiceImpl.java | 40 +- .../FishingOperationPersistenceService.java | 12 +- .../FishingOperationPersistenceServiceImpl.java | 66 ++- ...dividualObservationBatchPersistenceService.java | 14 +- ...dualObservationBatchPersistenceServiceImpl.java | 137 ++++-- .../MarineLitterBatchPersistenceService.java | 6 +- .../MarineLitterBatchPersistenceServiceImpl.java | 14 +- .../service/ProgramPersistenceServiceImpl.java | 16 +- .../service/ProtocolPersistenceServiceImpl.java | 11 +- .../service/SpeciesBatchPersistenceService.java | 21 +- .../SpeciesBatchPersistenceServiceImpl.java | 46 +- .../service/TechnicalPersistenceServiceImpl.java | 3 +- .../service/TuttiPersistenceServiceLocator.java | 6 +- .../CaracteristicPersistenceServiceImpl.java | 42 +- .../referential/GearPersistenceServiceImpl.java | 6 +- .../ObjectTypePersistenceServiceImpl.java | 3 +- .../referential/PersonPersistenceServiceImpl.java | 6 +- .../ReferentialPersistenceServiceSupport.java | 6 +- .../referential/SpeciesPersistenceServiceImpl.java | 3 +- .../service/util/BatchPersistenceHelper.java | 73 ++- .../persistence/service/util/BatchTreeHelper.java | 3 +- .../service/util/MeasurementPersistenceHelper.java | 3 +- .../tutti/persistence/test/DatabaseFixtures.java | 21 +- .../main/java/fr/ifremer/tutti/util/Numbers.java | 3 +- .../main/java/fr/ifremer/tutti/util/Weights.java | 3 +- .../src/main/resources/queries-failsafe.hbm.xml | 21 +- .../config/TuttiPersistenceConfigTest.java | 3 +- ...AccidentalBatchPersistenceServiceWriteTest.java | 60 ++- .../BenthosBatchPersistenceServiceReadTest.java | 10 +- .../BenthosBatchPersistenceServiceWriteTest.java | 46 +- .../CatchBatchPersistenceServiceReadTest.java | 2 +- .../CatchBatchPersistenceServiceWriteTest.java | 18 +- .../service/CruisePersistenceServiceReadTest.java | 2 +- .../service/CruisePersistenceServiceWriteTest.java | 6 +- ...hingOperationPersistenceServiceAno4995Test.java | 5 +- ...ishingOperationPersistenceServiceWriteTest.java | 16 +- ...bservationBatchPersistenceServiceWriteTest.java | 50 +- ...rineLitterBatchPersistenceServiceWriteTest.java | 16 +- .../SpeciesBatchPersistenceServiceReadTest.java | 10 +- .../SpeciesBatchPersistenceServiceWriteTest.java | 42 +- .../tutti/service/AbstractTuttiService.java | 37 +- .../fr/ifremer/tutti/service/DecoratorService.java | 7 +- .../ifremer/tutti/service/PersistenceService.java | 131 +++--- .../fr/ifremer/tutti/service/TuttiDataContext.java | 96 ++-- .../fr/ifremer/tutti/service/TuttiDecorator.java | 8 +- .../ifremer/tutti/service/TuttiServiceContext.java | 6 +- .../ifremer/tutti/service/ValidationService.java | 54 +-- .../tutti/service/bigfin/BigfinImportContext.java | 37 +- .../tutti/service/bigfin/BigfinImportService.java | 33 +- .../service/bigfin/csv/BigfinDataRowModel.java | 3 +- .../fr/ifremer/tutti/service/bigfin/signs/Sex.java | 8 +- .../ifremer/tutti/service/bigfin/signs/Size.java | 8 +- .../tutti/service/bigfin/signs/VracHorsVrac.java | 8 +- .../catches/ValidateCruiseOperationsService.java | 34 +- .../service/catches/WeightCleaningService.java | 50 +- .../service/catches/WeightComputingService.java | 13 +- .../catches/multipost/AttachmentRowModel.java | 9 +- .../catches/multipost/MultiPostExportService.java | 18 +- .../catches/multipost/MultiPostImportService.java | 512 ++++++++++----------- .../csv/AbstractTuttiImportExportModel.java | 4 +- .../service/csv/AbstractTuttiImportModel.java | 4 +- .../fr/ifremer/tutti/service/csv/CsvComsumer.java | 6 +- .../tutti/service/csv/GearParserFormatter.java | 3 +- .../tutti/service/csv/HarbourParserFormatter.java | 3 +- .../service/csv/IntegerListParserFormatter.java | 9 +- .../fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 29 +- .../tutti/service/csv/VesselParserFormatter.java | 3 +- .../tutti/service/export/ExportBatchEntry.java | 3 +- .../tutti/service/export/ExportCatchContext.java | 28 +- .../export/pdf/CatchesPdfExportService.java | 13 +- .../sumatra/CatchesSumatraExportService.java | 16 +- .../ToConfirmReportFishingOperationData.java | 2 +- .../toconfirmreport/ToConfirmReportService.java | 21 +- .../genericformat/GenericFormatArchive.java | 13 +- .../GenericFormatCheckDataService.java | 14 +- .../genericformat/GenericFormatContextSupport.java | 57 +-- .../genericformat/GenericFormatExportContext.java | 21 +- .../GenericFormatExportOperationContext.java | 10 +- .../genericformat/GenericFormatExportService.java | 25 +- .../GenericFormatImportCruiseContext.java | 18 +- .../GenericFormatImportOperationContext.java | 13 +- .../genericformat/GenericFormatImportService.java | 60 +-- .../GenericFormatImportValidationHelper.java | 9 +- .../genericformat/GenericFormatResultSupport.java | 3 +- .../GenericFormatValidateFileContext.java | 60 ++- .../GenericformatImportPersistenceHelper.java | 39 +- .../consumer/CruiseNotValidException.java | 3 +- .../consumer/CsvConsumerForCatch.java | 10 +- .../FishingOperationNotValidException.java | 3 +- .../genericformat/csv/AccidentalCatchModel.java | 3 +- .../service/genericformat/csv/AttachmentModel.java | 3 +- .../service/genericformat/csv/CatchModel.java | 12 +- .../tutti/service/genericformat/csv/CatchRow.java | 3 +- .../genericformat/csv/GearCaracteristicModel.java | 3 +- .../csv/IndividualObservationModel.java | 3 +- .../genericformat/csv/MarineLitterModel.java | 3 +- .../service/genericformat/csv/OperationModel.java | 3 +- .../service/genericformat/csv/ParameterModel.java | 3 +- .../genericformat/csv/SpeciesExportModel.java | 3 +- .../service/genericformat/csv/SurveyModel.java | 3 +- .../exportactions/CreateCatchBatchRowsAction.java | 3 +- .../ExportGearCaracteristicAction.java | 2 +- .../exportactions/LoadDataAction.java | 4 +- .../importactions/DoCheckWeightAction.java | 18 +- .../importactions/DoCleanWeightAction.java | 18 +- .../importactions/ImportAccidentalCatchAction.java | 2 +- .../importactions/ImportCatchAction.java | 16 +- .../ImportGearCaracteristicAction.java | 25 +- .../ImportIndividualObservationAction.java | 2 +- .../importactions/ImportMarineLitterAction.java | 2 +- .../importactions/ImportOperationAction.java | 55 ++- .../importactions/ImportParameterAction.java | 60 ++- .../ImportReferentialPersonAction.java | 1 - .../ImportReferentialVesselAction.java | 1 - .../importactions/ImportSurveyAction.java | 2 +- .../importactions/RestoreAfterImportAction.java | 14 +- .../importactions/RestoreAfterValidateAction.java | 62 +-- .../importactions/ValidateSurveyAction.java | 2 +- .../producer/CsvProducerForCatch.java | 4 +- .../producer/CsvProducerForSpecies.java | 8 +- .../FishingOperationImportService.java | 8 +- .../operationimport/ImportFromColumnFileModel.java | 67 ++- .../protocol/ProtocolImportExportService.java | 23 +- .../service/psionimport/PsionImportModel.java | 3 +- .../service/psionimport/PsionImportService.java | 8 +- .../service/pupitri/PupitriExportService.java | 10 +- .../service/pupitri/PupitriImportService.java | 8 +- .../service/pupitri/PupitriSpeciesContext.java | 3 +- .../tutti/service/pupitri/csv/CarrouselRow.java | 3 +- .../pupitri/report/PupitriImportReportModel.java | 6 +- .../referential/ReferentialImportRequest.java | 4 +- .../ReferentialTemporaryGearService.java | 6 +- .../ReferentialTemporaryPersonService.java | 6 +- .../ReferentialTemporarySpeciesService.java | 3 +- .../ReferentialTemporaryVesselService.java | 3 +- .../TuttiReferentialSynchronizeService.java | 3 +- .../tutti/service/referential/csv/PersonRow.java | 3 +- .../producer/CsvProducerForTemporaryGear.java | 10 +- .../producer/CsvProducerForTemporaryPerson.java | 10 +- .../producer/CsvProducerForTemporarySpecies.java | 10 +- .../producer/CsvProducerForTemporaryVessel.java | 10 +- .../service/report/ReportGenerationRequest.java | 12 +- .../service/report/ReportGenerationResult.java | 4 +- .../service/report/ReportGenerationService.java | 16 +- .../tutti/service/PersistenceServiceTest.java | 94 ++-- .../ifremer/tutti/service/ServiceDbResource.java | 49 +- .../service/bigfin/BigfinImportService2Test.java | 8 +- .../service/bigfin/BigfinImportServiceTest.java | 12 +- .../catches/WeightComputingServiceTest.java | 16 +- .../multipost/MultiPostExportServiceTest.java | 6 +- .../multipost/MultiPostImportServiceTest.java | 2 +- .../export/pdf/CatchesPdfExportServiceTest.java | 4 +- .../sumatra/CatchesSumatraExportServiceTest.java | 12 +- .../GenericFormatExportServiceAno5804Test.java | 10 +- .../GenericFormatExportServiceAno7992Test.java | 10 +- .../GenericFormatExportServiceTest.java | 10 +- .../psionimport/PsionImportServiceTest.java | 40 +- .../pupitri/PupitriImportServiceAno3898Test.java | 6 +- .../pupitri/PupitriImportServiceAno5032Test.java | 6 +- .../pupitri/PupitriImportServiceAno5079Test.java | 6 +- .../pupitri/PupitriImportServiceEvo5060Test.java | 6 +- .../pupitri/PupitriImportServiceEvo5062Test.java | 6 +- .../pupitri/PupitriImportServiceEvo6116Test.java | 6 +- .../pupitri/PupitriImportServiceEvo6149Test.java | 6 +- .../pupitri/PupitriImportServiceEvo6592Test.java | 6 +- .../service/pupitri/PupitriImportServiceTest.java | 10 +- .../pupitri/PupitryImportServiceTestSupport.java | 6 +- .../ReferentialTemporarySpeciesServiceTest.java | 2 +- .../report/ReportGenerationServiceTest.java | 4 +- .../tutti/ui/swing/updater/UpdateModule.java | 3 +- .../ui/swing/updater/UpdaterFileSystemPathes.java | 24 +- .../java/fr/ifremer/tutti/ui/swing/RunTutti.java | 7 +- .../ifremer/tutti/ui/swing/TuttiActionFactory.java | 3 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 35 +- .../content/actions/ConnectIchtyometerAction.java | 33 +- .../EditCatchesForSelectedCruiseAction.java | 23 +- .../OpenTemporaryReferentialScreenAction.java | 7 +- .../ui/swing/content/actions/ShowAboutAction.java | 48 +- .../category/EditSampleCategoryModelUIHandler.java | 27 +- .../actions/AddSampleCategoryRowAction.java | 11 +- .../swing/content/config/TuttiConfigUIHandler.java | 37 +- .../swing/content/cruise/EditCruiseUIHandler.java | 54 +-- .../cruise/GearCaracteristicsEditorTableModel.java | 3 +- .../cruise/GearCaracteristicsEditorUIHandler.java | 23 +- .../actions/EditGearCaracteristicsAction.java | 4 +- .../content/cruise/actions/SaveCruiseAction.java | 4 +- .../actions/ViewGearCaracteristicsAction.java | 4 +- .../ui/swing/content/db/DbManagerUIHandler.java | 34 +- .../genericformat/tree/ProgramSelectTreeNode.java | 5 +- .../swing/content/home/SelectCruiseUIHandler.java | 119 ++--- .../content/home/actions/CloneProtocolAction.java | 2 +- .../content/home/actions/EditCatchesAction.java | 23 +- .../content/home/actions/EditProtocolAction.java | 2 +- .../home/actions/ExportCruiseForSumatraAction.java | 2 +- .../home/actions/SendCruiseReportAction.java | 2 +- .../SpeciesToConfirmReportForCruiseAction.java | 2 +- .../operation/EditFishingOperationUIHandler.java | 200 ++++---- .../operation/EditFishingOperationUIModel.java | 3 +- .../operation/FishingOperationsUIHandler.java | 120 +++-- .../operation/FishingOperationsUIModel.java | 10 +- .../catches/AbstractTuttiBatchTableUIHandler.java | 44 +- .../content/operation/catches/CatchCustomTab.java | 13 +- .../operation/catches/EditCatchesSvgHandler.java | 330 ++++++------- .../operation/catches/EditCatchesUIHandler.java | 20 +- .../operation/catches/EditCatchesUIModel.java | 24 +- .../catches/MultiPostImportLogDialogHandler.java | 5 - .../catches/SampleCategoryColumnIdentifier.java | 15 +- .../operation/catches/SampleCategoryComponent.java | 26 +- .../catches/SpeciesAbleBatchRowHelper.java | 5 +- .../operation/catches/SpeciesBatchDecorator.java | 2 +- .../accidental/AccidentalBatchTableModel.java | 9 +- .../accidental/AccidentalBatchUIHandler.java | 5 +- .../actions/CancelEditCatchBatchAction.java | 12 +- .../catches/actions/CleanBatchWeightsAction.java | 4 +- .../catches/actions/ComputeBatchWeightsAction.java | 4 +- .../ExportFishingOperationForSumatraAction.java | 4 +- .../ExportFishingOperationReportAction.java | 2 +- .../actions/ExportMultiPostActionSupport.java | 3 +- .../actions/ExportMultiPostCatchAction.java | 3 +- .../actions/ImportMultiPostActionSupport.java | 3 +- .../actions/ImportMultiPostCatchAction.java | 6 +- .../catches/benthos/BenthosBatchRowModel.java | 17 +- .../catches/benthos/BenthosBatchUIHandler.java | 175 +++---- .../benthos/actions/CreateBenthosMelagAction.java | 10 +- .../actions/ImportMultiPostBenthosAction.java | 3 +- .../OpenEditBenthosBatchFrequencyUIAction.java | 5 - .../benthos/actions/RemoveBenthosBatchAction.java | 6 +- .../actions/RemoveBenthosSubBatchAction.java | 2 +- .../benthos/actions/RenameBenthosBatchAction.java | 2 +- .../benthos/create/CreateBenthosBatchUIModel.java | 6 +- .../CreateBenthosBatchAndFrequenciesAction.java | 1 - .../frequency/BenthosFrequencyCellComponent.java | 1 - .../frequency/BenthosFrequencyLogsTableModel.java | 3 +- .../frequency/BenthosFrequencyRowModel.java | 3 +- .../frequency/BenthosFrequencyTableModel.java | 108 ++--- .../frequency/BenthosFrequencyUIHandler.java | 92 ++-- .../benthos/frequency/BenthosFrequencyUIModel.java | 5 +- .../frequency/BenthosFrequencyUIModelCache.java | 7 +- ...thosFrequencyLengthStepCaracteristicAction.java | 2 +- .../benthos/split/SplitBenthosBatchRowModel.java | 6 +- .../benthos/split/SplitBenthosBatchUIHandler.java | 8 +- .../IndividualObservationBatchUIHandler.java | 5 +- .../IndividualObservationBatchUIModel.java | 5 +- ...enCreateIndividualObservationBatchUIAction.java | 5 - .../RemoveAllIndividualObservationBatchAction.java | 2 +- .../RemoveIndividualObservationBatchAction.java | 2 +- .../CreateIndividualObservationBatchUIHandler.java | 114 ++--- .../marinelitter/MarineLitterBatchUIHandler.java | 5 +- .../actions/ImportMultiPostMarineLitterAction.java | 3 +- .../OpenCreateMarineLitterBatchUIAction.java | 5 - .../actions/RemoveMarineLitterBatchAction.java | 7 +- .../create/CreateMarineLitterBatchUIModel.java | 6 +- .../ImportPupitriMelagWeightPopupUIHandler.java | 5 - .../ImportPupitriMelagWeightPopupUIModel.java | 2 +- .../species/ImportPupitriPopupUIHandler.java | 18 +- .../catches/species/SpeciesBatchRowModel.java | 18 +- .../catches/species/SpeciesBatchUIHandler.java | 187 +++----- .../actions/ImportMultiPostSpeciesAction.java | 3 +- .../actions/OpenCreateSpeciesBatchUIAction.java | 5 - .../OpenEditSpeciesBatchFrequencyUIAction.java | 5 - .../species/actions/RemoveSpeciesBatchAction.java | 6 +- .../actions/RemoveSpeciesSubBatchAction.java | 2 +- .../species/actions/RenameSpeciesBatchAction.java | 2 +- .../species/create/CreateSpeciesBatchUIModel.java | 6 +- .../frequency/SpeciesFrequencyCellComponent.java | 1 - .../frequency/SpeciesFrequencyLogsTableModel.java | 3 +- .../frequency/SpeciesFrequencyRowModel.java | 3 +- .../frequency/SpeciesFrequencyTableModel.java | 108 ++--- .../frequency/SpeciesFrequencyUIHandler.java | 115 ++--- .../species/frequency/SpeciesFrequencyUIModel.java | 5 +- .../frequency/SpeciesFrequencyUIModelCache.java | 7 +- ...ciesFrequencyLengthStepCaracteristicAction.java | 2 +- .../species/split/SplitSpeciesBatchRowModel.java | 6 +- .../species/split/SplitSpeciesBatchUIHandler.java | 8 +- .../fishing/AbstractCaracteristicRowModel.java | 10 +- .../fishing/AbstractCaracteristicTabUIModel.java | 6 +- .../fishing/GearUseFeatureTabUIHandler.java | 7 - .../fishing/GearUseFeatureTableModel.java | 3 +- .../fishing/VesselUseFeatureTabUIHandler.java | 7 - .../fishing/VesselUseFeatureTableModel.java | 3 +- .../actions/DeleteFishingOperationAction.java | 2 +- .../actions/EditFishingOperationAction.java | 65 ++- ...perationCaracteristicsFromColumnFileAction.java | 11 +- .../content/program/EditProgramUIHandler.java | 3 +- .../EditProtocolCaracteristicsRowModel.java | 2 +- .../protocol/EditProtocolSpeciesRowModel.java | 36 +- .../protocol/EditProtocolSpeciesTableModel.java | 25 +- .../content/protocol/EditProtocolUIHandler.java | 3 +- .../content/protocol/EditProtocolUIModel.java | 24 +- .../MandatorySampleCategoryColumnIdentifier.java | 3 +- .../actions/ExportProtocolBenthosAction.java | 14 +- .../actions/ExportProtocolSpeciesAction.java | 12 +- .../protocol/actions/ExportPupitriAction.java | 16 +- .../actions/ImportProtocolBenthosAction.java | 2 +- .../actions/ImportProtocolSpeciesAction.java | 2 +- .../actions/RemoveCaracteristicMappingAction.java | 6 +- .../MinSizePopupUIHandler.java | 6 - .../actions/DeleteRowAction.java | 8 +- .../actions/DeleteSpeciesAction.java | 5 - .../actions/ExportProtocolCpsAction.java | 3 +- .../actions/ImportProtocolCpsAction.java | 5 +- .../actions/SplitSpeciesAction.java | 5 - .../ui/swing/content/protocol/rtp/RtpButton.java | 23 +- .../content/protocol/rtp/RtpCellRenderer.java | 5 - .../content/protocol/rtp/RtpEditorUIHandler.java | 22 +- .../protocol/zones/actions/AddStratasAction.java | 5 - .../protocol/zones/actions/CreateZoneAction.java | 5 - .../protocol/zones/actions/DeleteZoneAction.java | 5 - .../protocol/zones/actions/RenameZoneAction.java | 5 - .../zones/tree/AbstractZoneEditorTreeModel.java | 6 - .../protocol/zones/tree/StratasTreeModel.java | 7 +- .../protocol/zones/tree/ZoneEditorNode.java | 6 - .../zones/tree/ZoneEditorTreeCellRenderer.java | 5 - .../protocol/zones/tree/ZonesTreeModel.java | 2 +- .../actions/ImportTemporaryGearAction.java | 6 +- .../actions/ImportTemporaryPersonAction.java | 6 +- .../actions/ImportTemporarySpeciesAction.java | 6 +- .../actions/ImportTemporaryVesselAction.java | 6 +- .../actions/OpenReplaceTemporaryGearUIAction.java | 3 +- .../OpenReplaceTemporaryPersonUIAction.java | 3 +- .../OpenReplaceTemporarySpeciesUIAction.java | 3 +- .../OpenReplaceTemporaryVesselUIAction.java | 3 +- .../ui/swing/content/report/ReportUIHandler.java | 2 +- .../ui/swing/content/report/ReportUIModel.java | 10 +- .../validation/ValidateCruiseUIHandler.java | 4 +- .../content/validation/ValidateCruiseUIModel.java | 4 +- .../actions/SaveCruiseToReadyToSynchAction.java | 6 +- .../content/validation/tree/MessageTreeNode.java | 6 +- .../fr/ifremer/tutti/ui/swing/update/Updates.java | 3 +- .../ui/swing/update/module/DbModuleUpdater.java | 12 +- .../ui/swing/util/AbstractTuttiUIHandler.java | 114 ++--- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 12 +- .../ui/swing/util/actions/SimpleActionSupport.java | 12 +- .../ui/swing/util/attachment/ButtonAttachment.java | 14 +- .../CaracteristicMapCellComponent.java | 3 +- .../CaracteristicMapEditorTableModel.java | 3 +- .../caracteristics/CaracteristicValueEditor.java | 3 +- .../computable/ComputableDataEditorHandler.java | 36 +- .../util/computable/ComputableDataTableCell.java | 16 +- .../swing/util/editor/TuttiLocationTableCell.java | 2 +- .../ui/swing/util/editor/VesselTableCell.java | 2 +- .../swing/util/species/SelectSpeciesUIHandler.java | 9 +- .../util/table/AbstractTuttiTableUIHandler.java | 13 +- .../util/table/CaracteristicColumnIdentifier.java | 3 +- 387 files changed, 3204 insertions(+), 4756 deletions(-) diff --git a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngine.java b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngine.java index 82caef6..963e11f 100644 --- a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngine.java +++ b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/interactive/CommandEngine.java @@ -103,8 +103,7 @@ public class CommandEngine { Future<Command> submit = service.submit(call); try { - Command result = submit.get(1, TimeUnit.MINUTES); - return result; + return submit.get(1, TimeUnit.MINUTES); } catch (InterruptedException | TimeoutException e) { throw new IchtyometerCommandException("Time out on command " + question, e); } catch (ExecutionException e) { @@ -168,8 +167,7 @@ public class CommandEngine { String response = responseBuilder.toString(); - Command result = new Command(question, response, null); - return result; + return new Command(question, response, null); } } diff --git a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java index 896458e..164a6e8 100644 --- a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java +++ b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/FeedReaderTool.java @@ -26,14 +26,12 @@ import com.google.common.collect.Lists; import fr.ifremer.tutti.ichtyometer.IchtyometerClient; import fr.ifremer.tutti.ichtyometer.RemoteDeviceChooser; import fr.ifremer.tutti.ichtyometer.feed.FeedReader; -import fr.ifremer.tutti.ichtyometer.feed.event.FeedReaderEvent; import fr.ifremer.tutti.ichtyometer.feed.event.FeedReaderListener; import java.io.Console; import java.io.IOException; import java.io.PrintWriter; import java.util.List; -import java.util.Set; /** * Created on 1/30/14. @@ -48,28 +46,24 @@ public class FeedReaderTool { final PrintWriter writer = System.console().writer(); writer.println("FeedReaderTool: to display record in feed mode v1.0"); - RemoteDeviceChooser remoteDeviceChooser = new RemoteDeviceChooser() { - @Override - public String chooseRemoteDevice(Set<String> remoteDeviceNames) { - List<String> remoteDeviceNameList = Lists.newArrayList(remoteDeviceNames); - Console console = System.console(); - writer.println("Choose you device"); - int i = 0; - for (String remoteDeviceName : remoteDeviceNameList) { - writer.println(i++ + " for device " + remoteDeviceName); - } - writer.println("q (to quit)"); - writer.print("Your choice: "); - writer.flush(); - - String command = console.readLine(); - - if ("q".equals(command)) { - System.exit(0); - } - String deviceName = remoteDeviceNameList.get(Integer.valueOf(command)); - return deviceName; + RemoteDeviceChooser remoteDeviceChooser = remoteDeviceNames -> { + List<String> remoteDeviceNameList = Lists.newArrayList(remoteDeviceNames); + Console console = System.console(); + writer.println("Choose you device"); + int i = 0; + for (String remoteDeviceName : remoteDeviceNameList) { + writer.println(i++ + " for device " + remoteDeviceName); } + writer.println("q (to quit)"); + writer.print("Your choice: "); + writer.flush(); + + String command = console.readLine(); + + if ("q".equals(command)) { + System.exit(0); + } + return remoteDeviceNameList.get(Integer.valueOf(command)); }; IchtyometerClient client = new IchtyometerClient(2); @@ -80,14 +74,7 @@ public class FeedReaderTool { writer.println("client " + client + " is open and listen the board"); - FeedReaderListener listener = new FeedReaderListener() { - - @Override - public void recordRead(FeedReaderEvent event) { - - writer.println("New record: " + event.getRecord()); - } - }; + FeedReaderListener listener = event -> writer.println("New record: " + event.getRecord()); reader.addFeedModeReaderListener(listener); reader.start(client); diff --git a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/SendCommandTool.java b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/SendCommandTool.java index d7c532c..801c965 100644 --- a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/SendCommandTool.java +++ b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/tool/SendCommandTool.java @@ -34,7 +34,6 @@ import java.io.Console; import java.io.IOException; import java.io.PrintWriter; import java.util.List; -import java.util.Set; /** * Created on 2/4/14. @@ -57,27 +56,23 @@ public class SendCommandTool { final PrintWriter writer = console.writer(); writer.println("CommandTool: to send command to the board and wait a result v1.0"); - RemoteDeviceChooser remoteDeviceChooser = new RemoteDeviceChooser() { - @Override - public String chooseRemoteDevice(Set<String> remoteDeviceNames) { - List<String> remoteDeviceNameList = Lists.newArrayList(remoteDeviceNames); - writer.println("Choose you device"); - int i = 0; - for (String remoteDeviceName : remoteDeviceNameList) { - writer.println(i++ + " for device " + remoteDeviceName); - } - writer.println("q (to quit)"); - writer.print("Your choice: "); - writer.flush(); - - String command = console.readLine(); - - if ("q".equals(command)) { - System.exit(0); - } - String deviceName = remoteDeviceNameList.get(Integer.valueOf(command)); - return deviceName; + RemoteDeviceChooser remoteDeviceChooser = remoteDeviceNames -> { + List<String> remoteDeviceNameList = Lists.newArrayList(remoteDeviceNames); + writer.println("Choose you device"); + int i = 0; + for (String remoteDeviceName : remoteDeviceNameList) { + writer.println(i++ + " for device " + remoteDeviceName); } + writer.println("q (to quit)"); + writer.print("Your choice: "); + writer.flush(); + + String command = console.readLine(); + + if ("q".equals(command)) { + System.exit(0); + } + return remoteDeviceNameList.get(Integer.valueOf(command)); }; IchtyometerClient client = new IchtyometerClient(2); diff --git a/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/BigFins.java b/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/BigFins.java index 00c9c3b..6ec86ef 100644 --- a/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/BigFins.java +++ b/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/BigFins.java @@ -28,8 +28,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assume; -import java.util.Set; - /** * Created on 12/9/14. * @@ -45,18 +43,15 @@ public class BigFins { public static void open(IchtyometerClient client) { - RemoteDeviceChooser remoteDeviceChooser = new RemoteDeviceChooser() { - @Override - public String chooseRemoteDevice(Set<String> remoteDeviceNames) { - String result = null; - for (String remoteDeviceName : remoteDeviceNames) { - if (remoteDeviceName.startsWith(BIG_FIN_V2_NAME_PREFIX) || remoteDeviceName.equals("Yo")) { - result = remoteDeviceName; - break; - } + RemoteDeviceChooser remoteDeviceChooser = remoteDeviceNames -> { + String result = null; + for (String remoteDeviceName : remoteDeviceNames) { + if (remoteDeviceName.startsWith(BIG_FIN_V2_NAME_PREFIX) || remoteDeviceName.equals("Yo")) { + result = remoteDeviceName; + break; } - return result; } + return result; }; try { diff --git a/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderTest.java b/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderTest.java index 3300690..fa81b8a 100644 --- a/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderTest.java +++ b/tutti-ichtyometer/src/test/java/fr/ifremer/tutti/ichtyometer/feed/FeedReaderTest.java @@ -24,7 +24,6 @@ package fr.ifremer.tutti.ichtyometer.feed; import fr.ifremer.tutti.ichtyometer.BigFins; import fr.ifremer.tutti.ichtyometer.IchtyometerClient; -import fr.ifremer.tutti.ichtyometer.feed.event.FeedReaderEvent; import fr.ifremer.tutti.ichtyometer.feed.event.FeedReaderListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -70,13 +69,7 @@ public class FeedReaderTest { FeedReader reader = new FeedReader(); - FeedReaderListener listener = new FeedReaderListener() { - - @Override - public void recordRead(FeedReaderEvent event) { - log.info("Reader " + event.getSource() + " read : " + event.getRecord()); - } - }; + FeedReaderListener listener = event -> log.info("Reader " + event.getSource() + " read : " + event.getRecord()); reader.addFeedModeReaderListener(listener); reader.start(client); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java index 8c0c8e2..cbe3529 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java @@ -333,11 +333,12 @@ public class TuttiConfiguration extends ApplicationConfiguration { applicationConfig.setOption(TuttiConfigurationOption.PROGRAM_ID.getKey(), programId); } - public void setCruiseId(String cruiseId) { + public void setCruiseId(Integer cruiseId) { if (cruiseId == null) { - cruiseId = ""; + applicationConfig.setOption(TuttiConfigurationOption.CRUISE_ID.getKey(), ""); + }else { + applicationConfig.setOption(TuttiConfigurationOption.CRUISE_ID.getKey(), cruiseId.toString()); } - applicationConfig.setOption(TuttiConfigurationOption.CRUISE_ID.getKey(), cruiseId); } public void setProtocolId(String protocolId) { @@ -376,8 +377,7 @@ public class TuttiConfiguration extends ApplicationConfiguration { } public SampleCategoryModel getSampleCategoryModel() { - SampleCategoryModel result = applicationConfig.getOption(SampleCategoryModel.class, TuttiConfigurationOption.SAMPLE_CATEGORY_MODEL.getKey()); - return result; + return applicationConfig.getOption(SampleCategoryModel.class, TuttiConfigurationOption.SAMPLE_CATEGORY_MODEL.getKey()); } public String getJdbcUrl() { @@ -401,48 +401,39 @@ public class TuttiConfiguration extends ApplicationConfiguration { } public boolean isSanityDb() { - boolean result = applicationConfig.getOptionAsBoolean(TuttiConfigurationOption.DB_SANITY.getKey()); - return result; + return applicationConfig.getOptionAsBoolean(TuttiConfigurationOption.DB_SANITY.getKey()); } public boolean isHibernateShowSql() { - boolean result = applicationConfig.getOptionAsBoolean(TuttiConfigurationOption.HIBERNATE_SHOW_SQL.getKey()); - return result; + return applicationConfig.getOptionAsBoolean(TuttiConfigurationOption.HIBERNATE_SHOW_SQL.getKey()); } public boolean isHibernateUseSqlComment() { - boolean result = applicationConfig.getOptionAsBoolean(TuttiConfigurationOption.HIBERNATE_USE_SQL_COMMENT.getKey()); - return result; + return applicationConfig.getOptionAsBoolean(TuttiConfigurationOption.HIBERNATE_USE_SQL_COMMENT.getKey()); } public boolean isHibernateFormatSql() { - boolean result = applicationConfig.getOptionAsBoolean(TuttiConfigurationOption.HIBERNATE_FORMAT_SQL.getKey()); - return result; + return applicationConfig.getOptionAsBoolean(TuttiConfigurationOption.HIBERNATE_FORMAT_SQL.getKey()); } public boolean isShowBatchLog() { - boolean result = applicationConfig.getOptionAsBoolean(TuttiConfigurationOption.SHOW_BATCH_LOG.getKey()); - return result; + return applicationConfig.getOptionAsBoolean(TuttiConfigurationOption.SHOW_BATCH_LOG.getKey()); } public boolean isShowMemoryUsage() { - boolean result = applicationConfig.getOptionAsBoolean(TuttiConfigurationOption.SHOW_MEMORY_USAGE.getKey()); - return result; + return applicationConfig.getOptionAsBoolean(TuttiConfigurationOption.SHOW_MEMORY_USAGE.getKey()); } public boolean isGenericFormatImportSkipBackup() { - boolean result = applicationConfig.getOptionAsBoolean(TuttiConfigurationOption.GENERIC_FORMAT_IMPORT_SKIP_BACKUP.getKey()); - return result; + return applicationConfig.getOptionAsBoolean(TuttiConfigurationOption.GENERIC_FORMAT_IMPORT_SKIP_BACKUP.getKey()); } public int getGenericFormatImportMaximumRowsInErrorsPerFile() { - int result = applicationConfig.getOptionAsInt(TuttiConfigurationOption.GENERIC_FORMAT_IMPORT_MAXIMUM_ROWS_IN_ERROR_PER_FILE.getKey()); - return result; + return applicationConfig.getOptionAsInt(TuttiConfigurationOption.GENERIC_FORMAT_IMPORT_MAXIMUM_ROWS_IN_ERROR_PER_FILE.getKey()); } public boolean isImportDbSkipBackup() { - boolean result = applicationConfig.getOptionAsBoolean(TuttiConfigurationOption.IMPORT_DB_SKIP_BACKUP.getKey()); - return result; + return applicationConfig.getOptionAsBoolean(TuttiConfigurationOption.IMPORT_DB_SKIP_BACKUP.getKey()); } @Override @@ -473,26 +464,22 @@ public class TuttiConfiguration extends ApplicationConfiguration { /** @return {@link TuttiConfigurationOption#BASEDIR} value */ public File getBasedir() { - File result = applicationConfig.getOptionAsFile(TuttiConfigurationOption.BASEDIR.getKey()); - return result; + return applicationConfig.getOptionAsFile(TuttiConfigurationOption.BASEDIR.getKey()); } /** @return {@link TuttiConfigurationOption#DATA_DIRECTORY} value */ public File getDataDirectory() { - File result = applicationConfig.getOptionAsFile(TuttiConfigurationOption.DATA_DIRECTORY.getKey()); - return result; + return applicationConfig.getOptionAsFile(TuttiConfigurationOption.DATA_DIRECTORY.getKey()); } /** @return {@link TuttiConfigurationOption#REPORT_HOME_DIRECTORY} value */ public File getReportHomeDirectory() { - File result = applicationConfig.getOptionAsFile(TuttiConfigurationOption.REPORT_HOME_DIRECTORY.getKey()); - return result; + return applicationConfig.getOptionAsFile(TuttiConfigurationOption.REPORT_HOME_DIRECTORY.getKey()); } /** @return {@link TuttiConfigurationOption#REPORT_DIRECTORY} value */ public File getReportDirectory() { - File result = applicationConfig.getOptionAsFile(TuttiConfigurationOption.REPORT_DIRECTORY.getKey()); - return result; + return applicationConfig.getOptionAsFile(TuttiConfigurationOption.REPORT_DIRECTORY.getKey()); } /** @return {@link TuttiConfigurationOption#EXPORT_BACKUP_DIRECTORY} value */ @@ -503,25 +490,21 @@ public class TuttiConfiguration extends ApplicationConfiguration { /** @return {@link TuttiConfigurationOption#REPORT_LOG_DIRECTORY} value */ public File getReportLogDirectory() { - File result = applicationConfig.getOptionAsFile(TuttiConfigurationOption.REPORT_LOG_DIRECTORY.getKey()); - return result; + return applicationConfig.getOptionAsFile(TuttiConfigurationOption.REPORT_LOG_DIRECTORY.getKey()); } /** @return {@link TuttiConfigurationOption#REPORT_BACKUP_DIRECTORY} value */ public File getReportBackupDirectory() { - File result = applicationConfig.getOptionAsFile(TuttiConfigurationOption.REPORT_BACKUP_DIRECTORY.getKey()); - return result; + return applicationConfig.getOptionAsFile(TuttiConfigurationOption.REPORT_BACKUP_DIRECTORY.getKey()); } /** @return {@link TuttiConfigurationOption#GENERIC_FORMAT_REPORT_BACKUP_DIRECTORY} value */ public File getGenericFormatReportBackupDirectory() { - File result = applicationConfig.getOptionAsFile(TuttiConfigurationOption.GENERIC_FORMAT_REPORT_BACKUP_DIRECTORY.getKey()); - return result; + return applicationConfig.getOptionAsFile(TuttiConfigurationOption.GENERIC_FORMAT_REPORT_BACKUP_DIRECTORY.getKey()); } public File getTmpDirectory() { - File result = applicationConfig.getOptionAsFile(TuttiConfigurationOption.TMP_DIRECTORY.getKey()); - return result; + return applicationConfig.getOptionAsFile(TuttiConfigurationOption.TMP_DIRECTORY.getKey()); } public char getCsvSeparator() { @@ -607,9 +590,9 @@ public class TuttiConfiguration extends ApplicationConfiguration { return StringUtils.isBlank(result) ? null : result; } - public String getCruiseId() { + public Integer getCruiseId() { String result = applicationConfig.getOption(TuttiConfigurationOption.CRUISE_ID.getKey()); - return StringUtils.isBlank(result) ? null : result; + return StringUtils.isBlank(result) ? null : Integer.valueOf(result); } public String getProtocolId() { @@ -687,9 +670,8 @@ public class TuttiConfiguration extends ApplicationConfiguration { } public KeyStroke getShortCut(String actionName) { - KeyStroke result = applicationConfig.getOptionAsKeyStroke( + return applicationConfig.getOptionAsKeyStroke( "tutti.ui." + actionName); - return result; } public String getDateFormat() { diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java index a676686..55fb9a6 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java @@ -420,7 +420,7 @@ public enum TuttiConfigurationOption implements ConfigOptionDef { "tutti.cruiseId", n("tutti.config.option.cruiseId.description"), null, - String.class, + Integer.class, false ), diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java index af2e9ff..d4108d3 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java @@ -95,7 +95,7 @@ public interface TuttiPersistence extends TuttiPersistenceServiceImplementor, * @return loaded program * @since 3.14.3 */ - ProgramDataModel loadCruises(String programId, boolean loadFishingOperation, String... cruiseIds); + ProgramDataModel loadCruises(String programId, boolean loadFishingOperation, Integer... cruiseIds); /** * * To load a program for his given cruise and fishing operations. @@ -106,6 +106,6 @@ public interface TuttiPersistence extends TuttiPersistenceServiceImplementor, * @return loaded program * @since 3.14.3 */ - ProgramDataModel loadCruise(String programId, String cruiseId, String... fishingOperationIds); + ProgramDataModel loadCruise(String programId, Integer cruiseId, Integer... fishingOperationIds); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java index c407372..3e26f97 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java @@ -301,36 +301,34 @@ public class TuttiPersistenceImpl implements TuttiPersistence { List<Cruise> cruises = new ArrayList<>(getAllCruise(programId)); Cruises.sort(cruises); for (Cruise cruise : cruises) { - List<String> fishingOperationIds = loadFishingOperation ? getAllFishingOperationIds(cruise.getId()) : Collections.<String>emptyList(); + List<Integer> fishingOperationIds = loadFishingOperation ? getAllFishingOperationIds(cruise.getIdAsInt()) : Collections.<Integer>emptyList(); CruiseDataModel model = loadCruise(cruise, fishingOperationIds); cruiseModels.add(model); } - ProgramDataModel result = new ProgramDataModel(program, cruiseModels); - return result; + return new ProgramDataModel(program, cruiseModels); } @Override - public ProgramDataModel loadCruises(String programId, boolean loadFishingOperation, String... cruiseIds) { + public ProgramDataModel loadCruises(String programId, boolean loadFishingOperation, Integer... cruiseIds) { Program program = getProgram(programId); Set<CruiseDataModel> cruiseModels = new LinkedHashSet<>(); - for (String cruiseId : cruiseIds) { + for (Integer cruiseId : cruiseIds) { Cruise cruise = getCruise(cruiseId); - List<String> fishingOperationIds = loadFishingOperation ? getAllFishingOperationIds(cruise.getId()) : Collections.<String>emptyList(); + List<Integer> fishingOperationIds = loadFishingOperation ? getAllFishingOperationIds(cruise.getIdAsInt()) : Collections.<Integer>emptyList(); CruiseDataModel model = loadCruise(cruise, fishingOperationIds); cruiseModels.add(model); } - ProgramDataModel result = new ProgramDataModel(program, cruiseModels); - return result; + return new ProgramDataModel(program, cruiseModels); } @Override - public ProgramDataModel loadCruise(String programId, String cruiseId, String... fishingOperationIds) { + public ProgramDataModel loadCruise(String programId, Integer cruiseId, Integer... fishingOperationIds) { Program program = getProgram(programId); @@ -339,28 +337,22 @@ public class TuttiPersistenceImpl implements TuttiPersistence { CruiseDataModel model = loadCruise(cruise, Arrays.asList(fishingOperationIds)); cruiseModels.add(model); - ProgramDataModel result = new ProgramDataModel(program, cruiseModels); - return result; + return new ProgramDataModel(program, cruiseModels); } - protected CruiseDataModel loadCruise(Cruise cruise, List<String> fishingOperationIds) { + protected CruiseDataModel loadCruise(Cruise cruise, List<Integer> fishingOperationIds) { Set<OperationDataModel> fishingOperationModels = new LinkedHashSet<>(); - List<FishingOperation> fishingOperations = new ArrayList<>(getAllFishingOperation(cruise.getId())); + List<FishingOperation> fishingOperations = new ArrayList<>(getAllFishingOperation(cruise.getIdAsInt())); FishingOperations.sort(fishingOperations); - for (FishingOperation fishingOperation : fishingOperations) { - - if (fishingOperationIds.contains(fishingOperation.getId())) { - OperationDataModel model = new OperationDataModel(fishingOperation); - fishingOperationModels.add(model); - } - - } + fishingOperations.stream().filter(fishingOperation -> fishingOperationIds.contains(fishingOperation.getIdAsInt())).forEach(fishingOperation -> { + OperationDataModel model = new OperationDataModel(fishingOperation); + fishingOperationModels.add(model); + }); - CruiseDataModel result = new CruiseDataModel(cruise, fishingOperationModels); - return result; + return new CruiseDataModel(cruise, fishingOperationModels); } @@ -935,7 +927,7 @@ public class TuttiPersistenceImpl implements TuttiPersistence { @Override - public List<String> getAllCruiseId(String programId) { + public List<Integer> getAllCruiseId(String programId) { return getCruiseService().getAllCruiseId(programId); } @@ -945,7 +937,7 @@ public class TuttiPersistenceImpl implements TuttiPersistence { } @Override - public Cruise getCruise(String id) { + public Cruise getCruise(Integer id) { return getCruiseService().getCruise(id); } @@ -967,7 +959,7 @@ public class TuttiPersistenceImpl implements TuttiPersistence { } @Override - public CaracteristicMap getGearCaracteristics(String cruiseId, String gearId, short rankOrder) { + public CaracteristicMap getGearCaracteristics(Integer cruiseId, Integer gearId, short rankOrder) { return getCruiseService().getGearCaracteristics(cruiseId, gearId, rankOrder); } @@ -1073,27 +1065,27 @@ public class TuttiPersistenceImpl implements TuttiPersistence { //------------------------------------------------------------------------// @Override - public int getFishingOperationCount(String cruiseId) { + public int getFishingOperationCount(Integer cruiseId) { return getFishingOperationService().getFishingOperationCount(cruiseId); } @Override - public List<String> getAllFishingOperationIds(String cruiseId) { + public List<Integer> getAllFishingOperationIds(Integer cruiseId) { return getFishingOperationService().getAllFishingOperationIds(cruiseId); } @Override - public List<FishingOperation> getAllFishingOperation(String cruiseId) { + public List<FishingOperation> getAllFishingOperation(Integer cruiseId) { return getFishingOperationService().getAllFishingOperation(cruiseId); } @Override - public FishingOperation getFishingOperation(String id) { + public FishingOperation getFishingOperation(Integer id) { return getFishingOperationService().getFishingOperation(id); } @Override - public List<Vessel> getFishingOperationSecondaryVessel(String fishingOperationId) { + public List<Vessel> getFishingOperationSecondaryVessel(Integer fishingOperationId) { return getFishingOperationService().getFishingOperationSecondaryVessel(fishingOperationId); } @@ -1113,7 +1105,7 @@ public class TuttiPersistenceImpl implements TuttiPersistence { } @Override - public void deleteFishingOperation(String id) { + public void deleteFishingOperation(Integer id) { getFishingOperationService().deleteFishingOperation(id); } @@ -1122,12 +1114,12 @@ public class TuttiPersistenceImpl implements TuttiPersistence { //------------------------------------------------------------------------// @Override - public boolean isFishingOperationWithCatchBatch(String operationId) { + public boolean isFishingOperationWithCatchBatch(Integer operationId) { return getCatchBatchService().isFishingOperationWithCatchBatch(operationId); } @Override - public CatchBatch getCatchBatchFromFishingOperation(String id) throws InvalidBatchModelException { + public CatchBatch getCatchBatchFromFishingOperation(Integer id) throws InvalidBatchModelException { return getCatchBatchService().getCatchBatchFromFishingOperation(id); } @@ -1142,12 +1134,12 @@ public class TuttiPersistenceImpl implements TuttiPersistence { } @Override - public void deleteCatchBatch(String fishingOperationId) { + public void deleteCatchBatch(Integer fishingOperationId) { getCatchBatchService().deleteCatchBatch(fishingOperationId); } @Override - public void recomputeCatchBatchSampleRatios(String fishingOperationId) { + public void recomputeCatchBatchSampleRatios(Integer fishingOperationId) { getCatchBatchService().recomputeCatchBatchSampleRatios(fishingOperationId); } @@ -1156,17 +1148,17 @@ public class TuttiPersistenceImpl implements TuttiPersistence { //------------------------------------------------------------------------// @Override - public BatchContainer<SpeciesBatch> getRootSpeciesBatch(String fishingOperationId, boolean validateTree) throws InvalidBatchModelException { + public BatchContainer<SpeciesBatch> getRootSpeciesBatch(Integer fishingOperationId, boolean validateTree) throws InvalidBatchModelException { return getSpeciesBatchService().getRootSpeciesBatch(fishingOperationId, validateTree); } @Override - public SpeciesBatch createSpeciesBatch(SpeciesBatch bean, String parentBatchId, boolean computeRankOrder) { + public SpeciesBatch createSpeciesBatch(SpeciesBatch bean, Integer parentBatchId, boolean computeRankOrder) { return getSpeciesBatchService().createSpeciesBatch(bean, parentBatchId, computeRankOrder); } @Override - public Collection<SpeciesBatch> createSpeciesBatches(String fishingOperationId, Collection<SpeciesBatch> beans) { + public Collection<SpeciesBatch> createSpeciesBatches(Integer fishingOperationId, Collection<SpeciesBatch> beans) { return getSpeciesBatchService().createSpeciesBatches(fishingOperationId, beans); } @@ -1176,27 +1168,27 @@ public class TuttiPersistenceImpl implements TuttiPersistence { } @Override - public void deleteSpeciesBatch(String id) { + public void deleteSpeciesBatch(Integer id) { getSpeciesBatchService().deleteSpeciesBatch(id); } @Override - public void deleteSpeciesSubBatch(String id) { + public void deleteSpeciesSubBatch(Integer id) { getSpeciesBatchService().deleteSpeciesSubBatch(id); } @Override - public void changeSpeciesBatchSpecies(String batchId, Species species) { + public void changeSpeciesBatchSpecies(Integer batchId, Species species) { getSpeciesBatchService().changeSpeciesBatchSpecies(batchId, species); } @Override - public List<SpeciesBatch> getAllSpeciesBatchToConfirm(String fishingOperationId) throws InvalidBatchModelException { + public List<SpeciesBatch> getAllSpeciesBatchToConfirm(Integer fishingOperationId) throws InvalidBatchModelException { return getSpeciesBatchService().getAllSpeciesBatchToConfirm(fishingOperationId); } @Override - public List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency(String speciesBatchId) { + public List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency(Integer speciesBatchId) { return getSpeciesBatchService().getAllSpeciesBatchFrequency(speciesBatchId); } @@ -1206,7 +1198,7 @@ public class TuttiPersistenceImpl implements TuttiPersistence { } @Override - public List<SpeciesBatchFrequency> saveSpeciesBatchFrequency(String speciesBatchId, List<SpeciesBatchFrequency> frequencies) { + public List<SpeciesBatchFrequency> saveSpeciesBatchFrequency(Integer speciesBatchId, List<SpeciesBatchFrequency> frequencies) { return getSpeciesBatchService().saveSpeciesBatchFrequency(speciesBatchId, frequencies); } @@ -1215,17 +1207,17 @@ public class TuttiPersistenceImpl implements TuttiPersistence { //------------------------------------------------------------------------// @Override - public BatchContainer<BenthosBatch> getRootBenthosBatch(String fishingOperationId, boolean validateTree) throws InvalidBatchModelException { + public BatchContainer<BenthosBatch> getRootBenthosBatch(Integer fishingOperationId, boolean validateTree) throws InvalidBatchModelException { return getBenthosBatchService().getRootBenthosBatch(fishingOperationId, validateTree); } @Override - public BenthosBatch createBenthosBatch(BenthosBatch bean, String parentBatchId, boolean computeRankOrder) { + public BenthosBatch createBenthosBatch(BenthosBatch bean, Integer parentBatchId, boolean computeRankOrder) { return getBenthosBatchService().createBenthosBatch(bean, parentBatchId, computeRankOrder); } @Override - public Collection<BenthosBatch> createBenthosBatches(String fishingOperationId, Collection<BenthosBatch> beans) { + public Collection<BenthosBatch> createBenthosBatches(Integer fishingOperationId, Collection<BenthosBatch> beans) { return getBenthosBatchService().createBenthosBatches(fishingOperationId, beans); } @@ -1235,27 +1227,27 @@ public class TuttiPersistenceImpl implements TuttiPersistence { } @Override - public void deleteBenthosBatch(String id) { + public void deleteBenthosBatch(Integer id) { getBenthosBatchService().deleteBenthosBatch(id); } @Override - public void deleteBenthosSubBatch(String id) { + public void deleteBenthosSubBatch(Integer id) { getBenthosBatchService().deleteBenthosSubBatch(id); } @Override - public void changeBenthosBatchSpecies(String batchId, Species species) { + public void changeBenthosBatchSpecies(Integer batchId, Species species) { getBenthosBatchService().changeBenthosBatchSpecies(batchId, species); } @Override - public List<BenthosBatch> getAllBenthosBatchToConfirm(String fishingOperationId) throws InvalidBatchModelException { + public List<BenthosBatch> getAllBenthosBatchToConfirm(Integer fishingOperationId) throws InvalidBatchModelException { return getBenthosBatchService().getAllBenthosBatchToConfirm(fishingOperationId); } @Override - public List<BenthosBatchFrequency> getAllBenthosBatchFrequency(String benthosBatchId) { + public List<BenthosBatchFrequency> getAllBenthosBatchFrequency(Integer benthosBatchId) { return getBenthosBatchService().getAllBenthosBatchFrequency(benthosBatchId); } @@ -1265,7 +1257,7 @@ public class TuttiPersistenceImpl implements TuttiPersistence { } @Override - public List<BenthosBatchFrequency> saveBenthosBatchFrequency(String benthosBatchId, + public List<BenthosBatchFrequency> saveBenthosBatchFrequency(Integer benthosBatchId, List<BenthosBatchFrequency> frequencies) { return getBenthosBatchService().saveBenthosBatchFrequency(benthosBatchId, frequencies); } @@ -1275,7 +1267,7 @@ public class TuttiPersistenceImpl implements TuttiPersistence { //------------------------------------------------------------------------// @Override - public BatchContainer<MarineLitterBatch> getRootMarineLitterBatch(String fishingOperationId) { + public BatchContainer<MarineLitterBatch> getRootMarineLitterBatch(Integer fishingOperationId) { return getMarineLitterBatchService().getRootMarineLitterBatch(fishingOperationId); } @@ -1285,7 +1277,7 @@ public class TuttiPersistenceImpl implements TuttiPersistence { } @Override - public Collection<MarineLitterBatch> createMarineLitterBatches(String fishingOperationId, Collection<MarineLitterBatch> beans) { + public Collection<MarineLitterBatch> createMarineLitterBatches(Integer fishingOperationId, Collection<MarineLitterBatch> beans) { return getMarineLitterBatchService().createMarineLitterBatches(fishingOperationId, beans); } @@ -1295,7 +1287,7 @@ public class TuttiPersistenceImpl implements TuttiPersistence { } @Override - public void deleteMarineLitterBatch(String id) { + public void deleteMarineLitterBatch(Integer id) { getMarineLitterBatchService().deleteMarineLitterBatch(id); } @@ -1304,7 +1296,7 @@ public class TuttiPersistenceImpl implements TuttiPersistence { //------------------------------------------------------------------------// @Override - public List<AccidentalBatch> getAllAccidentalBatch(String fishingOperationId) { + public List<AccidentalBatch> getAllAccidentalBatch(Integer fishingOperationId) { return getAccidentalBatchService().getAllAccidentalBatch(fishingOperationId); } @@ -1314,7 +1306,7 @@ public class TuttiPersistenceImpl implements TuttiPersistence { } @Override - public Collection<AccidentalBatch> createAccidentalBatches(String fishingOperationId, Collection<AccidentalBatch> beans) { + public Collection<AccidentalBatch> createAccidentalBatches(Integer fishingOperationId, Collection<AccidentalBatch> beans) { return getAccidentalBatchService().createAccidentalBatches(fishingOperationId, beans); } @@ -1329,7 +1321,7 @@ public class TuttiPersistenceImpl implements TuttiPersistence { } @Override - public void deleteAccidentalBatchForFishingOperation(String fishingOperationId) { + public void deleteAccidentalBatchForFishingOperation(Integer fishingOperationId) { getAccidentalBatchService().deleteAccidentalBatchForFishingOperation(fishingOperationId); } @@ -1338,18 +1330,23 @@ public class TuttiPersistenceImpl implements TuttiPersistence { //------------------------------------------------------------------------// @Override - public List<IndividualObservationBatch> getAllIndividualObservationBatch(String fishingOperationId) { - return getIndividualObservationBatchService().getAllIndividualObservationBatch(fishingOperationId); + public List<IndividualObservationBatch> getAllIndividualObservationBatchsForBatch(Integer batchId) { + return getIndividualObservationBatchService().getAllIndividualObservationBatchsForBatch(batchId); } @Override - public IndividualObservationBatch createIndividualObservationBatch(IndividualObservationBatch bean) { - return getIndividualObservationBatchService().createIndividualObservationBatch(bean); + public List<IndividualObservationBatch> getAllIndividualObservationBatchsForFishingOperation(Integer fishingOperationId) { + return getIndividualObservationBatchService().getAllIndividualObservationBatchsForFishingOperation(fishingOperationId); } @Override - public Collection<IndividualObservationBatch> createIndividualObservationBatches(String fishingOperationId, Collection<IndividualObservationBatch> beans) { - return getIndividualObservationBatchService().createIndividualObservationBatches(fishingOperationId, beans); + public List<IndividualObservationBatch> getAllIndividualObservationBatchsForCruise(Integer cruiseId) { + return getIndividualObservationBatchService().getAllIndividualObservationBatchsForCruise(cruiseId); + } + + @Override + public IndividualObservationBatch createIndividualObservationBatch(IndividualObservationBatch bean) { + return getIndividualObservationBatchService().createIndividualObservationBatch(bean); } @Override @@ -1358,12 +1355,12 @@ public class TuttiPersistenceImpl implements TuttiPersistence { } @Override - public void deleteIndividualObservationBatch(String id) { + public void deleteIndividualObservationBatch(Integer id) { getIndividualObservationBatchService().deleteIndividualObservationBatch(id); } @Override - public void deleteIndividualObservationBatchForFishingOperation(String fishingOperationId) { + public void deleteIndividualObservationBatchForFishingOperation(Integer fishingOperationId) { getIndividualObservationBatchService().deleteIndividualObservationBatchForFishingOperation(fishingOperationId); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java index 623ac90..8f94867 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java @@ -84,12 +84,12 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { } @Override - public ProgramDataModel loadCruises(String programId, boolean loadFishingOperation, String... cruiseIds) { + public ProgramDataModel loadCruises(String programId, boolean loadFishingOperation, Integer... cruiseIds) { throw notImplemented(); } @Override - public ProgramDataModel loadCruise(String programId, String cruiseId, String... fishingOperationIds) { + public ProgramDataModel loadCruise(String programId, Integer cruiseId, Integer... fishingOperationIds) { throw notImplemented(); } @@ -488,7 +488,7 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { @Override - public List<String> getAllCruiseId(String programId) { + public List<Integer> getAllCruiseId(String programId) { throw notImplemented(); } @@ -498,7 +498,7 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { } @Override - public Cruise getCruise(String id) { + public Cruise getCruise(Integer id) { throw notImplemented(); } @@ -520,7 +520,7 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { } @Override - public CaracteristicMap getGearCaracteristics(String cruiseId, String gearId, short rankOrder) { + public CaracteristicMap getGearCaracteristics(Integer cruiseId, Integer gearId, short rankOrder) { throw notImplemented(); } @@ -603,27 +603,27 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { //------------------------------------------------------------------------// @Override - public int getFishingOperationCount(String cruiseId) { + public int getFishingOperationCount(Integer cruiseId) { throw notImplemented(); } @Override - public List<String> getAllFishingOperationIds(String cruiseId) { + public List<Integer> getAllFishingOperationIds(Integer cruiseId) { throw notImplemented(); } @Override - public List<FishingOperation> getAllFishingOperation(String cruiseId) { + public List<FishingOperation> getAllFishingOperation(Integer cruiseId) { throw notImplemented(); } @Override - public FishingOperation getFishingOperation(String id) { + public FishingOperation getFishingOperation(Integer id) { throw notImplemented(); } @Override - public List<Vessel> getFishingOperationSecondaryVessel(String fishingOperationId) { + public List<Vessel> getFishingOperationSecondaryVessel(Integer fishingOperationId) { throw notImplemented(); } @@ -638,12 +638,12 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { } @Override - public void deleteFishingOperation(String id) { + public void deleteFishingOperation(Integer id) { throw notImplemented(); } @Override - public boolean isFishingOperationWithCatchBatch(String operationId) { + public boolean isFishingOperationWithCatchBatch(Integer operationId) { throw notImplemented(); } @@ -652,7 +652,7 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { //------------------------------------------------------------------------// @Override - public CatchBatch getCatchBatchFromFishingOperation(String id) { + public CatchBatch getCatchBatchFromFishingOperation(Integer id) { throw notImplemented(); } @@ -667,7 +667,7 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { } @Override - public void recomputeCatchBatchSampleRatios(String fishingOperationId) { + public void recomputeCatchBatchSampleRatios(Integer fishingOperationId) { throw notImplemented(); } @@ -676,17 +676,17 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { //------------------------------------------------------------------------// @Override - public BatchContainer<SpeciesBatch> getRootSpeciesBatch(String fishingOperationId, boolean validateTree) throws InvalidBatchModelException { + public BatchContainer<SpeciesBatch> getRootSpeciesBatch(Integer fishingOperationId, boolean validateTree) throws InvalidBatchModelException { throw notImplemented(); } @Override - public SpeciesBatch createSpeciesBatch(SpeciesBatch bean, String parentBatchId, boolean computeRankOrder) { + public SpeciesBatch createSpeciesBatch(SpeciesBatch bean, Integer parentBatchId, boolean computeRankOrder) { throw notImplemented(); } @Override - public Collection<SpeciesBatch> createSpeciesBatches(String fishingOperationId, Collection<SpeciesBatch> beans) { + public Collection<SpeciesBatch> createSpeciesBatches(Integer fishingOperationId, Collection<SpeciesBatch> beans) { throw notImplemented(); } @@ -696,27 +696,27 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { } @Override - public void deleteSpeciesBatch(String id) { + public void deleteSpeciesBatch(Integer id) { throw notImplemented(); } @Override - public void deleteSpeciesSubBatch(String id) { + public void deleteSpeciesSubBatch(Integer id) { throw notImplemented(); } @Override - public void changeSpeciesBatchSpecies(String batchId, Species species) { + public void changeSpeciesBatchSpecies(Integer batchId, Species species) { throw notImplemented(); } @Override - public List<SpeciesBatch> getAllSpeciesBatchToConfirm(String fishingOperationId) throws InvalidBatchModelException { + public List<SpeciesBatch> getAllSpeciesBatchToConfirm(Integer fishingOperationId) throws InvalidBatchModelException { throw notImplemented(); } @Override - public List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency(String speciesBatchId) { + public List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency(Integer speciesBatchId) { throw notImplemented(); } @@ -726,7 +726,7 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { } @Override - public List<SpeciesBatchFrequency> saveSpeciesBatchFrequency(String speciesBatchId, List<SpeciesBatchFrequency> frequencies) { + public List<SpeciesBatchFrequency> saveSpeciesBatchFrequency(Integer speciesBatchId, List<SpeciesBatchFrequency> frequencies) { throw notImplemented(); } @@ -735,17 +735,17 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { //------------------------------------------------------------------------// @Override - public BatchContainer<BenthosBatch> getRootBenthosBatch(String fishingOperationId, boolean validateTree) throws InvalidBatchModelException { + public BatchContainer<BenthosBatch> getRootBenthosBatch(Integer fishingOperationId, boolean validateTree) throws InvalidBatchModelException { throw notImplemented(); } @Override - public BenthosBatch createBenthosBatch(BenthosBatch bean, String parentBatchId, boolean computeRankOrder) { + public BenthosBatch createBenthosBatch(BenthosBatch bean, Integer parentBatchId, boolean computeRankOrder) { throw notImplemented(); } @Override - public Collection<BenthosBatch> createBenthosBatches(String fishingOperationId, Collection<BenthosBatch> beans) { + public Collection<BenthosBatch> createBenthosBatches(Integer fishingOperationId, Collection<BenthosBatch> beans) { throw notImplemented(); } @@ -755,27 +755,27 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { } @Override - public void deleteBenthosBatch(String id) { + public void deleteBenthosBatch(Integer id) { throw notImplemented(); } @Override - public void deleteBenthosSubBatch(String id) { + public void deleteBenthosSubBatch(Integer id) { throw notImplemented(); } @Override - public void changeBenthosBatchSpecies(String batchId, Species species) { + public void changeBenthosBatchSpecies(Integer batchId, Species species) { throw notImplemented(); } @Override - public List<BenthosBatch> getAllBenthosBatchToConfirm(String fishingOperationId) throws InvalidBatchModelException { + public List<BenthosBatch> getAllBenthosBatchToConfirm(Integer fishingOperationId) throws InvalidBatchModelException { throw notImplemented(); } @Override - public List<BenthosBatchFrequency> getAllBenthosBatchFrequency(String benthosBatchId) { + public List<BenthosBatchFrequency> getAllBenthosBatchFrequency(Integer benthosBatchId) { throw notImplemented(); } @@ -785,7 +785,7 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { } @Override - public List<BenthosBatchFrequency> saveBenthosBatchFrequency(String benthosBatchId, List<BenthosBatchFrequency> frequencies) { + public List<BenthosBatchFrequency> saveBenthosBatchFrequency(Integer benthosBatchId, List<BenthosBatchFrequency> frequencies) { throw notImplemented(); } @@ -794,7 +794,7 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { //------------------------------------------------------------------------// @Override - public BatchContainer<MarineLitterBatch> getRootMarineLitterBatch(String fishingOperationId) { + public BatchContainer<MarineLitterBatch> getRootMarineLitterBatch(Integer fishingOperationId) { throw notImplemented(); } @@ -804,7 +804,7 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { } @Override - public Collection<MarineLitterBatch> createMarineLitterBatches(String fishingOperationId, Collection<MarineLitterBatch> beans) { + public Collection<MarineLitterBatch> createMarineLitterBatches(Integer fishingOperationId, Collection<MarineLitterBatch> beans) { throw notImplemented(); } @@ -814,7 +814,7 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { } @Override - public void deleteMarineLitterBatch(String id) { + public void deleteMarineLitterBatch(Integer id) { throw notImplemented(); } @@ -823,7 +823,7 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { //------------------------------------------------------------------------// @Override - public List<AccidentalBatch> getAllAccidentalBatch(String fishingOperationId) { + public List<AccidentalBatch> getAllAccidentalBatch(Integer fishingOperationId) { throw notImplemented(); } @@ -833,7 +833,7 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { } @Override - public Collection<AccidentalBatch> createAccidentalBatches(String fishingOperationId, Collection<AccidentalBatch> beans) { + public Collection<AccidentalBatch> createAccidentalBatches(Integer fishingOperationId, Collection<AccidentalBatch> beans) { throw notImplemented(); } @@ -878,17 +878,22 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { //------------------------------------------------------------------------// @Override - public List<IndividualObservationBatch> getAllIndividualObservationBatch(String fishingOperationId) { + public List<IndividualObservationBatch> getAllIndividualObservationBatchsForBatch(Integer batchId) { throw notImplemented(); } @Override - public IndividualObservationBatch createIndividualObservationBatch(IndividualObservationBatch bean) { + public List<IndividualObservationBatch> getAllIndividualObservationBatchsForFishingOperation(Integer fishingOperationId) { + throw notImplemented(); + } + + @Override + public List<IndividualObservationBatch> getAllIndividualObservationBatchsForCruise(Integer cruiseId) { throw notImplemented(); } @Override - public Collection<IndividualObservationBatch> createIndividualObservationBatches(String fishingOperationId, Collection<IndividualObservationBatch> beans) { + public IndividualObservationBatch createIndividualObservationBatch(IndividualObservationBatch bean) { throw notImplemented(); } @@ -898,7 +903,7 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { } @Override - public void deleteIndividualObservationBatch(String id) { + public void deleteIndividualObservationBatch(Integer id) { throw notImplemented(); } @@ -911,7 +916,7 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { } @Override - public void deleteAccidentalBatchForFishingOperation(String fishingOperationId) { + public void deleteAccidentalBatchForFishingOperation(Integer fishingOperationId) { throw notImplemented(); } @@ -921,7 +926,7 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { } @Override - public void deleteCatchBatch(String fishingOperationId) { + public void deleteCatchBatch(Integer fishingOperationId) { throw notImplemented(); } @@ -931,7 +936,7 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { } @Override - public void deleteIndividualObservationBatchForFishingOperation(String fishingOperationId) { + public void deleteIndividualObservationBatchForFishingOperation(Integer fishingOperationId) { throw notImplemented(); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/dao/TaxonNameDaoTuttiImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/dao/TaxonNameDaoTuttiImpl.java index f212b8d..b6b8bde 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/dao/TaxonNameDaoTuttiImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/dao/TaxonNameDaoTuttiImpl.java @@ -70,7 +70,7 @@ public class TaxonNameDaoTuttiImpl extends TaxonNameDaoImpl implements TaxonName query = session.getNamedQuery("allTaxonNamesIsReferentWithObsoletes"); } - List<TaxonRefVO> results = new ArrayList<TaxonRefVO>(); + List<TaxonRefVO> results = new ArrayList<>(); for (Iterator<Object[]> iterator = query.iterate(); iterator.hasNext(); ) { Object[] cols = iterator.next(); TaxonRefVO taxonNameRefTaxVO = loadTaxon(cols, false); @@ -84,12 +84,7 @@ public class TaxonNameDaoTuttiImpl extends TaxonNameDaoImpl implements TaxonName query = session.getNamedQuery("allTranscribingForAType"); query.setInteger("transcribingTypeId", transcribingId); - Multimap<Integer, TaxonRefVO> r = Multimaps.index(results, new Function<TaxonRefVO, Integer>() { - @Override - public Integer apply(fr.ifremer.adagio.core.dao.referential.taxon.TaxonRefVO input) { - return input.getReferenceTaxonId(); - } - }); + Multimap<Integer, TaxonRefVO> r = Multimaps.index(results, TaxonRefVO::getReferenceTaxonId); for (Iterator<Object[]> iterator = query.iterate(); iterator.hasNext(); ) { Object[] cols = iterator.next(); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java index d42dc5e..2dff4b0 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java @@ -28,7 +28,6 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -46,18 +45,16 @@ public class TuttiEntities { // helper class does not instanciate } - public static <B extends TuttiEntity> List<String> toIds(Collection<B> list) { - List<String> result = list == null ? - Collections.<String>emptyList() : - Lists.transform(list instanceof List? (List<B>)list: new ArrayList<>(list), GET_ID); - return result; - } +// public static <B extends TuttiEntity> List<String> toIds(Collection<B> list) { +// return list == null ? +// Collections.<String>emptyList() : +// Lists.transform(list instanceof List? (List<B>)list: new ArrayList<>(list), GET_ID); +// } public static <B extends TuttiEntity> List<Integer> toIntegerIds(Collection<B> list) { - List<Integer> result = list == null ? + return list == null ? Collections.<Integer>emptyList() : Lists.transform(Lists.newArrayList(list), GET_ID_AS_INT); - return result; } public static <B extends TuttiEntity> Map<String, B> splitById(Iterable<B> list) { @@ -72,12 +69,7 @@ public class TuttiEntities { return bean.getId() == null; } - public static final Function<TuttiEntity, String> GET_ID = new Function<TuttiEntity, String>() { - @Override - public String apply(TuttiEntity input) { - return input.getId(); - } - }; + public static final Function<TuttiEntity, String> GET_ID = TuttiEntity::getId; public static <E extends TuttiEntity> Function<E, String> newIdFunction() { return (Function<E, String>) GET_ID; @@ -87,25 +79,18 @@ public class TuttiEntities { return (Function<E, Integer>) GET_ID_AS_INT; } - public static final Function<TuttiEntity, Integer> GET_ID_AS_INT = new Function<TuttiEntity, Integer>() { - @Override - public Integer apply(TuttiEntity input) { - return input.getIdAsInt(); - } - }; + public static final Function<TuttiEntity, Integer> GET_ID_AS_INT = TuttiEntity::getIdAsInt; public static <B extends TuttiEntity> Predicate<B> newIdPredicate(String id) { return new IdPredicate<>(id); } public static <B extends TuttiEntity> B findById(Iterable<B> beans, String id) { - B result = Iterables.tryFind(beans, newIdPredicate(id)).orNull(); - return result; + return Iterables.tryFind(beans, newIdPredicate(id)).orNull(); } public static <B extends TuttiEntity> List<String> collecIds(List<B> list) { - List<String> result = Lists.transform(list, GET_ID); - return result; + return Lists.transform(list, GET_ID); } protected static class IdPredicate<B extends TuttiEntity> implements Predicate<B> { diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/Cruises.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/Cruises.java index e10373f..d4f2837 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/Cruises.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/Cruises.java @@ -51,8 +51,7 @@ public class Cruises extends AbstractCruises { public static boolean equalsNaturalId(Cruise cruise1, String naturalId2) { String naturalId1 = getNaturalId(cruise1); - boolean equals = Objects.equals(naturalId1, naturalId2); - return equals; + return Objects.equals(naturalId1, naturalId2); } @@ -89,8 +88,7 @@ public class Cruises extends AbstractCruises { equalsBuilder.append(surveyPart1, surveyPart2); equalsBuilder.append(cruise1.getProgram(), cruise2.getProgram()); - boolean equals = equalsBuilder.isEquals(); - return equals; + return equalsBuilder.isEquals(); } @@ -111,8 +109,7 @@ public class Cruises extends AbstractCruises { } String programId = cruise.getProgram().getId(); - String naturalId = year1 + "--" + surveyPart1 + "--" + programId; - return naturalId; + return year1 + "--" + surveyPart1 + "--" + programId; } @@ -120,11 +117,6 @@ public class Cruises extends AbstractCruises { Collections.sort(cruises, CRUISE_COMPARATOR); } - public static Comparator<Cruise> CRUISE_COMPARATOR = new Comparator<Cruise>() { - @Override - public int compare(Cruise o1, Cruise o2) { - return o1.getName().compareTo(o2.getName()); - } - }; + public static Comparator<Cruise> CRUISE_COMPARATOR = (o1, o2) -> o1.getName().compareTo(o2.getName()); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperations.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperations.java index 2ba5f6d..5b00cd2 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperations.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperations.java @@ -53,24 +53,21 @@ public class FishingOperations extends AbstractFishingOperations { equalsBuilder.append(fishingOperation1.getFishingOperationNumber(), fishingOperation2.getFishingOperationNumber()); equalsBuilder.append(fishingOperation1.getMultirigAggregation(), fishingOperation2.getMultirigAggregation()); - boolean equals = equalsBuilder.isEquals(); - return equals; + return equalsBuilder.isEquals(); } public static boolean equalsNaturalId(FishingOperation fishingOperation1, String naturalId2) { String naturalId1 = getNaturalId(fishingOperation1); - boolean equals = Objects.equals(naturalId1, naturalId2); - return equals; + return Objects.equals(naturalId1, naturalId2); } public static String getNaturalId(FishingOperation fishingOperation) { String cruiseId = Cruises.getNaturalId(fishingOperation.getCruise()); - String naturalId = cruiseId + "--" + fishingOperation.getStationNumber() + "--" + fishingOperation.getFishingOperationNumber() + "--" + fishingOperation.getMultirigAggregation(); - return naturalId; + return cruiseId + "--" + fishingOperation.getStationNumber() + "--" + fishingOperation.getFishingOperationNumber() + "--" + fishingOperation.getMultirigAggregation(); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/Programs.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/Programs.java index eb064d2..b3dcee3 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/Programs.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/Programs.java @@ -25,21 +25,12 @@ package fr.ifremer.tutti.persistence.entities.data; */ import com.google.common.base.Function; -import com.google.common.collect.Maps; - -import java.util.List; -import java.util.Map; public class Programs extends AbstractPrograms { - public static Map<String, Program> splitByName(List<Program> programs) { - return Maps.uniqueIndex(programs, GET_NAME); - } +// public static Map<String, Program> splitByName(List<Program> programs) { +// return Maps.uniqueIndex(programs, GET_NAME); +// } - public static final Function<Program, String> GET_NAME = new Function<Program, String>() { - @Override - public String apply(Program input) { - return input.getName(); - } - }; + public static final Function<Program, String> GET_NAME = Program::getName; } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategory.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategory.java index 2d21bb5..b87f8b5 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategory.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategory.java @@ -85,7 +85,7 @@ public class SampleCategory<C extends Serializable> implements Serializable { protected boolean onlyOneFrequency; public static <C extends Serializable> SampleCategory<C> newSample(SampleCategoryModelEntry categoryDef) { - SampleCategory<C> result = new SampleCategory<C>(); + SampleCategory<C> result = new SampleCategory<>(); result.setCategoryDef(categoryDef); return result; } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModel.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModel.java index 849fe6c..45ea707 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModel.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModel.java @@ -103,8 +103,7 @@ public class SampleCategoryModel implements Serializable { for (SampleCategoryModelEntry entry : category) { entries.add(entry.toString()); } - String result = Joiner.on('|').join(entries); - return result; + return Joiner.on('|').join(entries); } public Integer getLastCategoryId() { diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesAbleBatchs.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesAbleBatchs.java index b8768dc..2e3ca55 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesAbleBatchs.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesAbleBatchs.java @@ -47,8 +47,7 @@ public class SpeciesAbleBatchs { public static <B extends SpeciesAbleBatch> B newInstance(B parent) { - B targetChild = (B) (parent instanceof SpeciesBatch ? SpeciesBatchs.newSpeciesBatch() : BenthosBatchs.newBenthosBatch()); - return targetChild; + return (B) (parent instanceof SpeciesBatch ? SpeciesBatchs.newSpeciesBatch() : BenthosBatchs.newBenthosBatch()); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesBatchs.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesBatchs.java index bf7b3d6..f051f0d 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesBatchs.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesBatchs.java @@ -35,13 +35,7 @@ import java.util.TreeMap; */ public class SpeciesBatchs extends AbstractSpeciesBatchs { - public static final Function<SpeciesBatch, Serializable> GET_SAMPLE_CATEGORY_VALUE = - new Function<SpeciesBatch, Serializable>() { - @Override - public Serializable apply(SpeciesBatch input) { - return input.getSampleCategoryValue(); - } - }; + public static final Function<SpeciesBatch, Serializable> GET_SAMPLE_CATEGORY_VALUE = SpeciesBatch::getSampleCategoryValue; public static Map<Integer, SpeciesBatch> getAllSpeciesBatchesById(BatchContainer<SpeciesBatch> rootSpeciesBatch) { Map<Integer, SpeciesBatch> result = new TreeMap<>(); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/SpeciesProtocols.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/SpeciesProtocols.java index e3adfb2..a1ddd0e 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/SpeciesProtocols.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/SpeciesProtocols.java @@ -32,13 +32,7 @@ import java.util.List; public class SpeciesProtocols extends AbstractSpeciesProtocols { - public static Function<SpeciesProtocol, String> GET_SURVEY_CODE = new Function<SpeciesProtocol, String>() { - - @Override - public String apply(SpeciesProtocol input) { - return input.getSpeciesSurveyCode(); - } - }; + public static Function<SpeciesProtocol, String> GET_SURVEY_CODE = SpeciesProtocol::getSpeciesSurveyCode; public static class SpeciesProtocolWhoseCategoryIsMandatoryPredicate implements Predicate<SpeciesProtocol> { diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java index 856c34f..97343f5 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java @@ -190,8 +190,7 @@ public class TuttiProtocols extends AbstractTuttiProtocols { //try to load a v3 TuttiProtocol3 tuttiProtocol3 = fromFileV3(file); - TuttiProtocol result = fromTuttiProtocol3(tuttiProtocol3); - return result; + return fromTuttiProtocol3(tuttiProtocol3); } catch (Exception ee) { if (log.isErrorEnabled()) { @@ -203,8 +202,7 @@ public class TuttiProtocols extends AbstractTuttiProtocols { TuttiProtocol3 tuttiProtocol3 = fromTuttiProtocol2(tuttiProtocol2); - TuttiProtocol result = fromTuttiProtocol3(tuttiProtocol3); - return result; + return fromTuttiProtocol3(tuttiProtocol3); } catch (Exception ee2) { if (log.isErrorEnabled()) { @@ -217,8 +215,7 @@ public class TuttiProtocols extends AbstractTuttiProtocols { TuttiProtocol3 tuttiProtocol3 = fromTuttiProtocol2(tuttiProtocol2); - TuttiProtocol result = fromTuttiProtocol3(tuttiProtocol3); - return result; + return fromTuttiProtocol3(tuttiProtocol3); } } } @@ -332,8 +329,7 @@ public class TuttiProtocols extends AbstractTuttiProtocols { } badCategoriesStr.add("<li>" + id + " : " + caracteristicStr + "</li>"); } - String message = t("tutti.persistence.error.protocol.categories.not.compatible", Joiner.on("").join(badCategoriesStr)); - return message; + return t("tutti.persistence.error.protocol.categories.not.compatible", Joiner.on("").join(badCategoriesStr)); } protected static TuttiProtocol2 fromTuttiProtocol1(TuttiProtocol1 tuttiProtocol1) { @@ -717,8 +713,7 @@ public class TuttiProtocols extends AbstractTuttiProtocols { for (Map.Entry<Integer, String> id : speciesProtocolNotFound.entrySet()) { badCategoriesStr.add("<li>" + id.getKey() + " : " + (id.getValue() == null ? "" : id.getValue()) + "</li>"); } - String message = t("tutti.persistence.error.protocol.species.not.found", Joiner.on("").join(badCategoriesStr)); - return message; + return t("tutti.persistence.error.protocol.species.not.found", Joiner.on("").join(badCategoriesStr)); } @@ -728,8 +723,7 @@ public class TuttiProtocols extends AbstractTuttiProtocols { for (Map.Entry<Integer, String> id : benthosProtocolNotFound.entrySet()) { badCategoriesStr.add("<li>" + id.getKey() + " : " + (id.getValue() == null ? "" : id.getValue()) + "</li>"); } - String message = t("tutti.persistence.error.protocol.benthos.not.found", Joiner.on("").join(badCategoriesStr)); - return message; + return t("tutti.persistence.error.protocol.benthos.not.found", Joiner.on("").join(badCategoriesStr)); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v1/TuttiProtocolBean1.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v1/TuttiProtocolBean1.java index 94e7946..92e9bee 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v1/TuttiProtocolBean1.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v1/TuttiProtocolBean1.java @@ -73,8 +73,7 @@ public class TuttiProtocolBean1 extends TuttiEntityBean implements TuttiProtocol @Override public String getGearUseFeaturePmfmId(int index) { - String o = getChild(gearUseFeaturePmfmId, index); - return o; + return getChild(gearUseFeaturePmfmId, index); } @Override @@ -99,26 +98,22 @@ public class TuttiProtocolBean1 extends TuttiEntityBean implements TuttiProtocol @Override public boolean removeGearUseFeaturePmfmId(String gearUseFeaturePmfmId) { - boolean removed = getGearUseFeaturePmfmId().remove(gearUseFeaturePmfmId); - return removed; + return getGearUseFeaturePmfmId().remove(gearUseFeaturePmfmId); } @Override public boolean removeAllGearUseFeaturePmfmId(Collection<String> gearUseFeaturePmfmId) { - boolean removed = getGearUseFeaturePmfmId().removeAll(gearUseFeaturePmfmId); - return removed; + return getGearUseFeaturePmfmId().removeAll(gearUseFeaturePmfmId); } @Override public boolean containsGearUseFeaturePmfmId(String gearUseFeaturePmfmId) { - boolean contains = getGearUseFeaturePmfmId().contains(gearUseFeaturePmfmId); - return contains; + return getGearUseFeaturePmfmId().contains(gearUseFeaturePmfmId); } @Override public boolean containsAllGearUseFeaturePmfmId(Collection<String> gearUseFeaturePmfmId) { - boolean contains = getGearUseFeaturePmfmId().containsAll(gearUseFeaturePmfmId); - return contains; + return getGearUseFeaturePmfmId().containsAll(gearUseFeaturePmfmId); } @Override @@ -133,8 +128,7 @@ public class TuttiProtocolBean1 extends TuttiEntityBean implements TuttiProtocol @Override public String getVesselUseFeaturePmfmId(int index) { - String o = getChild(vesselUseFeaturePmfmId, index); - return o; + return getChild(vesselUseFeaturePmfmId, index); } @Override @@ -159,26 +153,22 @@ public class TuttiProtocolBean1 extends TuttiEntityBean implements TuttiProtocol @Override public boolean removeVesselUseFeaturePmfmId(String vesselUseFeaturePmfmId) { - boolean removed = getVesselUseFeaturePmfmId().remove(vesselUseFeaturePmfmId); - return removed; + return getVesselUseFeaturePmfmId().remove(vesselUseFeaturePmfmId); } @Override public boolean removeAllVesselUseFeaturePmfmId(Collection<String> vesselUseFeaturePmfmId) { - boolean removed = getVesselUseFeaturePmfmId().removeAll(vesselUseFeaturePmfmId); - return removed; + return getVesselUseFeaturePmfmId().removeAll(vesselUseFeaturePmfmId); } @Override public boolean containsVesselUseFeaturePmfmId(String vesselUseFeaturePmfmId) { - boolean contains = getVesselUseFeaturePmfmId().contains(vesselUseFeaturePmfmId); - return contains; + return getVesselUseFeaturePmfmId().contains(vesselUseFeaturePmfmId); } @Override public boolean containsAllVesselUseFeaturePmfmId(Collection<String> vesselUseFeaturePmfmId) { - boolean contains = getVesselUseFeaturePmfmId().containsAll(vesselUseFeaturePmfmId); - return contains; + return getVesselUseFeaturePmfmId().containsAll(vesselUseFeaturePmfmId); } @Override @@ -193,8 +183,7 @@ public class TuttiProtocolBean1 extends TuttiEntityBean implements TuttiProtocol @Override public String getLengthClassesPmfmId(int index) { - String o = getChild(lengthClassesPmfmId, index); - return o; + return getChild(lengthClassesPmfmId, index); } @Override @@ -219,26 +208,22 @@ public class TuttiProtocolBean1 extends TuttiEntityBean implements TuttiProtocol @Override public boolean removeLengthClassesPmfmId(String lengthClassesPmfmId) { - boolean removed = getLengthClassesPmfmId().remove(lengthClassesPmfmId); - return removed; + return getLengthClassesPmfmId().remove(lengthClassesPmfmId); } @Override public boolean removeAllLengthClassesPmfmId(Collection<String> lengthClassesPmfmId) { - boolean removed = getLengthClassesPmfmId().removeAll(lengthClassesPmfmId); - return removed; + return getLengthClassesPmfmId().removeAll(lengthClassesPmfmId); } @Override public boolean containsLengthClassesPmfmId(String lengthClassesPmfmId) { - boolean contains = getLengthClassesPmfmId().contains(lengthClassesPmfmId); - return contains; + return getLengthClassesPmfmId().contains(lengthClassesPmfmId); } @Override public boolean containsAllLengthClassesPmfmId(Collection<String> lengthClassesPmfmId) { - boolean contains = getLengthClassesPmfmId().containsAll(lengthClassesPmfmId); - return contains; + return getLengthClassesPmfmId().containsAll(lengthClassesPmfmId); } @Override @@ -253,8 +238,7 @@ public class TuttiProtocolBean1 extends TuttiEntityBean implements TuttiProtocol @Override public SpeciesProtocol1 getSpecies(int index) { - SpeciesProtocol1 o = getChild(species, index); - return o; + return getChild(species, index); } @Override @@ -279,26 +263,22 @@ public class TuttiProtocolBean1 extends TuttiEntityBean implements TuttiProtocol @Override public boolean removeSpecies(SpeciesProtocol1 species) { - boolean removed = getSpecies().remove(species); - return removed; + return getSpecies().remove(species); } @Override public boolean removeAllSpecies(Collection<SpeciesProtocol1> species) { - boolean removed = getSpecies().removeAll(species); - return removed; + return getSpecies().removeAll(species); } @Override public boolean containsSpecies(SpeciesProtocol1 species) { - boolean contains = getSpecies().contains(species); - return contains; + return getSpecies().contains(species); } @Override public boolean containsAllSpecies(Collection<SpeciesProtocol1> species) { - boolean contains = getSpecies().containsAll(species); - return contains; + return getSpecies().containsAll(species); } @Override @@ -313,8 +293,7 @@ public class TuttiProtocolBean1 extends TuttiEntityBean implements TuttiProtocol @Override public SpeciesProtocol1 getBenthos(int index) { - SpeciesProtocol1 o = getChild(benthos, index); - return o; + return getChild(benthos, index); } @Override @@ -339,26 +318,22 @@ public class TuttiProtocolBean1 extends TuttiEntityBean implements TuttiProtocol @Override public boolean removeBenthos(SpeciesProtocol1 benthos) { - boolean removed = getBenthos().remove(benthos); - return removed; + return getBenthos().remove(benthos); } @Override public boolean removeAllBenthos(Collection<SpeciesProtocol1> benthos) { - boolean removed = getBenthos().removeAll(benthos); - return removed; + return getBenthos().removeAll(benthos); } @Override public boolean containsBenthos(SpeciesProtocol1 benthos) { - boolean contains = getBenthos().contains(benthos); - return contains; + return getBenthos().contains(benthos); } @Override public boolean containsAllBenthos(Collection<SpeciesProtocol1> benthos) { - boolean contains = getBenthos().containsAll(benthos); - return contains; + return getBenthos().containsAll(benthos); } @Override diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocolBean2.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocolBean2.java index d8ef75c..6803111 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocolBean2.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v2/TuttiProtocolBean2.java @@ -75,8 +75,7 @@ public class TuttiProtocolBean2 extends TuttiEntityBean implements TuttiProtocol @Override public String getGearUseFeaturePmfmId(int index) { - String o = getChild(gearUseFeaturePmfmId, index); - return o; + return getChild(gearUseFeaturePmfmId, index); } @Override @@ -101,32 +100,28 @@ public class TuttiProtocolBean2 extends TuttiEntityBean implements TuttiProtocol @Override public boolean removeGearUseFeaturePmfmId(String gearUseFeaturePmfmId) { - boolean removed = getGearUseFeaturePmfmId().remove(gearUseFeaturePmfmId); - return removed; + return getGearUseFeaturePmfmId().remove(gearUseFeaturePmfmId); } @Override public boolean removeAllGearUseFeaturePmfmId(Collection<String> gearUseFeaturePmfmId) { - boolean removed = getGearUseFeaturePmfmId().removeAll(gearUseFeaturePmfmId); - return removed; + return getGearUseFeaturePmfmId().removeAll(gearUseFeaturePmfmId); } @Override public boolean containsGearUseFeaturePmfmId(String gearUseFeaturePmfmId) { - boolean contains = getGearUseFeaturePmfmId().contains(gearUseFeaturePmfmId); - return contains; + return getGearUseFeaturePmfmId().contains(gearUseFeaturePmfmId); } @Override public boolean containsAllGearUseFeaturePmfmId(Collection<String> gearUseFeaturePmfmId) { - boolean contains = getGearUseFeaturePmfmId().containsAll(gearUseFeaturePmfmId); - return contains; + return getGearUseFeaturePmfmId().containsAll(gearUseFeaturePmfmId); } @Override public List<String> getGearUseFeaturePmfmId() { if (gearUseFeaturePmfmId == null) { - gearUseFeaturePmfmId = new LinkedList<String>(); + gearUseFeaturePmfmId = new LinkedList<>(); } return gearUseFeaturePmfmId; } @@ -138,8 +133,7 @@ public class TuttiProtocolBean2 extends TuttiEntityBean implements TuttiProtocol @Override public String getVesselUseFeaturePmfmId(int index) { - String o = getChild(vesselUseFeaturePmfmId, index); - return o; + return getChild(vesselUseFeaturePmfmId, index); } @Override @@ -164,32 +158,28 @@ public class TuttiProtocolBean2 extends TuttiEntityBean implements TuttiProtocol @Override public boolean removeVesselUseFeaturePmfmId(String vesselUseFeaturePmfmId) { - boolean removed = getVesselUseFeaturePmfmId().remove(vesselUseFeaturePmfmId); - return removed; + return getVesselUseFeaturePmfmId().remove(vesselUseFeaturePmfmId); } @Override public boolean removeAllVesselUseFeaturePmfmId(Collection<String> vesselUseFeaturePmfmId) { - boolean removed = getVesselUseFeaturePmfmId().removeAll(vesselUseFeaturePmfmId); - return removed; + return getVesselUseFeaturePmfmId().removeAll(vesselUseFeaturePmfmId); } @Override public boolean containsVesselUseFeaturePmfmId(String vesselUseFeaturePmfmId) { - boolean contains = getVesselUseFeaturePmfmId().contains(vesselUseFeaturePmfmId); - return contains; + return getVesselUseFeaturePmfmId().contains(vesselUseFeaturePmfmId); } @Override public boolean containsAllVesselUseFeaturePmfmId(Collection<String> vesselUseFeaturePmfmId) { - boolean contains = getVesselUseFeaturePmfmId().containsAll(vesselUseFeaturePmfmId); - return contains; + return getVesselUseFeaturePmfmId().containsAll(vesselUseFeaturePmfmId); } @Override public List<String> getVesselUseFeaturePmfmId() { if (vesselUseFeaturePmfmId == null) { - vesselUseFeaturePmfmId = new LinkedList<String>(); + vesselUseFeaturePmfmId = new LinkedList<>(); } return vesselUseFeaturePmfmId; } @@ -201,8 +191,7 @@ public class TuttiProtocolBean2 extends TuttiEntityBean implements TuttiProtocol @Override public String getLengthClassesPmfmId(int index) { - String o = getChild(lengthClassesPmfmId, index); - return o; + return getChild(lengthClassesPmfmId, index); } @Override @@ -227,32 +216,28 @@ public class TuttiProtocolBean2 extends TuttiEntityBean implements TuttiProtocol @Override public boolean removeLengthClassesPmfmId(String lengthClassesPmfmId) { - boolean removed = getLengthClassesPmfmId().remove(lengthClassesPmfmId); - return removed; + return getLengthClassesPmfmId().remove(lengthClassesPmfmId); } @Override public boolean removeAllLengthClassesPmfmId(Collection<String> lengthClassesPmfmId) { - boolean removed = getLengthClassesPmfmId().removeAll(lengthClassesPmfmId); - return removed; + return getLengthClassesPmfmId().removeAll(lengthClassesPmfmId); } @Override public boolean containsLengthClassesPmfmId(String lengthClassesPmfmId) { - boolean contains = getLengthClassesPmfmId().contains(lengthClassesPmfmId); - return contains; + return getLengthClassesPmfmId().contains(lengthClassesPmfmId); } @Override public boolean containsAllLengthClassesPmfmId(Collection<String> lengthClassesPmfmId) { - boolean contains = getLengthClassesPmfmId().containsAll(lengthClassesPmfmId); - return contains; + return getLengthClassesPmfmId().containsAll(lengthClassesPmfmId); } @Override public List<String> getLengthClassesPmfmId() { if (lengthClassesPmfmId == null) { - lengthClassesPmfmId = new LinkedList<String>(); + lengthClassesPmfmId = new LinkedList<>(); } return lengthClassesPmfmId; } @@ -264,8 +249,7 @@ public class TuttiProtocolBean2 extends TuttiEntityBean implements TuttiProtocol @Override public String getIndividualObservationPmfmId(int index) { - String o = getChild(individualObservationPmfmId, index); - return o; + return getChild(individualObservationPmfmId, index); } @Override @@ -290,32 +274,28 @@ public class TuttiProtocolBean2 extends TuttiEntityBean implements TuttiProtocol @Override public boolean removeIndividualObservationPmfmId(String individualObservationPmfmId) { - boolean removed = getIndividualObservationPmfmId().remove(individualObservationPmfmId); - return removed; + return getIndividualObservationPmfmId().remove(individualObservationPmfmId); } @Override public boolean removeAllIndividualObservationPmfmId(Collection<String> individualObservationPmfmId) { - boolean removed = getIndividualObservationPmfmId().removeAll(individualObservationPmfmId); - return removed; + return getIndividualObservationPmfmId().removeAll(individualObservationPmfmId); } @Override public boolean containsIndividualObservationPmfmId(String individualObservationPmfmId) { - boolean contains = getIndividualObservationPmfmId().contains(individualObservationPmfmId); - return contains; + return getIndividualObservationPmfmId().contains(individualObservationPmfmId); } @Override public boolean containsAllIndividualObservationPmfmId(Collection<String> individualObservationPmfmId) { - boolean contains = getIndividualObservationPmfmId().containsAll(individualObservationPmfmId); - return contains; + return getIndividualObservationPmfmId().containsAll(individualObservationPmfmId); } @Override public List<String> getIndividualObservationPmfmId() { if (individualObservationPmfmId == null) { - individualObservationPmfmId = new LinkedList<String>(); + individualObservationPmfmId = new LinkedList<>(); } return individualObservationPmfmId; } @@ -337,8 +317,7 @@ public class TuttiProtocolBean2 extends TuttiEntityBean implements TuttiProtocol @Override public SpeciesProtocol getSpecies(int index) { - SpeciesProtocol o = getChild(species, index); - return o; + return getChild(species, index); } @Override @@ -363,32 +342,28 @@ public class TuttiProtocolBean2 extends TuttiEntityBean implements TuttiProtocol @Override public boolean removeSpecies(SpeciesProtocol species) { - boolean removed = getSpecies().remove(species); - return removed; + return getSpecies().remove(species); } @Override public boolean removeAllSpecies(Collection<SpeciesProtocol> species) { - boolean removed = getSpecies().removeAll(species); - return removed; + return getSpecies().removeAll(species); } @Override public boolean containsSpecies(SpeciesProtocol species) { - boolean contains = getSpecies().contains(species); - return contains; + return getSpecies().contains(species); } @Override public boolean containsAllSpecies(Collection<SpeciesProtocol> species) { - boolean contains = getSpecies().containsAll(species); - return contains; + return getSpecies().containsAll(species); } @Override public List<SpeciesProtocol> getSpecies() { if (species == null) { - species = new LinkedList<SpeciesProtocol>(); + species = new LinkedList<>(); } return species; } @@ -400,8 +375,7 @@ public class TuttiProtocolBean2 extends TuttiEntityBean implements TuttiProtocol @Override public SpeciesProtocol getBenthos(int index) { - SpeciesProtocol o = getChild(benthos, index); - return o; + return getChild(benthos, index); } @Override @@ -426,32 +400,28 @@ public class TuttiProtocolBean2 extends TuttiEntityBean implements TuttiProtocol @Override public boolean removeBenthos(SpeciesProtocol benthos) { - boolean removed = getBenthos().remove(benthos); - return removed; + return getBenthos().remove(benthos); } @Override public boolean removeAllBenthos(Collection<SpeciesProtocol> benthos) { - boolean removed = getBenthos().removeAll(benthos); - return removed; + return getBenthos().removeAll(benthos); } @Override public boolean containsBenthos(SpeciesProtocol benthos) { - boolean contains = getBenthos().contains(benthos); - return contains; + return getBenthos().contains(benthos); } @Override public boolean containsAllBenthos(Collection<SpeciesProtocol> benthos) { - boolean contains = getBenthos().containsAll(benthos); - return contains; + return getBenthos().containsAll(benthos); } @Override public List<SpeciesProtocol> getBenthos() { if (benthos == null) { - benthos = new LinkedList<SpeciesProtocol>(); + benthos = new LinkedList<>(); } return benthos; } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/SpeciesProtocolBean3.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/SpeciesProtocolBean3.java index 6eb7fae..d2faba0 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/SpeciesProtocolBean3.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/SpeciesProtocolBean3.java @@ -150,8 +150,7 @@ public class SpeciesProtocolBean3 extends TuttiEntityBean implements SpeciesProt @Override public Integer getMandatorySampleCategoryId(int index) { - Integer o = getChild(mandatorySampleCategoryId, index); - return o; + return getChild(mandatorySampleCategoryId, index); } @Override @@ -176,32 +175,28 @@ public class SpeciesProtocolBean3 extends TuttiEntityBean implements SpeciesProt @Override public boolean removeMandatorySampleCategoryId(Integer mandatorySampleCategoryId) { - boolean removed = getMandatorySampleCategoryId().remove(mandatorySampleCategoryId); - return removed; + return getMandatorySampleCategoryId().remove(mandatorySampleCategoryId); } @Override public boolean removeAllMandatorySampleCategoryId(Collection<Integer> mandatorySampleCategoryId) { - boolean removed = getMandatorySampleCategoryId().removeAll(mandatorySampleCategoryId); - return removed; + return getMandatorySampleCategoryId().removeAll(mandatorySampleCategoryId); } @Override public boolean containsMandatorySampleCategoryId(Integer mandatorySampleCategoryId) { - boolean contains = getMandatorySampleCategoryId().contains(mandatorySampleCategoryId); - return contains; + return getMandatorySampleCategoryId().contains(mandatorySampleCategoryId); } @Override public boolean containsAllMandatorySampleCategoryId(Collection<Integer> mandatorySampleCategoryId) { - boolean contains = getMandatorySampleCategoryId().containsAll(mandatorySampleCategoryId); - return contains; + return getMandatorySampleCategoryId().containsAll(mandatorySampleCategoryId); } @Override public List<Integer> getMandatorySampleCategoryId() { if (mandatorySampleCategoryId == null) { - mandatorySampleCategoryId = new LinkedList<Integer>(); + mandatorySampleCategoryId = new LinkedList<>(); } return mandatorySampleCategoryId; } @@ -273,8 +268,7 @@ public class SpeciesProtocolBean3 extends TuttiEntityBean implements SpeciesProt @Override public CalcifiedPiecesSamplingDefinition getCalcifiedPiecesSamplingDefinition(int index) { - CalcifiedPiecesSamplingDefinition o = getChild(calcifiedPiecesSamplingDefinition, index); - return o; + return getChild(calcifiedPiecesSamplingDefinition, index); } @Override @@ -299,32 +293,28 @@ public class SpeciesProtocolBean3 extends TuttiEntityBean implements SpeciesProt @Override public boolean removeCalcifiedPiecesSamplingDefinition(CalcifiedPiecesSamplingDefinition calcifiedPiecesSamplingDefinition) { - boolean removed = getCalcifiedPiecesSamplingDefinition().remove(calcifiedPiecesSamplingDefinition); - return removed; + return getCalcifiedPiecesSamplingDefinition().remove(calcifiedPiecesSamplingDefinition); } @Override public boolean removeAllCalcifiedPiecesSamplingDefinition(Collection<CalcifiedPiecesSamplingDefinition> calcifiedPiecesSamplingDefinition) { - boolean removed = getCalcifiedPiecesSamplingDefinition().removeAll(calcifiedPiecesSamplingDefinition); - return removed; + return getCalcifiedPiecesSamplingDefinition().removeAll(calcifiedPiecesSamplingDefinition); } @Override public boolean containsCalcifiedPiecesSamplingDefinition(CalcifiedPiecesSamplingDefinition calcifiedPiecesSamplingDefinition) { - boolean contains = getCalcifiedPiecesSamplingDefinition().contains(calcifiedPiecesSamplingDefinition); - return contains; + return getCalcifiedPiecesSamplingDefinition().contains(calcifiedPiecesSamplingDefinition); } @Override public boolean containsAllCalcifiedPiecesSamplingDefinition(Collection<CalcifiedPiecesSamplingDefinition> calcifiedPiecesSamplingDefinition) { - boolean contains = getCalcifiedPiecesSamplingDefinition().containsAll(calcifiedPiecesSamplingDefinition); - return contains; + return getCalcifiedPiecesSamplingDefinition().containsAll(calcifiedPiecesSamplingDefinition); } @Override public Collection<CalcifiedPiecesSamplingDefinition> getCalcifiedPiecesSamplingDefinition() { if (calcifiedPiecesSamplingDefinition == null) { - calcifiedPiecesSamplingDefinition = new LinkedList<CalcifiedPiecesSamplingDefinition>(); + calcifiedPiecesSamplingDefinition = new LinkedList<>(); } return calcifiedPiecesSamplingDefinition; } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/TuttiProtocolBean3.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/TuttiProtocolBean3.java index 19e5e1a..a841ce9 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/TuttiProtocolBean3.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/TuttiProtocolBean3.java @@ -85,8 +85,7 @@ public class TuttiProtocolBean3 extends TuttiEntityBean implements TuttiProtocol @Override public String getLengthClassesPmfmId(int index) { - String o = getChild(lengthClassesPmfmId, index); - return o; + return getChild(lengthClassesPmfmId, index); } @Override @@ -111,32 +110,28 @@ public class TuttiProtocolBean3 extends TuttiEntityBean implements TuttiProtocol @Override public boolean removeLengthClassesPmfmId(String lengthClassesPmfmId) { - boolean removed = getLengthClassesPmfmId().remove(lengthClassesPmfmId); - return removed; + return getLengthClassesPmfmId().remove(lengthClassesPmfmId); } @Override public boolean removeAllLengthClassesPmfmId(Collection<String> lengthClassesPmfmId) { - boolean removed = getLengthClassesPmfmId().removeAll(lengthClassesPmfmId); - return removed; + return getLengthClassesPmfmId().removeAll(lengthClassesPmfmId); } @Override public boolean containsLengthClassesPmfmId(String lengthClassesPmfmId) { - boolean contains = getLengthClassesPmfmId().contains(lengthClassesPmfmId); - return contains; + return getLengthClassesPmfmId().contains(lengthClassesPmfmId); } @Override public boolean containsAllLengthClassesPmfmId(Collection<String> lengthClassesPmfmId) { - boolean contains = getLengthClassesPmfmId().containsAll(lengthClassesPmfmId); - return contains; + return getLengthClassesPmfmId().containsAll(lengthClassesPmfmId); } @Override public List<String> getLengthClassesPmfmId() { if (lengthClassesPmfmId == null) { - lengthClassesPmfmId = new LinkedList<String>(); + lengthClassesPmfmId = new LinkedList<>(); } return lengthClassesPmfmId; } @@ -148,8 +143,7 @@ public class TuttiProtocolBean3 extends TuttiEntityBean implements TuttiProtocol @Override public String getIndividualObservationPmfmId(int index) { - String o = getChild(individualObservationPmfmId, index); - return o; + return getChild(individualObservationPmfmId, index); } @Override @@ -174,32 +168,28 @@ public class TuttiProtocolBean3 extends TuttiEntityBean implements TuttiProtocol @Override public boolean removeIndividualObservationPmfmId(String individualObservationPmfmId) { - boolean removed = getIndividualObservationPmfmId().remove(individualObservationPmfmId); - return removed; + return getIndividualObservationPmfmId().remove(individualObservationPmfmId); } @Override public boolean removeAllIndividualObservationPmfmId(Collection<String> individualObservationPmfmId) { - boolean removed = getIndividualObservationPmfmId().removeAll(individualObservationPmfmId); - return removed; + return getIndividualObservationPmfmId().removeAll(individualObservationPmfmId); } @Override public boolean containsIndividualObservationPmfmId(String individualObservationPmfmId) { - boolean contains = getIndividualObservationPmfmId().contains(individualObservationPmfmId); - return contains; + return getIndividualObservationPmfmId().contains(individualObservationPmfmId); } @Override public boolean containsAllIndividualObservationPmfmId(Collection<String> individualObservationPmfmId) { - boolean contains = getIndividualObservationPmfmId().containsAll(individualObservationPmfmId); - return contains; + return getIndividualObservationPmfmId().containsAll(individualObservationPmfmId); } @Override public List<String> getIndividualObservationPmfmId() { if (individualObservationPmfmId == null) { - individualObservationPmfmId = new LinkedList<String>(); + individualObservationPmfmId = new LinkedList<>(); } return individualObservationPmfmId; } @@ -221,8 +211,7 @@ public class TuttiProtocolBean3 extends TuttiEntityBean implements TuttiProtocol @Override public String getImportColumns(int index) { - String o = getChild(importColumns, index); - return o; + return getChild(importColumns, index); } @Override @@ -247,32 +236,28 @@ public class TuttiProtocolBean3 extends TuttiEntityBean implements TuttiProtocol @Override public boolean removeImportColumns(String importColumns) { - boolean removed = getImportColumns().remove(importColumns); - return removed; + return getImportColumns().remove(importColumns); } @Override public boolean removeAllImportColumns(Collection<String> importColumns) { - boolean removed = getImportColumns().removeAll(importColumns); - return removed; + return getImportColumns().removeAll(importColumns); } @Override public boolean containsImportColumns(String importColumns) { - boolean contains = getImportColumns().contains(importColumns); - return contains; + return getImportColumns().contains(importColumns); } @Override public boolean containsAllImportColumns(Collection<String> importColumns) { - boolean contains = getImportColumns().containsAll(importColumns); - return contains; + return getImportColumns().containsAll(importColumns); } @Override public Collection<String> getImportColumns() { if (importColumns == null) { - importColumns = new LinkedList<String>(); + importColumns = new LinkedList<>(); } return importColumns; } @@ -304,8 +289,7 @@ public class TuttiProtocolBean3 extends TuttiEntityBean implements TuttiProtocol @Override public SpeciesProtocol3 getSpecies(int index) { - SpeciesProtocol3 o = getChild(species, index); - return o; + return getChild(species, index); } @Override @@ -330,32 +314,28 @@ public class TuttiProtocolBean3 extends TuttiEntityBean implements TuttiProtocol @Override public boolean removeSpecies(SpeciesProtocol3 species) { - boolean removed = getSpecies().remove(species); - return removed; + return getSpecies().remove(species); } @Override public boolean removeAllSpecies(Collection<SpeciesProtocol3> species) { - boolean removed = getSpecies().removeAll(species); - return removed; + return getSpecies().removeAll(species); } @Override public boolean containsSpecies(SpeciesProtocol3 species) { - boolean contains = getSpecies().contains(species); - return contains; + return getSpecies().contains(species); } @Override public boolean containsAllSpecies(Collection<SpeciesProtocol3> species) { - boolean contains = getSpecies().containsAll(species); - return contains; + return getSpecies().containsAll(species); } @Override public List<SpeciesProtocol3> getSpecies() { if (species == null) { - species = new LinkedList<SpeciesProtocol3>(); + species = new LinkedList<>(); } return species; } @@ -367,8 +347,7 @@ public class TuttiProtocolBean3 extends TuttiEntityBean implements TuttiProtocol @Override public SpeciesProtocol3 getBenthos(int index) { - SpeciesProtocol3 o = getChild(benthos, index); - return o; + return getChild(benthos, index); } @Override @@ -393,32 +372,28 @@ public class TuttiProtocolBean3 extends TuttiEntityBean implements TuttiProtocol @Override public boolean removeBenthos(SpeciesProtocol3 benthos) { - boolean removed = getBenthos().remove(benthos); - return removed; + return getBenthos().remove(benthos); } @Override public boolean removeAllBenthos(Collection<SpeciesProtocol3> benthos) { - boolean removed = getBenthos().removeAll(benthos); - return removed; + return getBenthos().removeAll(benthos); } @Override public boolean containsBenthos(SpeciesProtocol3 benthos) { - boolean contains = getBenthos().contains(benthos); - return contains; + return getBenthos().contains(benthos); } @Override public boolean containsAllBenthos(Collection<SpeciesProtocol3> benthos) { - boolean contains = getBenthos().containsAll(benthos); - return contains; + return getBenthos().containsAll(benthos); } @Override public List<SpeciesProtocol3> getBenthos() { if (benthos == null) { - benthos = new LinkedList<SpeciesProtocol3>(); + benthos = new LinkedList<>(); } return benthos; } @@ -430,8 +405,7 @@ public class TuttiProtocolBean3 extends TuttiEntityBean implements TuttiProtocol @Override public CaracteristicMappingRow getCaracteristicMapping(int index) { - CaracteristicMappingRow o = getChild(caracteristicMapping, index); - return o; + return getChild(caracteristicMapping, index); } @Override @@ -456,32 +430,28 @@ public class TuttiProtocolBean3 extends TuttiEntityBean implements TuttiProtocol @Override public boolean removeCaracteristicMapping(CaracteristicMappingRow caracteristicMapping) { - boolean removed = getCaracteristicMapping().remove(caracteristicMapping); - return removed; + return getCaracteristicMapping().remove(caracteristicMapping); } @Override public boolean removeAllCaracteristicMapping(Collection<CaracteristicMappingRow> caracteristicMapping) { - boolean removed = getCaracteristicMapping().removeAll(caracteristicMapping); - return removed; + return getCaracteristicMapping().removeAll(caracteristicMapping); } @Override public boolean containsCaracteristicMapping(CaracteristicMappingRow caracteristicMapping) { - boolean contains = getCaracteristicMapping().contains(caracteristicMapping); - return contains; + return getCaracteristicMapping().contains(caracteristicMapping); } @Override public boolean containsAllCaracteristicMapping(Collection<CaracteristicMappingRow> caracteristicMapping) { - boolean contains = getCaracteristicMapping().containsAll(caracteristicMapping); - return contains; + return getCaracteristicMapping().containsAll(caracteristicMapping); } @Override public List<CaracteristicMappingRow> getCaracteristicMapping() { if (caracteristicMapping == null) { - caracteristicMapping = new LinkedList<CaracteristicMappingRow>(); + caracteristicMapping = new LinkedList<>(); } return caracteristicMapping; } @@ -493,8 +463,7 @@ public class TuttiProtocolBean3 extends TuttiEntityBean implements TuttiProtocol @Override public OperationFieldMappingRow getOperationFieldMapping(int index) { - OperationFieldMappingRow o = getChild(operationFieldMapping, index); - return o; + return getChild(operationFieldMapping, index); } @Override @@ -519,32 +488,28 @@ public class TuttiProtocolBean3 extends TuttiEntityBean implements TuttiProtocol @Override public boolean removeOperationFieldMapping(OperationFieldMappingRow operationFieldMapping) { - boolean removed = getOperationFieldMapping().remove(operationFieldMapping); - return removed; + return getOperationFieldMapping().remove(operationFieldMapping); } @Override public boolean removeAllOperationFieldMapping(Collection<OperationFieldMappingRow> operationFieldMapping) { - boolean removed = getOperationFieldMapping().removeAll(operationFieldMapping); - return removed; + return getOperationFieldMapping().removeAll(operationFieldMapping); } @Override public boolean containsOperationFieldMapping(OperationFieldMappingRow operationFieldMapping) { - boolean contains = getOperationFieldMapping().contains(operationFieldMapping); - return contains; + return getOperationFieldMapping().contains(operationFieldMapping); } @Override public boolean containsAllOperationFieldMapping(Collection<OperationFieldMappingRow> operationFieldMapping) { - boolean contains = getOperationFieldMapping().containsAll(operationFieldMapping); - return contains; + return getOperationFieldMapping().containsAll(operationFieldMapping); } @Override public Collection<OperationFieldMappingRow> getOperationFieldMapping() { if (operationFieldMapping == null) { - operationFieldMapping = new LinkedList<OperationFieldMappingRow>(); + operationFieldMapping = new LinkedList<>(); } return operationFieldMapping; } @@ -556,8 +521,7 @@ public class TuttiProtocolBean3 extends TuttiEntityBean implements TuttiProtocol @Override public Zone getZone(int index) { - Zone o = getChild(zone, index); - return o; + return getChild(zone, index); } @Override @@ -582,32 +546,28 @@ public class TuttiProtocolBean3 extends TuttiEntityBean implements TuttiProtocol @Override public boolean removeZone(Zone zone) { - boolean removed = getZone().remove(zone); - return removed; + return getZone().remove(zone); } @Override public boolean removeAllZone(Collection<Zone> zone) { - boolean removed = getZone().removeAll(zone); - return removed; + return getZone().removeAll(zone); } @Override public boolean containsZone(Zone zone) { - boolean contains = getZone().contains(zone); - return contains; + return getZone().contains(zone); } @Override public boolean containsAllZone(Collection<Zone> zone) { - boolean contains = getZone().containsAll(zone); - return contains; + return getZone().containsAll(zone); } @Override public Collection<Zone> getZone() { if (zone == null) { - zone = new LinkedList<Zone>(); + zone = new LinkedList<>(); } return zone; } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Gears.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Gears.java index e05cc33..3c7f065 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Gears.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Gears.java @@ -28,45 +28,21 @@ package fr.ifremer.tutti.persistence.entities.referential; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; -import com.google.common.collect.Maps; - -import java.util.List; -import java.util.Map; public class Gears extends AbstractGears { - public static Map<String, Gear> splitByName(List<Gear> gears) { - return Maps.uniqueIndex(gears, GET_NAME); - } +// public static Map<String, Gear> splitByName(List<Gear> gears) { +// return Maps.uniqueIndex(gears, GET_NAME); +// } + + public static final Predicate<Gear> IS_FISHING_GEAR = input -> !input.isScientificGear(); + + public static final Predicate<Gear> IS_SCIENTIFIC_GEAR = Gear::isScientificGear; + + public static final Predicate<Gear> IS_TEMPORARY = Gears::isTemporary; - public static final Predicate<Gear> IS_FISHING_GEAR = new Predicate<Gear>() { - - public boolean apply(Gear input) { - return !input.isScientificGear(); - } - }; - - public static final Predicate<Gear> IS_SCIENTIFIC_GEAR = new Predicate<Gear>() { - - public boolean apply(Gear input) { - return input.isScientificGear(); - } - }; - - public static final Predicate<Gear> IS_TEMPORARY = new Predicate<Gear>() { - @Override - public boolean apply(Gear input) { - return isTemporary(input); - } - }; - - public static final Function<Gear, String> GET_NAME = new Function<Gear, String>() { - @Override - public String apply(Gear input) { - return input.getName(); - } - }; + public static final Function<Gear, String> GET_NAME = Gear::getName; /** * Is the given {@code gear} a temporary data ? diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Persons.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Persons.java index b82527f..a98b30f 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Persons.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Persons.java @@ -65,17 +65,7 @@ public class Persons extends AbstractPersons { return GET_FULL_NAME.apply(person); } - public static final Predicate<Person> IS_TEMPORARY = new Predicate<Person>() { - @Override - public boolean apply(Person input) { - return Persons.isTemporary(input); - } - }; + public static final Predicate<Person> IS_TEMPORARY = Persons::isTemporary; - public static final Function<Person, String> GET_FULL_NAME = new Function<Person, String>() { - @Override - public String apply(Person input) { - return StringUtils.trimToEmpty(input.getFirstName()) + " " + StringUtils.trimToEmpty(input.getLastName()); - } - }; + public static final Function<Person, String> GET_FULL_NAME = input -> StringUtils.trimToEmpty(input.getFirstName()) + " " + StringUtils.trimToEmpty(input.getLastName()); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java index 3786d0a..b849b84 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Speciess.java @@ -27,30 +27,20 @@ package fr.ifremer.tutti.persistence.entities.referential; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; -import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; -import com.google.common.collect.Sets; import org.apache.commons.lang3.StringUtils; import org.nuiton.jaxx.application.ApplicationBusinessException; -import java.util.Collections; import java.util.Comparator; -import java.util.List; import java.util.Map; -import java.util.Set; import static org.nuiton.i18n.I18n.t; public class Speciess extends AbstractSpeciess { - public static final Predicate<Species> IS_TEMPORARY = new Predicate<Species>() { - @Override - public boolean apply(Species input) { - return isTemporary(input); - } - }; + public static final Predicate<Species> IS_TEMPORARY = Speciess::isTemporary; /** * Is the given {@code species} a temporary data ? @@ -82,54 +72,25 @@ public class Speciess extends AbstractSpeciess { } - public static final Comparator<Species> SPECIES_BY_NAME_COMPARATOR = new Comparator<Species>() { - - public int compare(Species o1, Species o2) { - if (o1 == null) { - return -1; - } - if (o2 == null) { - return 1; - } - return o1.getName().compareTo(o2.getName()); + public static final Comparator<Species> SPECIES_BY_NAME_COMPARATOR = (o1, o2) -> { + if (o1 == null) { + return -1; } - - }; - - public static final Function<Species, String> GET_REFERECE_TAXON_ID = new Function<Species, String>() { - @Override - public String apply(Species input) { - return String.valueOf(input.getReferenceTaxonId()); + if (o2 == null) { + return 1; } + return o1.getName().compareTo(o2.getName()); }; - public static final Function<Species, Integer> GET_REFERECE_TAXON_ID_AS_INT = new Function<Species, Integer>() { - @Override - public Integer apply(Species input) { - return input.getReferenceTaxonId(); - } - }; + public static final Function<Species, String> GET_REFERECE_TAXON_ID = input -> String.valueOf(input.getReferenceTaxonId()); - public static final Function<Species, String> GET_REF_TAX_CODE = new Function<Species, String>() { - @Override - public String apply(Species input) { - return String.valueOf(input.getRefTaxCode()); - } - }; + public static final Function<Species, Integer> GET_REFERECE_TAXON_ID_AS_INT = Species::getReferenceTaxonId; - public static final Function<Species, String> GET_SURVEY_CODE = new Function<Species, String>() { - @Override - public String apply(Species input) { - return String.valueOf(input.getSurveyCode()); - } - }; + public static final Function<Species, String> GET_REF_TAX_CODE = input -> String.valueOf(input.getRefTaxCode()); - public static final Function<Species, String> GET_NAME = new Function<Species, String>() { - @Override - public String apply(Species input) { - return input.getName(); - } - }; + public static final Function<Species, String> GET_SURVEY_CODE = input -> String.valueOf(input.getSurveyCode()); + + public static final Function<Species, String> GET_NAME = Species::getName; /** * Indexe une liste d'espèces référentes par la propriété {@link Species#PROPERTY_REFERENCE_TAXON_ID}. @@ -163,12 +124,11 @@ public class Speciess extends AbstractSpeciess { return Multimaps.index(list, GET_SURVEY_CODE); } - public static Set<String> toReferenceTaxonIds(List<Species> list) { - Set<String> result = list == null ? - Collections.<String>emptySet() : - Sets.newHashSet(Lists.transform(list, GET_REFERECE_TAXON_ID)); - return result; - } +// public static Set<String> toReferenceTaxonIds(List<Species> list) { +// return list == null ? +// Collections.<String>emptySet() : +// Sets.newHashSet(Lists.transform(list, GET_REFERECE_TAXON_ID)); +// } public static String getSurveyCodeOrRefTaxCode(Species species) { String code = species.getSurveyCode(); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TaxonCache.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TaxonCache.java index aa19e07..042cf1b 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TaxonCache.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TaxonCache.java @@ -58,16 +58,14 @@ public class TaxonCache { public String getLengthStepPmfmId(Species species) { SpeciesProtocol speciesProtocol = protocolMap.get(species.getReferenceTaxonId()); - String lengthStepPmfmId = speciesProtocol == null ? null : speciesProtocol.getLengthStepPmfmId(); - return lengthStepPmfmId; + return speciesProtocol == null ? null : speciesProtocol.getLengthStepPmfmId(); } public Float getLengthStep(Species species) { SpeciesProtocol speciesProtocol = protocolMap.get(species.getReferenceTaxonId()); - Float lengthStep = speciesProtocol == null ? null : speciesProtocol.getLengthStep(); - return lengthStep; + return speciesProtocol == null ? null : speciesProtocol.getLengthStep(); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TaxonCaches.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TaxonCaches.java index 751f66a..ecc7f68 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TaxonCaches.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TaxonCaches.java @@ -57,8 +57,7 @@ public class TaxonCaches { } - TaxonCache taxonCache = new TaxonCache(false, persistenceService, protocolMap); - return taxonCache; + return new TaxonCache(false, persistenceService, protocolMap); } @@ -78,8 +77,7 @@ public class TaxonCaches { } - TaxonCache taxonCache = new TaxonCache(true, persistenceService, protocolMap); - return taxonCache; + return new TaxonCache(true, persistenceService, protocolMap); } @@ -100,8 +98,7 @@ public class TaxonCaches { } - TaxonCache taxonCache = new TaxonCache(false, persistenceService, protocolMap); - return taxonCache; + return new TaxonCache(false, persistenceService, protocolMap); } @@ -121,8 +118,7 @@ public class TaxonCaches { } - TaxonCache taxonCache = new TaxonCache(true, persistenceService, protocolMap); - return taxonCache; + return new TaxonCache(true, persistenceService, protocolMap); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TuttiLocations.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TuttiLocations.java index 7a51d61..f21d3e0 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TuttiLocations.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TuttiLocations.java @@ -25,33 +25,19 @@ package fr.ifremer.tutti.persistence.entities.referential; */ import com.google.common.base.Function; -import com.google.common.collect.Maps; - -import java.util.List; -import java.util.Map; public class TuttiLocations extends AbstractTuttiLocations { - public static Map<String, TuttiLocation> splitByLabel(List<TuttiLocation> tuttiLocations) { - return Maps.uniqueIndex(tuttiLocations, GET_LABEL); - } - - public static Map<String, TuttiLocation> splitByName(List<TuttiLocation> tuttiLocations) { - return Maps.uniqueIndex(tuttiLocations, GET_NAME); - } +// public static Map<String, TuttiLocation> splitByLabel(List<TuttiLocation> tuttiLocations) { +// return Maps.uniqueIndex(tuttiLocations, GET_LABEL); +// } +// +// public static Map<String, TuttiLocation> splitByName(List<TuttiLocation> tuttiLocations) { +// return Maps.uniqueIndex(tuttiLocations, GET_NAME); +// } - public static final Function<TuttiLocation, String> GET_LABEL = new Function<TuttiLocation, String>() { - @Override - public String apply(TuttiLocation input) { - return input.getLabel(); - } - }; + public static final Function<TuttiLocation, String> GET_LABEL = TuttiLocation::getLabel; - public static final Function<TuttiLocation, String> GET_NAME = new Function<TuttiLocation, String>() { - @Override - public String apply(TuttiLocation input) { - return input.getName(); - } - }; + public static final Function<TuttiLocation, String> GET_NAME = TuttiLocation::getName; } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Vessels.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Vessels.java index 8575d92..99981f7 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Vessels.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Vessels.java @@ -27,54 +27,32 @@ package fr.ifremer.tutti.persistence.entities.referential; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; -import com.google.common.collect.Maps; import fr.ifremer.adagio.core.dao.technical.hibernate.TemporaryDataHelper; -import java.util.List; -import java.util.Map; - public class Vessels extends AbstractVessels { - public static Map<String, Vessel> splitByRegistrationCode(List<Vessel> programs) { - return Maps.uniqueIndex(programs, GET_REGISTRATION_CODE); - } +// public static Map<String, Vessel> splitByRegistrationCode(List<Vessel> programs) { +// return Maps.uniqueIndex(programs, GET_REGISTRATION_CODE); +// } +// +// public static Map<String, Vessel> splitByInternationalRegistrationCode(List<Vessel> programs) { +// return Maps.uniqueIndex(programs, GET_INTERNAL_REGISTRATION_CODE); +// } - public static Map<String, Vessel> splitByInternationalRegistrationCode(List<Vessel> programs) { - return Maps.uniqueIndex(programs, GET_INTERNAL_REGISTRATION_CODE); - } - - public static final Predicate<Vessel> IS_TEMPORARY = new Predicate<Vessel>() { - @Override - public boolean apply(Vessel input) { - return isTemporary(input); - } - }; + public static final Predicate<Vessel> IS_TEMPORARY = Vessels::isTemporary; - public static Function<Vessel, String> GET_REGISTRATION_CODE_OR_INTERNATIONAL_REGISTRATION_CODE = new Function<Vessel, String>() { - @Override - public String apply(Vessel input) { + public static Function<Vessel, String> GET_REGISTRATION_CODE_OR_INTERNATIONAL_REGISTRATION_CODE = input -> { - String result = input.getRegistrationCode(); - if (result == null) { - result = input.getInternationalRegistrationCode(); - } - return result; + String result = input.getRegistrationCode(); + if (result == null) { + result = input.getInternationalRegistrationCode(); } + return result; }; - public static final Function<Vessel, String> GET_REGISTRATION_CODE = new Function<Vessel, String>() { - @Override - public String apply(Vessel input) { - return input.getRegistrationCode(); - } - }; +// public static final Function<Vessel, String> GET_REGISTRATION_CODE = Vessel::getRegistrationCode; - public static final Function<Vessel, String> GET_INTERNAL_REGISTRATION_CODE = new Function<Vessel, String>() { - @Override - public String apply(Vessel input) { - return input.getInternationalRegistrationCode(); - } - }; + public static final Function<Vessel, String> GET_INTERNAL_REGISTRATION_CODE = Vessel::getInternationalRegistrationCode; /** * Is the given {@code vessel} a temporary data ? diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/DataModelSupport.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/DataModelSupport.java index e23880e..8acb918 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/DataModelSupport.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/DataModelSupport.java @@ -25,6 +25,7 @@ package fr.ifremer.tutti.persistence.model; */ import java.io.Serializable; +import java.util.Objects; /** * Created on 3/29/15. @@ -59,6 +60,10 @@ public abstract class DataModelSupport implements Serializable { public String getId() { return id; } + public Integer getIdAsInt() { + Objects.requireNonNull(id); + return Integer.valueOf(id); + } public String getLabel() { return label; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/OperationDataModel.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/OperationDataModel.java index cb86509..8859488 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/OperationDataModel.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/OperationDataModel.java @@ -37,12 +37,11 @@ public class OperationDataModel extends DataModelSupport { private static final long serialVersionUID = 1L; private static String getLabel(FishingOperation operation) { - String label = String.format("%1$s - %2$d - %3$s - %4$td/%4$tm/%4$tY", - operation.getStationNumber(), - operation.getFishingOperationNumber(), - operation.getMultirigAggregation(), - operation.getGearShootingStartDate()); - return label; + return String.format("%1$s - %2$d - %3$s - %4$td/%4$tm/%4$tY", + operation.getStationNumber(), + operation.getFishingOperationNumber(), + operation.getMultirigAggregation(), + operation.getGearShootingStartDate()); } public OperationDataModel(FishingOperation operation) { diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java index 42b9397..15ef1a4 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java @@ -41,7 +41,6 @@ import java.util.Collection; import java.util.Date; import java.util.GregorianCalendar; import java.util.Iterator; -import java.util.List; /** * TODO @@ -128,23 +127,20 @@ public abstract class AbstractPersistenceService implements TuttiPersistenceServ protected Iterator<Object[]> queryList(String queryName, Object... params) { Query query = createQuery(queryName, params); - Iterator result = query.iterate(); - return result; + return query.iterate(); } protected <T> Iterator<T> queryListTyped(String queryName, Object... params) { Query query = createQuery(queryName, params); - Iterator result = query.iterate(); - return result; + return query.iterate(); } - protected <T> List<T> queryList2Typed(String queryName, Object... params) { - - Query query = createQuery(queryName, params); - List result = query.list(); - return result; - } +// protected <T> List<T> queryList2Typed(String queryName, Object... params) { +// +// Query query = createQuery(queryName, params); +// return query.list(); +// } protected Query createQuery(String queryName, Object... params) { Query query = getCurrentSession().getNamedQuery(queryName); @@ -187,13 +183,11 @@ public abstract class AbstractPersistenceService implements TuttiPersistenceServ // throw new DataIntegrityViolationException("Unable to load entity " + clazz.getName() + " with id=" + id + " : not found in database."); // } // } - T load = (T) getCurrentSession().load(clazz, id); - return load; + return (T) getCurrentSession().load(clazz, id); } protected <T extends Serializable> T get(Class<? extends T> clazz, Serializable id) { - T load = (T) getCurrentSession().get(clazz, id); - return load; + return (T) getCurrentSession().get(clazz, id); } protected int queryUpdate(String queryName, Object... params) { @@ -240,25 +234,25 @@ public abstract class AbstractPersistenceService implements TuttiPersistenceServ return calendar.getTime(); } - protected Date dateWithOneMiliSecond(Date date) { - calendar.setTime(date); - calendar.add(Calendar.MILLISECOND, 1); - return calendar.getTime(); - } - - protected Date dateOfYearWithOneMiliSecond(int year) { - calendar.setTimeInMillis(0); - calendar.set(Calendar.YEAR, year); - calendar.set(Calendar.MILLISECOND, 1); - return calendar.getTime(); - } - - protected long dateOfYearWithOneMiliSecondInMili(int year) { - calendar.setTimeInMillis(0); - calendar.set(Calendar.YEAR, year); - calendar.set(Calendar.MILLISECOND, 1); - return calendar.getTimeInMillis(); - } +// protected Date dateWithOneMiliSecond(Date date) { +// calendar.setTime(date); +// calendar.add(Calendar.MILLISECOND, 1); +// return calendar.getTime(); +// } +// +// protected Date dateOfYearWithOneMiliSecond(int year) { +// calendar.setTimeInMillis(0); +// calendar.set(Calendar.YEAR, year); +// calendar.set(Calendar.MILLISECOND, 1); +// return calendar.getTime(); +// } +// +// protected long dateOfYearWithOneMiliSecondInMili(int year) { +// calendar.setTimeInMillis(0); +// calendar.set(Calendar.YEAR, year); +// calendar.set(Calendar.MILLISECOND, 1); +// return calendar.getTimeInMillis(); +// } /** * Test if the date has millisecond set. This yes, return null, then return the date itself. diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceService.java index 1bcdd21..16bd12a 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceService.java @@ -38,13 +38,13 @@ import java.util.List; @Transactional(readOnly = true) public interface AccidentalBatchPersistenceService extends TuttiPersistenceServiceImplementor { - List<AccidentalBatch> getAllAccidentalBatch(String fishingOperationId); + List<AccidentalBatch> getAllAccidentalBatch(Integer fishingOperationId); @Transactional(readOnly = false) AccidentalBatch createAccidentalBatch(AccidentalBatch bean); @Transactional(readOnly = false) - Collection<AccidentalBatch> createAccidentalBatches(String fishingOperationId, Collection<AccidentalBatch> beans); + Collection<AccidentalBatch> createAccidentalBatches(Integer fishingOperationId, Collection<AccidentalBatch> beans); @Transactional(readOnly = false) AccidentalBatch saveAccidentalBatch(AccidentalBatch bean); @@ -53,5 +53,5 @@ public interface AccidentalBatchPersistenceService extends TuttiPersistenceServi void deleteAccidentalBatch(String id); @Transactional(readOnly = false) - void deleteAccidentalBatchForFishingOperation(String fishingOperationId); + void deleteAccidentalBatchForFishingOperation(Integer fishingOperationId); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java index 4c60dcc..556383b 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceImpl.java @@ -87,12 +87,12 @@ public class AccidentalBatchPersistenceServiceImpl extends AbstractPersistenceSe protected SynchronizationStatusHelper synchronizationStatusHelper; @Override - public List<AccidentalBatch> getAllAccidentalBatch(String fishingOperationId) { + public List<AccidentalBatch> getAllAccidentalBatch(Integer fishingOperationId) { Preconditions.checkNotNull(fishingOperationId); Iterator<Object[]> list = queryList( "allFishingOperationSamplesWithoutBatch", - "fishingOperationId", IntegerType.INSTANCE, Integer.valueOf(fishingOperationId) + "fishingOperationId", IntegerType.INSTANCE, fishingOperationId ); List<AccidentalBatch> result = Lists.newArrayList(); @@ -130,7 +130,7 @@ public class AccidentalBatchPersistenceServiceImpl extends AbstractPersistenceSe } @Override - public Collection<AccidentalBatch> createAccidentalBatches(String fishingOperationId, Collection<AccidentalBatch> beans) { + public Collection<AccidentalBatch> createAccidentalBatches(Integer fishingOperationId, Collection<AccidentalBatch> beans) { Preconditions.checkNotNull(beans); Collection<AccidentalBatch> result = new ArrayList<>(); @@ -171,7 +171,7 @@ public class AccidentalBatchPersistenceServiceImpl extends AbstractPersistenceSe } @Override - public void deleteAccidentalBatchForFishingOperation(String fishingOperationId) { + public void deleteAccidentalBatchForFishingOperation(Integer fishingOperationId) { Preconditions.checkNotNull(fishingOperationId); List<AccidentalBatch> batches = diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java index 563a098..d7b8693 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AttachmentPersistenceServiceImpl.java @@ -116,8 +116,7 @@ public class AttachmentPersistenceServiceImpl extends AbstractPersistenceService Attachment target = Attachments.newAttachment(); loadAttachment(source, target); - File result = getFile(target); - return result; + return getFile(target); } @Override @@ -242,9 +241,7 @@ public class AttachmentPersistenceServiceImpl extends AbstractPersistenceService public void deleteAllAttachment(ObjectTypeCode objectType, Integer... objectIds) { for (Integer objectId : objectIds) { List<Attachment> attachments = getAllAttachments(objectType, objectId); - for (Attachment attachment : attachments) { - delete(attachment); - } + attachments.forEach(this::delete); } } @@ -270,8 +267,7 @@ public class AttachmentPersistenceServiceImpl extends AbstractPersistenceService } protected File getFile(Attachment attachment) { - File result = new File(dbAttachmentDirectory, attachment.getPath()); - return result; + return new File(dbAttachmentDirectory, attachment.getPath()); } protected void delete(Attachment target) { diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceService.java index 5ee9ad6..617e7b5 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceService.java @@ -58,32 +58,31 @@ public interface BenthosBatchPersistenceService extends TuttiPersistenceServiceI * @throws InvalidBatchModelException if batch does not respect the sample category model * @since 1.0 */ - BatchContainer<BenthosBatch> getRootBenthosBatch(String fishingOperationId, boolean validateTree) throws InvalidBatchModelException; + BatchContainer<BenthosBatch> getRootBenthosBatch(Integer fishingOperationId, boolean validateTree) throws InvalidBatchModelException; @Transactional(readOnly = false) - BenthosBatch createBenthosBatch(BenthosBatch bean, String parentBatchId, boolean computeRankOrder); + BenthosBatch createBenthosBatch(BenthosBatch bean, Integer parentBatchId, boolean computeRankOrder); @Transactional(readOnly = false) - Collection<BenthosBatch> createBenthosBatches(String fishingOperationId, Collection<BenthosBatch> beans); + Collection<BenthosBatch> createBenthosBatches(Integer fishingOperationId, Collection<BenthosBatch> beans); @Transactional(readOnly = false) BenthosBatch saveBenthosBatch(BenthosBatch bean); @Transactional(readOnly = false) - void deleteBenthosBatch(String id); + void deleteBenthosBatch(Integer id); @Transactional(readOnly = false) - void deleteBenthosSubBatch(String id); + void deleteBenthosSubBatch(Integer id); /** * Change the species in the given {@code batchId} and in all his * sub batches. - * - * @param batchId id of the root Benthos batch to treat + * @param batchId id of the root Benthos batch to treat * @param species species to affect to all batches */ @Transactional(readOnly = false) - void changeBenthosBatchSpecies(String batchId, Species species); + void changeBenthosBatchSpecies(Integer batchId, Species species); /** * Get all the batches to confirm @@ -93,7 +92,7 @@ public interface BenthosBatchPersistenceService extends TuttiPersistenceServiceI * @throws InvalidBatchModelException if batch does not respect the sample category model * @since 3.13 */ - List<BenthosBatch> getAllBenthosBatchToConfirm(String fishingOperationId) throws InvalidBatchModelException; + List<BenthosBatch> getAllBenthosBatchToConfirm(Integer fishingOperationId) throws InvalidBatchModelException; //------------------------------------------------------------------------// //-- BenthosBatchFrequency methods --// @@ -106,7 +105,7 @@ public interface BenthosBatchPersistenceService extends TuttiPersistenceServiceI * @return the list of frequencies for the given benthos batch id * @since 1.0 */ - List<BenthosBatchFrequency> getAllBenthosBatchFrequency(String benthosBatchId); + List<BenthosBatchFrequency> getAllBenthosBatchFrequency(Integer benthosBatchId); /** * Get all frequencies for the given root benthos batch container. @@ -130,6 +129,6 @@ public interface BenthosBatchPersistenceService extends TuttiPersistenceServiceI * @since 1.0 */ @Transactional(readOnly = false) - List<BenthosBatchFrequency> saveBenthosBatchFrequency(String benthosBatchId, + List<BenthosBatchFrequency> saveBenthosBatchFrequency(Integer benthosBatchId, List<BenthosBatchFrequency> frequencies); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java index ab27c1b..d497be6 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java @@ -98,7 +98,7 @@ public class BenthosBatchPersistenceServiceImpl extends AbstractPersistenceServi //------------------------------------------------------------------------// @Override - public BatchContainer<BenthosBatch> getRootBenthosBatch(String fishingOperationId, + public BatchContainer<BenthosBatch> getRootBenthosBatch(Integer fishingOperationId, boolean validateTree) { Preconditions.checkNotNull(fishingOperationId); @@ -172,7 +172,7 @@ public class BenthosBatchPersistenceServiceImpl extends AbstractPersistenceServi } @Override - public BenthosBatch createBenthosBatch(BenthosBatch bean, String parentBatchId, boolean computeRankOrder) { + public BenthosBatch createBenthosBatch(BenthosBatch bean, Integer parentBatchId, boolean computeRankOrder) { Preconditions.checkNotNull(bean); Preconditions.checkArgument(TuttiEntities.isNew(bean)); Preconditions.checkNotNull(bean.getSpecies()); @@ -180,14 +180,13 @@ public class BenthosBatchPersistenceServiceImpl extends AbstractPersistenceServi Preconditions.checkNotNull(bean.getFishingOperation()); Preconditions.checkNotNull(bean.getFishingOperation().getId()); - CatchBatch catchBatch = batchHelper.getRootCatchBatchByFishingOperationId(bean.getFishingOperation().getId(), false); - BenthosBatch created = createBenthosBatch(bean, parentBatchId, catchBatch, computeRankOrder); + CatchBatch catchBatch = batchHelper.getRootCatchBatchByFishingOperationId(bean.getFishingOperation().getIdAsInt(), false); - return created; + return createBenthosBatch(bean, parentBatchId, catchBatch, computeRankOrder); } @Override - public Collection<BenthosBatch> createBenthosBatches(String fishingOperationId, Collection<BenthosBatch> beans) { + public Collection<BenthosBatch> createBenthosBatches(Integer fishingOperationId, Collection<BenthosBatch> beans) { Preconditions.checkNotNull(beans); Preconditions.checkNotNull(fishingOperationId); @@ -205,7 +204,7 @@ public class BenthosBatchPersistenceServiceImpl extends AbstractPersistenceServi } - protected BenthosBatch createBenthosBatch(BenthosBatch bean, String parentBatchId, CatchBatch catchBatch, boolean computeRankOrder) { + protected BenthosBatch createBenthosBatch(BenthosBatch bean, Integer parentBatchId, CatchBatch catchBatch, boolean computeRankOrder) { Preconditions.checkNotNull(bean); Preconditions.checkArgument(TuttiEntities.isNew(bean)); @@ -230,9 +229,9 @@ public class BenthosBatchPersistenceServiceImpl extends AbstractPersistenceServi CatchBatch catchBatch = batchHelper.getRootCatchBatchByBatchId(batchId); SortingBatch batch = batchHelper.getSortingBatchById(catchBatch, batchId); - String parentBatchId = null; + Integer parentBatchId = null; if (bean.getParentBatch() != null) { - parentBatchId = bean.getParentBatch().getId(); + parentBatchId = bean.getParentBatch().getIdAsInt(); } beanToEntity(bean, batch, parentBatchId, catchBatch, true); batchHelper.updateSortingBatch(batch, catchBatch); @@ -241,19 +240,19 @@ public class BenthosBatchPersistenceServiceImpl extends AbstractPersistenceServi } @Override - public void deleteBenthosBatch(String id) { + public void deleteBenthosBatch(Integer id) { Preconditions.checkNotNull(id); batchHelper.deleteBatch(id); } @Override - public void deleteBenthosSubBatch(String id) { + public void deleteBenthosSubBatch(Integer id) { Preconditions.checkNotNull(id); batchHelper.deleteSpeciesSubBatch(id); } @Override - public void changeBenthosBatchSpecies(String id, Species species) { + public void changeBenthosBatchSpecies(Integer id, Species species) { Preconditions.checkNotNull(id); Preconditions.checkNotNull(species); Preconditions.checkNotNull(species.getReferenceTaxonId()); @@ -261,7 +260,7 @@ public class BenthosBatchPersistenceServiceImpl extends AbstractPersistenceServi } @Override - public List<BenthosBatch> getAllBenthosBatchToConfirm(String fishingOperationId) throws InvalidBatchModelException { + public List<BenthosBatch> getAllBenthosBatchToConfirm(Integer fishingOperationId) throws InvalidBatchModelException { List<BenthosBatch> batchesToConfirm = new ArrayList<>(); BatchContainer<BenthosBatch> rootBenthosBatch = getRootBenthosBatch(fishingOperationId, false); @@ -288,7 +287,7 @@ public class BenthosBatchPersistenceServiceImpl extends AbstractPersistenceServi //------------------------------------------------------------------------// @Override - public List<BenthosBatchFrequency> getAllBenthosBatchFrequency(String benthosBatchId) { + public List<BenthosBatchFrequency> getAllBenthosBatchFrequency(Integer benthosBatchId) { Preconditions.checkNotNull(benthosBatchId); List<SortingBatch> frequencyChilds = batchHelper.getFrequencies( @@ -315,7 +314,7 @@ public class BenthosBatchPersistenceServiceImpl extends AbstractPersistenceServi protected void getAllSpeciesBatchFrequencyForBatch(BenthosBatch batch, Multimap<Species, BenthosBatchFrequency> result) { - List<BenthosBatchFrequency> speciesBatchFrequency = getAllBenthosBatchFrequency(batch.getId()); + List<BenthosBatchFrequency> speciesBatchFrequency = getAllBenthosBatchFrequency(batch.getIdAsInt()); result.putAll(batch.getSpecies(), speciesBatchFrequency); if (!batch.isChildBatchsEmpty()) { @@ -326,7 +325,7 @@ public class BenthosBatchPersistenceServiceImpl extends AbstractPersistenceServi } @Override - public List<BenthosBatchFrequency> saveBenthosBatchFrequency(String benthosBatchId, + public List<BenthosBatchFrequency> saveBenthosBatchFrequency(Integer benthosBatchId, List<BenthosBatchFrequency> frequencies) { Preconditions.checkNotNull(benthosBatchId); Preconditions.checkNotNull(frequencies); @@ -342,8 +341,7 @@ public class BenthosBatchPersistenceServiceImpl extends AbstractPersistenceServi } } - Integer sortingBatchId = Integer.valueOf(benthosBatchId); - CatchBatch catchBatch = batchHelper.getRootCatchBatchByBatchId(sortingBatchId); + CatchBatch catchBatch = batchHelper.getRootCatchBatchByBatchId(benthosBatchId); if (catchBatch == null) { return frequencies; @@ -353,7 +351,7 @@ public class BenthosBatchPersistenceServiceImpl extends AbstractPersistenceServi synchronizationStatusHelper.setDirty(catchBatch); // Retrieve parent - SortingBatch parentBatch = batchHelper.getSortingBatchById(catchBatch, sortingBatchId); + SortingBatch parentBatch = batchHelper.getSortingBatchById(catchBatch, benthosBatchId); // Remember child ids, to remove unchanged item (see at bottom in this method) List<Integer> notUpdatedChildIds = Lists.newArrayList(); @@ -414,7 +412,7 @@ public class BenthosBatchPersistenceServiceImpl extends AbstractPersistenceServi protected void beanToEntity(BenthosBatch source, SortingBatch target, - String parentBatchId, + Integer parentBatchId, CatchBatch catchBatch, boolean computeRankOrder) { @@ -424,7 +422,7 @@ public class BenthosBatchPersistenceServiceImpl extends AbstractPersistenceServi // If parent and root need to be set if (target.getId() == null || target.getRootBatch() == null - || (target.getParentBatch() != null && !target.getParentBatch().getId().toString().equals(parentBatchId))) { + || (target.getParentBatch() != null && !target.getParentBatch().getId().equals(parentBatchId))) { batchHelper.setBenthosBatchParents( source.getSampleCategoryId(), source.getSampleCategoryValue(), diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceService.java index d274587..58330a0 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceService.java @@ -39,7 +39,7 @@ public interface CatchBatchPersistenceService extends TuttiPersistenceServiceImp * operation, {@code false} otherwise. * @since 2.2 */ - boolean isFishingOperationWithCatchBatch(String operationId); + boolean isFishingOperationWithCatchBatch(Integer operationId); /** * Get the catchBatch from the fishing Operation id. @@ -47,7 +47,7 @@ public interface CatchBatchPersistenceService extends TuttiPersistenceServiceImp * @param fishingOperationId id of the fishing operation * @return found catchBatch */ - CatchBatch getCatchBatchFromFishingOperation(String fishingOperationId); + CatchBatch getCatchBatchFromFishingOperation(Integer fishingOperationId); /** * Create the given CatchBatch and return it. @@ -75,7 +75,7 @@ public interface CatchBatchPersistenceService extends TuttiPersistenceServiceImp * @since 2.2 */ @Transactional(readOnly = false) - void deleteCatchBatch(String fishingOperationId); + void deleteCatchBatch(Integer fishingOperationId); /** * Recompute all the sampleRatio and sampleRatioText for the catch batch @@ -85,5 +85,5 @@ public interface CatchBatchPersistenceService extends TuttiPersistenceServiceImp * @since 3.5 */ @Transactional(readOnly = false) - void recomputeCatchBatchSampleRatios(String fishingOperationId); + void recomputeCatchBatchSampleRatios(Integer fishingOperationId); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java index d48dbbb..b50f139 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java @@ -86,15 +86,13 @@ public class CatchBatchPersistenceServiceImpl //------------------------------------------------------------------------// @Override - public boolean isFishingOperationWithCatchBatch(String operationId) { + public boolean isFishingOperationWithCatchBatch(Integer operationId) { Preconditions.checkNotNull(operationId); - boolean result = batchHelper.isCatchBatchExistsForFishingOperation( - Integer.valueOf(operationId)); - return result; + return batchHelper.isCatchBatchExistsForFishingOperation(operationId); } @Override - public CatchBatch getCatchBatchFromFishingOperation(String fishingOperationId) { + public CatchBatch getCatchBatchFromFishingOperation(Integer fishingOperationId) { Preconditions.checkNotNull(fishingOperationId); // whenever want to repair anything from Tutti @@ -171,9 +169,9 @@ public class CatchBatchPersistenceServiceImpl } @Override - public void deleteCatchBatch(String fishingOperationId) { + public void deleteCatchBatch(Integer fishingOperationId) { Preconditions.checkNotNull(fishingOperationId); - Integer catchBatchId = batchHelper.getCatchBatchIdByFishingOperationId(Integer.valueOf(fishingOperationId)); + Integer catchBatchId = batchHelper.getCatchBatchIdByFishingOperationId(fishingOperationId); if (catchBatchId == null) { throw new DataRetrievalFailureException("Could not retrieve catch batch for fishingOperation id=" + fishingOperationId); @@ -183,10 +181,10 @@ public class CatchBatchPersistenceServiceImpl } @Override - public void recomputeCatchBatchSampleRatios(String fishingOperationId) { + public void recomputeCatchBatchSampleRatios(Integer fishingOperationId) { Preconditions.checkNotNull(fishingOperationId); - Integer catchBatchId = batchHelper.getCatchBatchIdByFishingOperationId(Integer.valueOf(fishingOperationId)); + Integer catchBatchId = batchHelper.getCatchBatchIdByFishingOperationId(fishingOperationId); if (catchBatchId == null) { throw new DataRetrievalFailureException("Could not retrieve catch batch for fishingOperation id=" + fishingOperationId); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceService.java index 5c045db..6356f67 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceService.java @@ -40,11 +40,11 @@ import java.util.List; @Transactional(readOnly = true) public interface CruisePersistenceService extends TuttiPersistenceServiceImplementor { - List<String> getAllCruiseId(String programId); + List<Integer> getAllCruiseId(String programId); List<Cruise> getAllCruise(String programId); - Cruise getCruise(String id); + Cruise getCruise(Integer id); @Transactional(readOnly = false) Cruise createCruise(Cruise bean); @@ -55,7 +55,7 @@ public interface CruisePersistenceService extends TuttiPersistenceServiceImpleme @Transactional(readOnly = false) void setCruiseReadyToSynch(Integer cruiseId); - CaracteristicMap getGearCaracteristics(String cruiseId, String gearId, short rankOrder); + CaracteristicMap getGearCaracteristics(Integer cruiseId, Integer gearId, short rankOrder); @Transactional(readOnly = false) void saveGearCaracteristics(Gear gear, Cruise cruise); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java index e0f6fe4..605fa7a 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java @@ -22,7 +22,6 @@ package fr.ifremer.tutti.persistence.service; * #L% */ -import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -177,7 +176,7 @@ public class CruisePersistenceServiceImpl extends AbstractPersistenceService imp protected SynchronizationStatusHelper synchronizationStatusHelper; @Override - public List<String> getAllCruiseId(String programId) { + public List<Integer> getAllCruiseId(String programId) { Preconditions.checkNotNull(programId); @@ -185,10 +184,10 @@ public class CruisePersistenceServiceImpl extends AbstractPersistenceService imp "allCruiseIds", "programCode", StringType.INSTANCE, programId); - List<String> result = Lists.newArrayList(); + List<Integer> result = Lists.newArrayList(); while (list.hasNext()) { Integer id = (Integer) list.next(); - result.add(id.toString()); + result.add(id); } return Collections.unmodifiableList(result); @@ -218,13 +217,13 @@ public class CruisePersistenceServiceImpl extends AbstractPersistenceService imp } @Override - public Cruise getCruise(String cruiseId) { + public Cruise getCruise(Integer cruiseId) { Preconditions.checkNotNull(cruiseId); Object[] source = queryUnique( "cruise", - "cruiseId", IntegerType.INSTANCE, Integer.valueOf(cruiseId), + "cruiseId", IntegerType.INSTANCE, cruiseId, "pmfmIdSurveyPart", IntegerType.INSTANCE, PmfmId.SURVEY_PART.getValue()); if (source == null) { @@ -286,7 +285,7 @@ public class CruisePersistenceServiceImpl extends AbstractPersistenceService imp // get cruise gears Iterator<Object[]> list = queryList( "allCruiseGears", - "cruiseId", IntegerType.INSTANCE, Integer.valueOf(cruiseId), + "cruiseId", IntegerType.INSTANCE, cruiseId, "pmfmIdTrawlNet", IntegerType.INSTANCE, PmfmId.MULTIRIG_NUMBER.getValue()); List<GearWithOriginalRankOrder> gears = Lists.newArrayList(); @@ -309,7 +308,7 @@ public class CruisePersistenceServiceImpl extends AbstractPersistenceService imp Iterator<Object[]> vesselPersonFeaturesList = queryList( "allCruiseVesselPersonFeatures", - "cruiseId", IntegerType.INSTANCE, Integer.valueOf(cruiseId)); + "cruiseId", IntegerType.INSTANCE, cruiseId); while (vesselPersonFeaturesList.hasNext()) { Object[] vesselPersonFeatures = vesselPersonFeaturesList.next(); @@ -427,8 +426,8 @@ public class CruisePersistenceServiceImpl extends AbstractPersistenceService imp } @Override - public CaracteristicMap getGearCaracteristics(String cruiseId, - String gearId, + public CaracteristicMap getGearCaracteristics(Integer cruiseId, + Integer gearId, short rankOrder) { Preconditions.checkNotNull(cruiseId, "Cruise 'id' must not be null or empty"); Preconditions.checkNotNull(gearId, "Gear 'id' must not be null or empty"); @@ -441,8 +440,8 @@ public class CruisePersistenceServiceImpl extends AbstractPersistenceService imp Iterator<GearPhysicalMeasurement> list = queryListTyped( "gearCaracteristics", - "cruiseId", IntegerType.INSTANCE, Integer.valueOf(cruiseId), - "gearId", IntegerType.INSTANCE, Integer.valueOf(gearId), + "cruiseId", IntegerType.INSTANCE, cruiseId, + "gearId", IntegerType.INSTANCE, gearId, "rankOrder", ShortType.INSTANCE, rankOrder); while (list.hasNext()) { @@ -747,17 +746,14 @@ public class CruisePersistenceServiceImpl extends AbstractPersistenceService imp // Remove deleted gear physical features if (fishingTrip.getGearPhysicalFeatures() != null && notChangedGearPhysicalFeatures.size() > 0) { List<Gear> gears = Lists.transform(Lists.newArrayList(notChangedGearPhysicalFeatures), - new Function<GearPhysicalFeatures, Gear>() { - @Override - public Gear apply(GearPhysicalFeatures input) { - Gear result = Gears.newGear(); - - if (input != null && input.getGear() != null) { - result.setRankOrder(input.getRankOrder()); - result.setId(input.getGear().getId()); - } - return result; + input -> { + Gear result = Gears.newGear(); + + if (input != null && input.getGear() != null) { + result.setRankOrder(input.getRankOrder()); + result.setId(input.getGear().getId()); } + return result; } ); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceService.java index 5f1944d..a34a85d 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceService.java @@ -39,15 +39,15 @@ import java.util.List; @Transactional(readOnly = true) public interface FishingOperationPersistenceService extends TuttiPersistenceServiceImplementor { - int getFishingOperationCount(String cruiseId); + int getFishingOperationCount(Integer cruiseId); - List<String> getAllFishingOperationIds(String cruiseId); + List<Integer> getAllFishingOperationIds(Integer cruiseId); - List<FishingOperation> getAllFishingOperation(String cruiseId); + List<FishingOperation> getAllFishingOperation(Integer cruiseId); - FishingOperation getFishingOperation(String id); + FishingOperation getFishingOperation(Integer id); - List<Vessel> getFishingOperationSecondaryVessel(String fishingOperationId); + List<Vessel> getFishingOperationSecondaryVessel(Integer fishingOperationId); @Transactional(readOnly = false) FishingOperation createFishingOperation(FishingOperation bean); @@ -59,5 +59,5 @@ public interface FishingOperationPersistenceService extends TuttiPersistenceServ Collection<FishingOperation> saveFishingOperations(Collection<FishingOperation> beans); @Transactional(readOnly = false) - void deleteFishingOperation(String id); + void deleteFishingOperation(Integer id); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java index 746f8da..b8da9fd 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java @@ -174,11 +174,11 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS protected static Float DEFAULT_EMPTY_LONGITUDE = 0.0001f; @Override - public int getFishingOperationCount(String cruiseId) { + public int getFishingOperationCount(Integer cruiseId) { Preconditions.checkNotNull(cruiseId); Iterator<Object[]> list = queryList( "allFishingOperationIds", - "cruiseId", IntegerType.INSTANCE, Integer.valueOf(cruiseId) + "cruiseId", IntegerType.INSTANCE, cruiseId ); int result = 0; while (list.hasNext()) { @@ -189,29 +189,29 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS } @Override - public List<String> getAllFishingOperationIds(String cruiseId) { + public List<Integer> getAllFishingOperationIds(Integer cruiseId) { Preconditions.checkNotNull(cruiseId); Iterator list = queryList( "allFishingOperationIds", - "cruiseId", IntegerType.INSTANCE, Integer.valueOf(cruiseId) + "cruiseId", IntegerType.INSTANCE, cruiseId ); - List<String> result = Lists.newArrayList(); + List<Integer> result = Lists.newArrayList(); while (list.hasNext()) { Integer id = (Integer) list.next(); - result.add(id.toString()); + result.add(id); } return result; } @Override - public List<FishingOperation> getAllFishingOperation(String cruiseId) { + public List<FishingOperation> getAllFishingOperation(Integer cruiseId) { Preconditions.checkNotNull(cruiseId); Iterator<Object[]> list = queryList( "allFishingOperations", - "cruiseId", IntegerType.INSTANCE, Integer.valueOf(cruiseId), + "cruiseId", IntegerType.INSTANCE, cruiseId, "pmfmIdStationNumber", IntegerType.INSTANCE, PmfmId.STATION_NUMBER.getValue(), "pmfmIdMultirigAggregation", IntegerType.INSTANCE, PmfmId.MULTIRIG_AGGREGATION.getValue() ); @@ -269,11 +269,11 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS } @Override - public FishingOperation getFishingOperation(String id) { + public FishingOperation getFishingOperation(Integer id) { Preconditions.checkNotNull(id); Object[] source = queryUnique( "fishingOperation", - "fishingOperationId", IntegerType.INSTANCE, Integer.valueOf(id), + "fishingOperationId", IntegerType.INSTANCE, id, "locationLevelIdStrata", IntegerType.INSTANCE, LocationLevelId.SCIENTIFIC_CRUISE_STRATA.getValue(), "locationLevelIdSubStrata", IntegerType.INSTANCE, LocationLevelId.SCIENTIFIC_CRUISE_SUB_STRATA.getValue(), "locationLevelIdLocalite", IntegerType.INSTANCE, LocationLevelId.SCIENTIFIC_CRUISE_LOCALITE.getValue() @@ -305,7 +305,7 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS if (result.getFishingOperationNumber() == null) { Integer fishingOperationRankOrder = queryUniqueTyped( "fishingOperationRankOrder", - "fishingOperationId", IntegerType.INSTANCE, Integer.valueOf(id) + "fishingOperationId", IntegerType.INSTANCE, id ); result.setFishingOperationNumber(fishingOperationRankOrder); } @@ -320,7 +320,7 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS result.setRecorderPerson(Lists.<Person>newArrayList()); Iterator<Object[]> vesselPersonFeaturesList = queryList( "fishingOperationVesselPersonFeatures", - "fishingOperationId", IntegerType.INSTANCE, Integer.valueOf(id)); + "fishingOperationId", IntegerType.INSTANCE, id); while (vesselPersonFeaturesList.hasNext()) { Object[] vesselPersonFeatures = vesselPersonFeaturesList.next(); @@ -415,10 +415,10 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS } @Override - public List<Vessel> getFishingOperationSecondaryVessel(String fishingOperationId) { + public List<Vessel> getFishingOperationSecondaryVessel(Integer fishingOperationId) { Iterator<Object[]> secondaryVesselList = queryList( "fishingOperationSecondaryVessel", - "fishingOperationId", IntegerType.INSTANCE, Integer.valueOf(fishingOperationId)); + "fishingOperationId", IntegerType.INSTANCE, fishingOperationId); List<Vessel> result = Lists.newArrayList(); while (secondaryVesselList.hasNext()) { @@ -508,10 +508,8 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS } @Override - public void deleteFishingOperation(String id) { - Preconditions.checkNotNull(id); - - Integer fishingOperationId = Integer.valueOf(id); + public void deleteFishingOperation(Integer fishingOperationId) { + Preconditions.checkNotNull(fishingOperationId); fr.ifremer.adagio.core.dao.data.operation.FishingOperation fishingOperation = fishingOperationDao.load(fishingOperationId); if (fishingOperation == null) { @@ -524,7 +522,7 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS getCurrentSession().flush(); // delete catch batch - catchBatchService.deleteCatchBatch(id); + catchBatchService.deleteCatchBatch(fishingOperationId); getCurrentSession().flush(); Set<FishingArea> fishingAreas = Sets.newHashSet(); @@ -630,11 +628,11 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS //-- Internal methods --// //------------------------------------------------------------------------// - protected void getVesselUseCaracteristics(String fishingOperationId, FishingOperation result) { + protected void getVesselUseCaracteristics(Integer fishingOperationId, FishingOperation result) { // retrieve fishing operation caracteristics Iterator<Object[]> list = queryList( "fishingOperationVesselUseFeatures", - "fishingOperationId", IntegerType.INSTANCE, Integer.valueOf(fishingOperationId) + "fishingOperationId", IntegerType.INSTANCE, fishingOperationId ); CaracteristicMap vesselUseCaracteristics = new CaracteristicMap(); @@ -696,11 +694,11 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS } } - protected void getGearUseCaracteristics(String fishingOperationId, FishingOperation result) { + protected void getGearUseCaracteristics(Integer fishingOperationId, FishingOperation result) { // retrieve fishing operation caracteristics Iterator<Object[]> list = queryList( "fishingOperationGearUseFeatures", - "fishingOperationId", IntegerType.INSTANCE, Integer.valueOf(fishingOperationId) + "fishingOperationId", IntegerType.INSTANCE, fishingOperationId ); CaracteristicMap gearShootingCaracteristics = new CaracteristicMap(); @@ -791,7 +789,7 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS } // Create a list to store all updates, then remove not updated items - Set<GearUseMeasurement> notChangedGearUseMeasurements = new HashSet<GearUseMeasurement>(); + Set<GearUseMeasurement> notChangedGearUseMeasurements = new HashSet<>(); if (gearUseFeatures.getGearUseMeasurements() != null) { notChangedGearUseMeasurements.addAll(gearUseFeatures.getGearUseMeasurements()); } @@ -812,7 +810,7 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS } // Create a list to trace not updated items, to be able to remove them later - Set<VesselUseMeasurement> notChangedVesselUseMeasurements = new HashSet<VesselUseMeasurement>(); + Set<VesselUseMeasurement> notChangedVesselUseMeasurements = new HashSet<>(); if (vesselUseFeatures.getVesselUseMeasurements() != null) { notChangedVesselUseMeasurements.addAll(vesselUseFeatures.getVesselUseMeasurements()); } @@ -1234,15 +1232,15 @@ public class FishingOperationPersistenceServiceImpl extends AbstractPersistenceS return DEFAULT_EMPTY_LATITUDE.equals(databaseValue) ? null : databaseValue; } - /** - * Test if the latitude is null, and return a default value if yes - * - * @param databaseValue the latitude used in UI (could be null) - * @return null the latitude to store in database (could not be null) - */ - protected Float convertUI2DatabaseMandatoryLongitude(Float databaseValue) { - return (databaseValue != null) ? databaseValue : DEFAULT_EMPTY_LONGITUDE; - } +// /** +// * Test if the latitude is null, and return a default value if yes +// * +// * @param databaseValue the latitude used in UI (could be null) +// * @return null the latitude to store in database (could not be null) +// */ +// protected Float convertUI2DatabaseMandatoryLongitude(Float databaseValue) { +// return (databaseValue != null) ? databaseValue : DEFAULT_EMPTY_LONGITUDE; +// } /** * Test if the longitude is a fake value. This yes, return null, then return the given value. diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceService.java index e3f4b92..4923b3b 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceService.java @@ -26,7 +26,6 @@ import fr.ifremer.tutti.persistence.TuttiPersistenceServiceImplementor; import fr.ifremer.tutti.persistence.entities.data.IndividualObservationBatch; import org.springframework.transaction.annotation.Transactional; -import java.util.Collection; import java.util.List; /** @@ -38,20 +37,21 @@ import java.util.List; @Transactional(readOnly = true) public interface IndividualObservationBatchPersistenceService extends TuttiPersistenceServiceImplementor { - List<IndividualObservationBatch> getAllIndividualObservationBatch(String fishingOperationId); + List<IndividualObservationBatch> getAllIndividualObservationBatchsForBatch(Integer batchId); - @Transactional(readOnly = false) - IndividualObservationBatch createIndividualObservationBatch(IndividualObservationBatch bean); + List<IndividualObservationBatch> getAllIndividualObservationBatchsForFishingOperation(Integer fishingOperationId); + + List<IndividualObservationBatch> getAllIndividualObservationBatchsForCruise(Integer cruiseId); @Transactional(readOnly = false) - Collection<IndividualObservationBatch> createIndividualObservationBatches(String fishingOperationId, Collection<IndividualObservationBatch> beans); + IndividualObservationBatch createIndividualObservationBatch(IndividualObservationBatch bean); @Transactional(readOnly = false) IndividualObservationBatch saveIndividualObservationBatch(IndividualObservationBatch bean); @Transactional(readOnly = false) - void deleteIndividualObservationBatch(String id); + void deleteIndividualObservationBatch(Integer id); @Transactional(readOnly = false) - void deleteIndividualObservationBatchForFishingOperation(String fishingOperationId); + void deleteIndividualObservationBatchForFishingOperation(Integer fishingOperationId); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java index 75dc3b3..d16fcaa 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceImpl.java @@ -30,7 +30,6 @@ import fr.ifremer.adagio.core.dao.administration.user.DepartmentImpl; import fr.ifremer.adagio.core.dao.administration.user.PersonId; import fr.ifremer.adagio.core.dao.administration.user.PersonImpl; import fr.ifremer.adagio.core.dao.data.batch.Batch; -import fr.ifremer.adagio.core.dao.data.batch.CatchBatch; import fr.ifremer.adagio.core.dao.data.operation.FishingOperationImpl; import fr.ifremer.adagio.core.dao.data.sample.Sample; import fr.ifremer.adagio.core.dao.referential.QualityFlagCode; @@ -60,7 +59,6 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.io.Serializable; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -94,19 +92,58 @@ public class IndividualObservationBatchPersistenceServiceImpl extends AbstractPe @Resource(name = "synchronizationStatusHelper") protected SynchronizationStatusHelper synchronizationStatusHelper; + @Resource(name = "fishingOperationPersistenceService") + protected FishingOperationPersistenceService fishingOperationPersistenceService; + @Override - public List<IndividualObservationBatch> getAllIndividualObservationBatch(String fishingOperationId) { - Preconditions.checkNotNull(fishingOperationId); + public List<IndividualObservationBatch> getAllIndividualObservationBatchsForCruise(Integer cruiseId) { + Preconditions.checkNotNull(cruiseId); - Integer operationId = Integer.valueOf(fishingOperationId); + List<IndividualObservationBatch> result = new ArrayList<>(); + List<Integer> allFishingOperationIds = fishingOperationPersistenceService.getAllFishingOperationIds(cruiseId); + allFishingOperationIds.forEach(fishingOperationId -> { - // Get catch Batch - Batch catchBatch = getBatch(fishingOperationId); + Iterator<Object[]> list = queryList( + "allFishingOperationSamplesWithBatch", + "fishingOperationId", IntegerType.INSTANCE, fishingOperationId + ); + + while (list.hasNext()) { + IndividualObservationBatch individualObservationBatch = toBean(list.next()); + result.add(individualObservationBatch); + } + + }); + return result; + } + + @Override + public List<IndividualObservationBatch> getAllIndividualObservationBatchsForFishingOperation(Integer fishingOperationId) { + Preconditions.checkNotNull(fishingOperationId); + List<IndividualObservationBatch> result = new ArrayList<>(); Iterator<Object[]> list = queryList( "allFishingOperationSamplesWithBatch", - "fishingOperationId", IntegerType.INSTANCE, operationId, - "batchId", IntegerType.INSTANCE, catchBatch.getId() + "fishingOperationId", IntegerType.INSTANCE, fishingOperationId + ); + + while (list.hasNext()) { + + IndividualObservationBatch individualObservationBatch = toBean(list.next()); + result.add(individualObservationBatch); + + } + return result; + + } + + @Override + public List<IndividualObservationBatch> getAllIndividualObservationBatchsForBatch(Integer batchId) { + Preconditions.checkNotNull(batchId); + + Iterator<Object[]> list = queryList( + "allFishingOperationSamplesForBatch", + "batchId", IntegerType.INSTANCE, batchId ); List<IndividualObservationBatch> result = Lists.newArrayList(); @@ -142,8 +179,40 @@ public class IndividualObservationBatchPersistenceServiceImpl extends AbstractPe result.add(batch); } return Collections.unmodifiableList(result); + } + protected IndividualObservationBatch toBean(Object[] source) { + + IndividualObservationBatch batch = IndividualObservationBatchs.newIndividualObservationBatch(); + + int colIndex = 0; + + // Id + batch.setId((Integer) source[colIndex++]); + + // TaxonId + Integer taxonId = (Integer) source[colIndex++]; + Species species = speciesService.getSpeciesByReferenceTaxonId(taxonId); + batch.setSpecies(species); + + // Comment + batch.setComment((String) source[colIndex]); + + // synchronizationStatus + batch.setSynchronizationStatus((String) source[colIndex]); + + // Sample Measurements + batch.setCaracteristics(new CaracteristicMap()); + + // fill all measurements + fillSampleMeasurements(batch); + + return batch; + + } + + @Override public IndividualObservationBatch createIndividualObservationBatch(IndividualObservationBatch bean) { Preconditions.checkNotNull(bean); @@ -155,31 +224,8 @@ public class IndividualObservationBatchPersistenceServiceImpl extends AbstractPe Preconditions.checkState(!TuttiEntities.isNew(fishingOperation)); // Get catch Batch - Batch catchBatch = getBatch(fishingOperation.getId()); - IndividualObservationBatch created = createIndividualObservationBatch(bean, catchBatch); - return created; -// Sample sample = Sample.Factory.newInstance(); -// beanToEntity(bean, sample, catchBatch); -// samplePersistenceHelper.create(sample); -// bean.setId(String.valueOf(sample.getId())); -// synchronizationStatusHelper.setDirty(bean); -// return bean; - } - - @Override - public Collection<IndividualObservationBatch> createIndividualObservationBatches(String fishingOperationId, Collection<IndividualObservationBatch> beans) { - - // Get catch Batch - Batch catchBatch = getBatch(fishingOperationId); - - Collection<IndividualObservationBatch> result = new ArrayList<>(); - for (IndividualObservationBatch bean : beans) { - - IndividualObservationBatch created = createIndividualObservationBatch(bean, catchBatch); - result.add(created); - - } - return result; + Batch catchBatch = getBatch(fishingOperation.getIdAsInt()); + return createIndividualObservationBatch(bean, catchBatch); } @Override @@ -193,7 +239,7 @@ public class IndividualObservationBatchPersistenceServiceImpl extends AbstractPe Preconditions.checkState(!TuttiEntities.isNew(fishingOperation)); // Get catch Batch - Batch catchBatch = getBatch(fishingOperation.getId()); + Batch catchBatch = getBatch(fishingOperation.getIdAsInt()); Sample sample = samplePersistenceHelper.load(bean.getIdAsInt()); @@ -204,28 +250,24 @@ public class IndividualObservationBatchPersistenceServiceImpl extends AbstractPe } @Override - public void deleteIndividualObservationBatch(String id) { - Preconditions.checkNotNull(id); - - Integer batchId = Integer.valueOf(id); + public void deleteIndividualObservationBatch(Integer batchId) { + Preconditions.checkNotNull(batchId); if (log.isDebugEnabled()) { - log.debug("Will delete individual observation batch: " + - batchId); + log.debug("Will delete individual observation batch: " + batchId); } samplePersistenceHelper.deleteSample(batchId); } @Override - public void deleteIndividualObservationBatchForFishingOperation(String fishingOperationId) { + public void deleteIndividualObservationBatchForFishingOperation(Integer fishingOperationId) { Preconditions.checkNotNull(fishingOperationId); - List<IndividualObservationBatch> batches = - getAllIndividualObservationBatch(fishingOperationId); + List<IndividualObservationBatch> batches = getAllIndividualObservationBatchsForFishingOperation(fishingOperationId); if (CollectionUtils.isNotEmpty(batches)) { for (IndividualObservationBatch batch : batches) { - deleteIndividualObservationBatch(batch.getId()); + deleteIndividualObservationBatch(batch.getIdAsInt()); } } } @@ -347,11 +389,10 @@ public class IndividualObservationBatchPersistenceServiceImpl extends AbstractPe caracteristics); } - protected Batch getBatch(String operationId) { + protected Batch getBatch(Integer operationId) { Preconditions.checkNotNull(operationId); - CatchBatch catchBatch = batchHelper.getRootCatchBatchByFishingOperationId(operationId, false); - return catchBatch; + return batchHelper.getRootCatchBatchByFishingOperationId(operationId, false); } protected void fillSampleMeasurements(IndividualObservationBatch batch) { diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceService.java index 362b409..9b1b32e 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceService.java @@ -48,17 +48,17 @@ public interface MarineLitterBatchPersistenceService extends TuttiPersistenceSer * @return the list of root {@link MarineLitterBatch} * @since 1.3 */ - BatchContainer<MarineLitterBatch> getRootMarineLitterBatch(String fishingOperationId); + BatchContainer<MarineLitterBatch> getRootMarineLitterBatch(Integer fishingOperationId); @Transactional(readOnly = false) MarineLitterBatch createMarineLitterBatch(MarineLitterBatch bean); @Transactional(readOnly = false) - Collection<MarineLitterBatch> createMarineLitterBatches(String fishingOperationId, Collection<MarineLitterBatch> beans); + Collection<MarineLitterBatch> createMarineLitterBatches(Integer fishingOperationId, Collection<MarineLitterBatch> beans); @Transactional(readOnly = false) MarineLitterBatch saveMarineLitterBatch(MarineLitterBatch bean); @Transactional(readOnly = false) - void deleteMarineLitterBatch(String id); + void deleteMarineLitterBatch(Integer id); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java index 55f60c5..df26d89 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java @@ -96,7 +96,7 @@ public class MarineLitterBatchPersistenceServiceImpl extends AbstractPersistence } @Override - public BatchContainer<MarineLitterBatch> getRootMarineLitterBatch(String fishingOperationId) { + public BatchContainer<MarineLitterBatch> getRootMarineLitterBatch(Integer fishingOperationId) { Preconditions.checkNotNull(fishingOperationId); CatchBatch catchBatch = batchHelper.getRootCatchBatchByFishingOperationId(fishingOperationId, false); @@ -134,15 +134,14 @@ public class MarineLitterBatchPersistenceServiceImpl extends AbstractPersistence Preconditions.checkNotNull(bean.getFishingOperation()); Preconditions.checkNotNull(bean.getFishingOperation().getId()); - CatchBatch catchBatch = batchHelper.getRootCatchBatchByFishingOperationId(bean.getFishingOperation().getId(), false); + CatchBatch catchBatch = batchHelper.getRootCatchBatchByFishingOperationId(bean.getFishingOperation().getIdAsInt(), false); - MarineLitterBatch created = createMarineLitterBatch(catchBatch, bean); - return created; + return createMarineLitterBatch(catchBatch, bean); } @Override - public Collection<MarineLitterBatch> createMarineLitterBatches(String fishingOperationId, Collection<MarineLitterBatch> beans) { + public Collection<MarineLitterBatch> createMarineLitterBatches(Integer fishingOperationId, Collection<MarineLitterBatch> beans) { Preconditions.checkNotNull(beans); @@ -169,8 +168,7 @@ public class MarineLitterBatchPersistenceServiceImpl extends AbstractPersistence SortingBatch batch = SortingBatch.Factory.newInstance(); beanToEntity(bean, batch, catchBatch); - MarineLitterBatch created = batchHelper.createSortingBatch(bean, catchBatch, batch); - return created; + return batchHelper.createSortingBatch(bean, catchBatch, batch); } @@ -188,7 +186,7 @@ public class MarineLitterBatchPersistenceServiceImpl extends AbstractPersistence } @Override - public void deleteMarineLitterBatch(String id) { + public void deleteMarineLitterBatch(Integer id) { Preconditions.checkNotNull(id); batchHelper.deleteBatch(id); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java index 36b7e0b..1ef5553 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java @@ -235,12 +235,12 @@ public class ProgramPersistenceServiceImpl extends AbstractPersistenceService im } } - public int getProgramNameMaxLength() { - int maxCodeLengthInDatabase = 40; - if (ProgramCode.SCIENTIFIC_CRUISE_PREFIX.getValue() == null - || ProgramCode.SCIENTIFIC_CRUISE_PREFIX.getValue().trim().isEmpty()) { - return maxCodeLengthInDatabase; - } - return (maxCodeLengthInDatabase - ProgramCode.SCIENTIFIC_CRUISE_PREFIX.getValue().length()); - } +// public int getProgramNameMaxLength() { +// int maxCodeLengthInDatabase = 40; +// if (ProgramCode.SCIENTIFIC_CRUISE_PREFIX.getValue() == null +// || ProgramCode.SCIENTIFIC_CRUISE_PREFIX.getValue().trim().isEmpty()) { +// return maxCodeLengthInDatabase; +// } +// return (maxCodeLengthInDatabase - ProgramCode.SCIENTIFIC_CRUISE_PREFIX.getValue().length()); +// } } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java index 78e48b4..6e74499 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java @@ -48,6 +48,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.UUID; +import java.util.stream.Collectors; import static org.nuiton.i18n.I18n.t; @@ -155,9 +156,7 @@ public class ProtocolPersistenceServiceImpl extends AbstractPersistenceService i public List<String> getAllProtocolNames() { List<String> result = Lists.newArrayList(); - for (TuttiProtocol protocol : getAllProtocol()) { - result.add(protocol.getName()); - } + result.addAll(getAllProtocol().stream().map(TuttiProtocol::getName).collect(Collectors.toList())); return Collections.unmodifiableList(result); } @@ -193,8 +192,7 @@ public class ProtocolPersistenceServiceImpl extends AbstractPersistenceService i @Override public TuttiProtocol getProtocol(String id) { File file = getProtocolFile(id); - TuttiProtocol result = TuttiProtocols.fromFile(file); - return result; + return TuttiProtocols.fromFile(file); } @Override @@ -305,7 +303,6 @@ public class ProtocolPersistenceServiceImpl extends AbstractPersistenceService i protected File getProtocolFile(String id) { File protocolDirectory = config.getProtocolDirectory(); - File result = new File(protocolDirectory, id + "." + TUTTI_PROTOCOL_EXTENSION); - return result; + return new File(protocolDirectory, id + "." + TUTTI_PROTOCOL_EXTENSION); } } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java index 066f9f2..f122907 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceService.java @@ -59,33 +59,32 @@ public interface SpeciesBatchPersistenceService extends TuttiPersistenceServiceI * @throws InvalidBatchModelException if batch does not respect the sample category model * @since 2.4 */ - BatchContainer<SpeciesBatch> getRootSpeciesBatch(String fishingOperationId, + BatchContainer<SpeciesBatch> getRootSpeciesBatch(Integer fishingOperationId, boolean validateTree) throws InvalidBatchModelException; @Transactional(readOnly = false) - SpeciesBatch createSpeciesBatch(SpeciesBatch bean, String parentBatchId, boolean computeRankOrder); + SpeciesBatch createSpeciesBatch(SpeciesBatch bean, Integer parentBatchId, boolean computeRankOrder); @Transactional(readOnly = false) - Collection<SpeciesBatch> createSpeciesBatches(String fishingOperationId, Collection<SpeciesBatch> beans); + Collection<SpeciesBatch> createSpeciesBatches(Integer fishingOperationId, Collection<SpeciesBatch> beans); @Transactional(readOnly = false) SpeciesBatch saveSpeciesBatch(SpeciesBatch bean); @Transactional(readOnly = false) - void deleteSpeciesBatch(String id); + void deleteSpeciesBatch(Integer id); @Transactional(readOnly = false) - void deleteSpeciesSubBatch(String id); + void deleteSpeciesSubBatch(Integer id); /** * Change the species in the given {@code batchId} and in all his * sub batches. - * - * @param batchId id of the root species batch to treat + * @param batchId id of the root species batch to treat * @param species species to affect to all batches */ @Transactional(readOnly = false) - void changeSpeciesBatchSpecies(String batchId, Species species); + void changeSpeciesBatchSpecies(Integer batchId, Species species); /** * Get all the batches to confirm @@ -95,7 +94,7 @@ public interface SpeciesBatchPersistenceService extends TuttiPersistenceServiceI * @throws InvalidBatchModelException if batch does not respect the sample category model * @since 3.13 */ - List<SpeciesBatch> getAllSpeciesBatchToConfirm(String fishingOperationId) throws InvalidBatchModelException; + List<SpeciesBatch> getAllSpeciesBatchToConfirm(Integer fishingOperationId) throws InvalidBatchModelException; //------------------------------------------------------------------------// //-- SpeciesBatchFrequency methods --// @@ -108,7 +107,7 @@ public interface SpeciesBatchPersistenceService extends TuttiPersistenceServiceI * @return the list of frequencies for the given specues batch id * @since 1.0 */ - List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency(String speciesBatchId); + List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency(Integer speciesBatchId); /** * Get all frequencies for the given root species batch container. @@ -131,7 +130,7 @@ public interface SpeciesBatchPersistenceService extends TuttiPersistenceServiceI * @since 1.0 */ @Transactional(readOnly = false) - List<SpeciesBatchFrequency> saveSpeciesBatchFrequency(String speciesBatchId, + List<SpeciesBatchFrequency> saveSpeciesBatchFrequency(Integer speciesBatchId, List<SpeciesBatchFrequency> frequencies); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java index dabd9da..b4d763e 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java @@ -58,6 +58,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; import static org.nuiton.i18n.I18n.t; @@ -98,7 +99,7 @@ public class SpeciesBatchPersistenceServiceImpl extends AbstractPersistenceServi //------------------------------------------------------------------------// @Override - public BatchContainer<SpeciesBatch> getRootSpeciesBatch(String fishingOperationId, + public BatchContainer<SpeciesBatch> getRootSpeciesBatch(Integer fishingOperationId, boolean validateTree) throws InvalidBatchModelException { Preconditions.checkNotNull(fishingOperationId); @@ -181,7 +182,7 @@ public class SpeciesBatchPersistenceServiceImpl extends AbstractPersistenceServi } @Override - public SpeciesBatch createSpeciesBatch(SpeciesBatch bean, String parentBatchId, boolean computeRankOrder) { + public SpeciesBatch createSpeciesBatch(SpeciesBatch bean, Integer parentBatchId, boolean computeRankOrder) { Preconditions.checkNotNull(bean); Preconditions.checkArgument(TuttiEntities.isNew(bean)); Preconditions.checkNotNull(bean.getSpecies()); @@ -189,15 +190,13 @@ public class SpeciesBatchPersistenceServiceImpl extends AbstractPersistenceServi Preconditions.checkNotNull(bean.getFishingOperation()); Preconditions.checkNotNull(bean.getFishingOperation().getId()); - CatchBatch catchBatch = batchHelper.getRootCatchBatchByFishingOperationId(bean.getFishingOperation().getId(), false); + CatchBatch catchBatch = batchHelper.getRootCatchBatchByFishingOperationId(bean.getFishingOperation().getIdAsInt(), false); - SpeciesBatch created = createSpeciesBatch(bean, parentBatchId, catchBatch, computeRankOrder); - - return created; + return createSpeciesBatch(bean, parentBatchId, catchBatch, computeRankOrder); } @Override - public Collection<SpeciesBatch> createSpeciesBatches(String fishingOperationId, Collection<SpeciesBatch> beans) { + public Collection<SpeciesBatch> createSpeciesBatches(Integer fishingOperationId, Collection<SpeciesBatch> beans) { Preconditions.checkNotNull(beans); Preconditions.checkNotNull(fishingOperationId); @@ -216,7 +215,7 @@ public class SpeciesBatchPersistenceServiceImpl extends AbstractPersistenceServi } - protected SpeciesBatch createSpeciesBatch(SpeciesBatch bean, String parentBatchId, CatchBatch catchBatch, boolean computeRankOrder) { + protected SpeciesBatch createSpeciesBatch(SpeciesBatch bean, Integer parentBatchId, CatchBatch catchBatch, boolean computeRankOrder) { Preconditions.checkNotNull(bean); Preconditions.checkArgument(TuttiEntities.isNew(bean)); @@ -241,9 +240,9 @@ public class SpeciesBatchPersistenceServiceImpl extends AbstractPersistenceServi CatchBatch catchBatch = batchHelper.getRootCatchBatchByBatchId(batchId); SortingBatch batch = batchHelper.getSortingBatchById(catchBatch, batchId); - String parentBatchId = null; + Integer parentBatchId = null; if (bean.getParentBatch() != null) { - parentBatchId = bean.getParentBatch().getId(); + parentBatchId = bean.getParentBatch().getIdAsInt(); } beanToEntity(bean, batch, parentBatchId, catchBatch, true); batchHelper.updateSortingBatch(batch, catchBatch); @@ -252,19 +251,19 @@ public class SpeciesBatchPersistenceServiceImpl extends AbstractPersistenceServi } @Override - public void deleteSpeciesBatch(String id) { + public void deleteSpeciesBatch(Integer id) { Preconditions.checkNotNull(id); batchHelper.deleteBatch(id); } @Override - public void deleteSpeciesSubBatch(String id) { + public void deleteSpeciesSubBatch(Integer id) { Preconditions.checkNotNull(id); batchHelper.deleteSpeciesSubBatch(id); } @Override - public void changeSpeciesBatchSpecies(String id, Species species) { + public void changeSpeciesBatchSpecies(Integer id, Species species) { Preconditions.checkNotNull(id); Preconditions.checkNotNull(species); Preconditions.checkNotNull(species.getReferenceTaxonId()); @@ -272,7 +271,7 @@ public class SpeciesBatchPersistenceServiceImpl extends AbstractPersistenceServi } @Override - public List<SpeciesBatch> getAllSpeciesBatchToConfirm(String fishingOperationId) throws InvalidBatchModelException { + public List<SpeciesBatch> getAllSpeciesBatchToConfirm(Integer fishingOperationId) throws InvalidBatchModelException { List<SpeciesBatch> batchesToConfirm = new ArrayList<>(); BatchContainer<SpeciesBatch> rootSpeciesBatch = getRootSpeciesBatch(fishingOperationId, false); @@ -300,7 +299,7 @@ public class SpeciesBatchPersistenceServiceImpl extends AbstractPersistenceServi @Override public List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency( - String speciesBatchId) { + Integer speciesBatchId) { Preconditions.checkNotNull(speciesBatchId); List<SortingBatch> frequencyChilds = @@ -328,7 +327,7 @@ public class SpeciesBatchPersistenceServiceImpl extends AbstractPersistenceServi protected void getAllSpeciesBatchFrequencyForBatch(SpeciesBatch batch, Multimap<Species, SpeciesBatchFrequency> result) { - List<SpeciesBatchFrequency> speciesBatchFrequency = getAllSpeciesBatchFrequency(batch.getId()); + List<SpeciesBatchFrequency> speciesBatchFrequency = getAllSpeciesBatchFrequency(batch.getIdAsInt()); result.putAll(batch.getSpecies(), speciesBatchFrequency); if (!batch.isChildBatchsEmpty()) { @@ -340,7 +339,7 @@ public class SpeciesBatchPersistenceServiceImpl extends AbstractPersistenceServi @Override public List<SpeciesBatchFrequency> saveSpeciesBatchFrequency( - String speciesBatchId, + Integer speciesBatchId, List<SpeciesBatchFrequency> frequencies) { Preconditions.checkNotNull(speciesBatchId); Preconditions.checkNotNull(frequencies); @@ -362,8 +361,7 @@ public class SpeciesBatchPersistenceServiceImpl extends AbstractPersistenceServi } } - Integer sortingBatchId = Integer.valueOf(speciesBatchId); - CatchBatch catchBatch = batchHelper.getRootCatchBatchByBatchId(sortingBatchId); + CatchBatch catchBatch = batchHelper.getRootCatchBatchByBatchId(speciesBatchId); if (catchBatch == null) { return notNullFrequencies; @@ -373,14 +371,12 @@ public class SpeciesBatchPersistenceServiceImpl extends AbstractPersistenceServi synchronizationStatusHelper.setDirty(catchBatch); // Retrieve parent - SortingBatch parentBatch = batchHelper.getSortingBatchById(catchBatch, sortingBatchId); + SortingBatch parentBatch = batchHelper.getSortingBatchById(catchBatch, speciesBatchId); // Remember child ids, to remove unchanged item (see at bottom in this method) List<Integer> notUpdatedChildIds = Lists.newArrayList(); List<SortingBatch> frequencyChilds = batchHelper.getFrequencyChilds(parentBatch); - for (SortingBatch child : frequencyChilds) { - notUpdatedChildIds.add(child.getId()); - } + notUpdatedChildIds.addAll(frequencyChilds.stream().map(SortingBatch::getId).collect(Collectors.toList())); short rankOrder = 0; List<SortingBatch> batchsToUpdate = Lists.newArrayList(); @@ -452,7 +448,7 @@ public class SpeciesBatchPersistenceServiceImpl extends AbstractPersistenceServi protected void beanToEntity(SpeciesBatch source, SortingBatch target, - String parentBatchId, + Integer parentBatchId, CatchBatch catchBatch, boolean computeRankOrder) { @@ -462,7 +458,7 @@ public class SpeciesBatchPersistenceServiceImpl extends AbstractPersistenceServi // If parent and root need to be set if (target.getId() == null || target.getRootBatch() == null - || (target.getParentBatch() != null && !target.getParentBatch().getId().toString().equals(parentBatchId))) { + || (target.getParentBatch() != null && !target.getParentBatch().getId().equals(parentBatchId))) { batchHelper.setSpeciesBatchParents( source.getSampleCategoryId(), diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TechnicalPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TechnicalPersistenceServiceImpl.java index ec2eabf..5d67fff 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TechnicalPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TechnicalPersistenceServiceImpl.java @@ -66,8 +66,7 @@ public class TechnicalPersistenceServiceImpl extends AbstractPersistenceService public <V> V invoke(Callable<V> call) { try { - V result = call.call(); - return result; + return call.call(); } catch (RuntimeException e) { throw e; } catch (Exception e) { diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiPersistenceServiceLocator.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiPersistenceServiceLocator.java index c52ab12..2b8e5e9 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiPersistenceServiceLocator.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiPersistenceServiceLocator.java @@ -118,16 +118,14 @@ public class TuttiPersistenceServiceLocator extends ServiceLocator { //TODO Move this to adagio public static ReferentialSynchroService getReferentialSynchroService() { - ReferentialSynchroService service = instance().getService( + return instance().getService( "referentialSynchroServiceTutti", ReferentialSynchroService.class); - return service; } //TODO Move this to adagio public static DatabaseSanityService getDatabaseSanityService() { - DatabaseSanityService service = instance().getService( + return instance().getService( "databaseSanityService", DatabaseSanityService.class); - return service; } public static AttachmentPersistenceService getAttachmentPersistenceService() { diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceImpl.java index d65bd78..207d275 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceImpl.java @@ -101,9 +101,8 @@ public class CaracteristicPersistenceServiceImpl extends ReferentialPersistenceS @Override public List<Caracteristic> getAllCaracteristicForSampleCategory() { List<Caracteristic> allCaracteristicWithProtected = thisService.getAllCaracteristicWithProtected(); - List<Caracteristic> result = Lists.newArrayList( + return Lists.newArrayList( Iterables.filter(allCaracteristicWithProtected, Caracteristics.newSampleCategoryModelPredicate())); - return result; } protected List<Caracteristic> getAllCaracteristics(boolean withProtected) { @@ -140,15 +139,13 @@ public class CaracteristicPersistenceServiceImpl extends ReferentialPersistenceS @Override public Caracteristic getSizeCategoryCaracteristic() { Integer pmfmId = PmfmId.SIZE_CATEGORY.getValue(); - Caracteristic result = getCaracteristic(pmfmId); - return result; + return getCaracteristic(pmfmId); } @Override public Caracteristic getSexCaracteristic() { Integer pmfmId = PmfmId.SEX.getValue(); - Caracteristic result = getCaracteristic(pmfmId); - return result; + return getCaracteristic(pmfmId); } @Override @@ -175,71 +172,61 @@ public class CaracteristicPersistenceServiceImpl extends ReferentialPersistenceS @Override public Caracteristic getMaturityCaracteristic() { Integer pmfmId = PmfmId.MATURITY.getValue(); - Caracteristic result = thisService.getCaracteristic(pmfmId); - return result; + return thisService.getCaracteristic(pmfmId); } @Override public Caracteristic getAgeCaracteristic() { Integer pmfmId = PmfmId.AGE.getValue(); - Caracteristic result = thisService.getCaracteristic(pmfmId); - return result; + return thisService.getCaracteristic(pmfmId); } @Override public Caracteristic getMarineLitterCategoryCaracteristic() { Integer pmfmId = PmfmId.MARINE_LITTER_TYPE.getValue(); - Caracteristic result = thisService.getCaracteristic(pmfmId); - return result; + return thisService.getCaracteristic(pmfmId); } @Override public Caracteristic getMarineLitterSizeCategoryCaracteristic() { Integer pmfmId = PmfmId.MARINE_LITTER_SIZE_CATEGORY.getValue(); - Caracteristic result = thisService.getCaracteristic(pmfmId); - return result; + return thisService.getCaracteristic(pmfmId); } @Override public Caracteristic getVerticalOpeningCaracteristic() { Integer pmfmId = PmfmId.VERTICAL_OPENING.getValue(); - Caracteristic result = thisService.getCaracteristic(pmfmId); - return result; + return thisService.getCaracteristic(pmfmId); } @Override public Caracteristic getHorizontalOpeningWingsCaracteristic() { Integer pmfmId = PmfmId.HORIZONTAL_OPENING_WINGS.getValue(); - Caracteristic result = thisService.getCaracteristic(pmfmId); - return result; + return thisService.getCaracteristic(pmfmId); } @Override public Caracteristic getHorizontalOpeningDoorCaracteristic() { Integer pmfmId = PmfmId.HORIZONTAL_OPENING_DOOR.getValue(); - Caracteristic result = thisService.getCaracteristic(pmfmId); - return result; + return thisService.getCaracteristic(pmfmId); } @Override public Caracteristic getDeadOrAliveCaracteristic() { Integer pmfmId = PmfmId.DEAD_OR_ALIVE.getValue(); - Caracteristic result = thisService.getCaracteristic(pmfmId); - return result; + return thisService.getCaracteristic(pmfmId); } @Override public Caracteristic getPmfmIdCaracteristic() { Integer pmfmId = PmfmId.ID_PMFM.getValue(); - Caracteristic result = thisService.getCaracteristic(pmfmId); - return result; + return thisService.getCaracteristic(pmfmId); } @Override public Caracteristic getWeightMeasuredCaracteristic() { Integer pmfmId = PmfmId.WEIGHT_MEASURED.getValue(); - Caracteristic result = thisService.getCaracteristic(pmfmId); - return result; + return thisService.getCaracteristic(pmfmId); } @Override @@ -247,8 +234,7 @@ public class CaracteristicPersistenceServiceImpl extends ReferentialPersistenceS Object[] source = queryUniqueWithStatus("pmfmById", "pmfmId", IntegerType.INSTANCE, pmfmId, "unitIdNone", IntegerType.INSTANCE, UnitId.NONE.getValue()); - Caracteristic target = loadCaracteristic(source); - return target; + return loadCaracteristic(source); } @Override diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java index 137cd42..70f3004 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java @@ -104,8 +104,7 @@ public class GearPersistenceServiceImpl extends ReferentialPersistenceServiceSup "gearById", "gearId", IntegerType.INSTANCE, gearId); - Gear result = source == null ? null : loadGear(source); - return result; + return source == null ? null : loadGear(source); } @@ -291,8 +290,7 @@ public class GearPersistenceServiceImpl extends ReferentialPersistenceServiceSup "gearByName", "gearName", StringType.INSTANCE, source.getName()); - Gear result = row == null ? null : loadGear(row); - return result; + return row == null ? null : loadGear(row); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ObjectTypePersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ObjectTypePersistenceServiceImpl.java index 91d264b..6d3c9b0 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ObjectTypePersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ObjectTypePersistenceServiceImpl.java @@ -63,8 +63,7 @@ public class ObjectTypePersistenceServiceImpl extends ReferentialPersistenceServ public ObjectType getObjectType(String objectTypeCode) { Object[] source = queryUnique("objectType", "objectTypeCode", StringType.INSTANCE, objectTypeCode); - ObjectType target = loadObjectType(source); - return target; + return loadObjectType(source); } protected ObjectType loadObjectType(Object[] source) { diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java index b4faad7..f4f9935 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java @@ -97,8 +97,7 @@ public class PersonPersistenceServiceImpl extends ReferentialPersistenceServiceS "personById", "personId", IntegerType.INSTANCE, personId); - Person result = source == null ? null : loadPerson(source); - return result; + return source == null ? null : loadPerson(source); } @@ -286,8 +285,7 @@ public class PersonPersistenceServiceImpl extends ReferentialPersistenceServiceS "personFirstName", StringType.INSTANCE, source.getFirstName(), "personLastName", StringType.INSTANCE, source.getLastName()); - Person result = row == null ? null : loadPerson(row); - return result; + return row == null ? null : loadPerson(row); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ReferentialPersistenceServiceSupport.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ReferentialPersistenceServiceSupport.java index 68dc077..7b57733 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ReferentialPersistenceServiceSupport.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ReferentialPersistenceServiceSupport.java @@ -55,8 +55,7 @@ public abstract class ReferentialPersistenceServiceSupport extends AbstractPersi query.setString("statusValidCode", StatusCode.ENABLE.getValue()); query.setString("statusTemporaryCode", StatusCode.TEMPORARY.getValue()); - Iterator<Object[]> result = query.iterate(); - return result; + return query.iterate(); } protected Iterator<Object[]> queryListWithStatus2(String queryName, Object... params) { @@ -65,8 +64,7 @@ public abstract class ReferentialPersistenceServiceSupport extends AbstractPersi query.setString("statusTemporaryCode", StatusCode.TEMPORARY.getValue()); query.setString("statusDisableCode", StatusCode.DISABLE.getValue()); - Iterator<Object[]> result = query.iterate(); - return result; + return query.iterate(); } protected Object[] queryUniqueWithStatus(String queryName, Object... params) { diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceImpl.java index 51cc9fa..3b18643 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceImpl.java @@ -409,8 +409,7 @@ public class SpeciesPersistenceServiceImpl extends ReferentialPersistenceService "taxonNameReferenceTaxonIdByName", "taxonName", StringType.INSTANCE, taxonName); - Species result = getSpeciesByReferenceTaxonId(referenceTaxonId); - return result; + return getSpeciesByReferenceTaxonId(referenceTaxonId); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java index 1a486ac..eb6e755 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java @@ -78,6 +78,7 @@ import java.text.MessageFormat; import java.util.Collection; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; import static org.nuiton.i18n.I18n.t; @@ -149,11 +150,10 @@ public class BatchPersistenceHelper extends AbstractPersistenceService { BatchContainer<SpeciesBatch> species) throws InvalidBatchModelException { List<CatchBatchValidationError> errors = catchBatchValidator.validateSpecies(sampleCategoryModel, species); List<String> errorsStr = Lists.newArrayList(); - for (CatchBatchValidationError error : errors) { - if (error.getGravity() == CatchBatchValidationError.GRAVITY_ERROR) { - errorsStr.add(error.getMessage()); - } - } + errorsStr.addAll(errors.stream() + .filter(error -> error.getGravity() == CatchBatchValidationError.GRAVITY_ERROR) + .map(CatchBatchValidationError::getMessage) + .collect(Collectors.toList())); if (!errorsStr.isEmpty()) { String join = Joiner.on("<br/>").join(errorsStr); throw new InvalidBatchModelException(t("tutti.persistence.batch.validation.bad.sample.categories", join)); @@ -166,11 +166,10 @@ public class BatchPersistenceHelper extends AbstractPersistenceService { if (CollectionUtils.isNotEmpty(errors)) { List<String> errorsStr = Lists.newArrayList(); - for (CatchBatchValidationError error : errors) { - if (error.getGravity() == CatchBatchValidationError.GRAVITY_ERROR) { - errorsStr.add(error.getMessage()); - } - } + errorsStr.addAll(errors.stream() + .filter(error -> error.getGravity() == CatchBatchValidationError.GRAVITY_ERROR) + .map(CatchBatchValidationError::getMessage) + .collect(Collectors.toList())); if (!errorsStr.isEmpty()) { String join = Joiner.on("<br/>").join(errorsStr); throw new InvalidBatchModelException(t("tutti.persistence.batch.validation.bad.sample.categories", join)); @@ -178,7 +177,7 @@ public class BatchPersistenceHelper extends AbstractPersistenceService { } } - public void deleteCatchBatch(String fishingOperationId, Integer catchBatchId) { + public void deleteCatchBatch(Integer fishingOperationId, Integer catchBatchId) { // delete accidental batchs accidentalBatchService.deleteAccidentalBatchForFishingOperation(fishingOperationId); @@ -190,7 +189,7 @@ public class BatchPersistenceHelper extends AbstractPersistenceService { getCurrentSession().flush(); // SynchronizationStatus on fishingTrip - FishingOperation fishingOperation = fishingOperationDao.load(Integer.valueOf(fishingOperationId)); + FishingOperation fishingOperation = fishingOperationDao.load(fishingOperationId); synchronizationStatusHelper.setDirty(fishingOperation.getFishingTrip()); // get all catch batch children ids (to delete attachments) @@ -270,22 +269,19 @@ public class BatchPersistenceHelper extends AbstractPersistenceService { return result; } - public List<SortingBatch> getFrequencies(String batchId) { + public List<SortingBatch> getFrequencies(Integer batchId) { Preconditions.checkNotNull(batchId); - Integer sortingBatchId = Integer.valueOf(batchId); - CatchBatch catchBatch = getRootCatchBatchByBatchId(sortingBatchId); + CatchBatch catchBatch = getRootCatchBatchByBatchId(batchId); SortingBatch sortingBatch = catchBatchDao.getSortingBatchById( - catchBatch, sortingBatchId); + catchBatch, batchId); - List<SortingBatch> frequencyChilds = getFrequencyChilds( - sortingBatch); - return frequencyChilds; + return getFrequencyChilds(sortingBatch); } - public fr.ifremer.adagio.core.dao.data.batch.CatchBatch getRootCatchBatchByFishingOperationId(String fishingOperationId, boolean validate) { + public fr.ifremer.adagio.core.dao.data.batch.CatchBatch getRootCatchBatchByFishingOperationId(Integer fishingOperationId, boolean validate) { Preconditions.checkNotNull(fishingOperationId); - Integer catchBatchId = catchBatchDao.getIdByFishingOperationId(Integer.valueOf(fishingOperationId)); + Integer catchBatchId = catchBatchDao.getIdByFishingOperationId(fishingOperationId); Preconditions.checkNotNull(catchBatchId); // whenever want to repair anything from Tutti @@ -332,7 +328,7 @@ public class BatchPersistenceHelper extends AbstractPersistenceService { public void setSpeciesBatchParents(Integer sampleCategoryId, Serializable sampleCategoryValue, SortingBatch target, - String parentBatchIdStr, + Integer parentBatchId, CatchBatch catchBatch) { Preconditions.checkNotNull(target); @@ -341,10 +337,10 @@ public class BatchPersistenceHelper extends AbstractPersistenceService { target.setRootBatch(catchBatch); SortingBatch parentBatch; - if (parentBatchIdStr != null) { + if (parentBatchId != null) { // Load existing parent and root - parentBatch = catchBatchDao.getSortingBatchById(catchBatch, Integer.valueOf(parentBatchIdStr)); + parentBatch = catchBatchDao.getSortingBatchById(catchBatch, parentBatchId); } else { // Or retrieve parent batch, from pmfm id @@ -411,7 +407,7 @@ public class BatchPersistenceHelper extends AbstractPersistenceService { public void setBenthosBatchParents(Integer sampleCategoryType, Serializable sampleCategoryValue, SortingBatch target, - String parentBatchIdStr, + Integer parentBatchId, CatchBatch catchBatch) { Preconditions.checkNotNull(target); @@ -420,10 +416,10 @@ public class BatchPersistenceHelper extends AbstractPersistenceService { target.setRootBatch(catchBatch); SortingBatch parentBatch; - if (parentBatchIdStr != null) { + if (parentBatchId != null) { // Load existing parent and root - parentBatch = catchBatchDao.getSortingBatchById(catchBatch, Integer.valueOf(parentBatchIdStr)); + parentBatch = catchBatchDao.getSortingBatchById(catchBatch, parentBatchId); } else { // Or retrieve parent batch, from pmfm id @@ -506,7 +502,7 @@ public class BatchPersistenceHelper extends AbstractPersistenceService { target.setRootBatch(catchBatch); } - public void beanToEntity(String parentBatchId, + public void beanToEntity(Integer parentBatchId, SpeciesAbleBatch source, SortingBatch target, boolean computeRankOrder) { @@ -820,10 +816,8 @@ public class BatchPersistenceHelper extends AbstractPersistenceService { return qualitativeValueId; } - public void deleteBatch(String id) { - Preconditions.checkNotNull(id); - - Integer batchId = Integer.valueOf(id); + public void deleteBatch(Integer batchId) { + Preconditions.checkNotNull(batchId); CatchBatch catchBatch = getRootCatchBatchByBatchId(batchId); synchronizationStatusHelper.setDirty(catchBatch); @@ -831,10 +825,8 @@ public class BatchPersistenceHelper extends AbstractPersistenceService { removeWithChildren(batchId); } - public void deleteSpeciesSubBatch(String id) { - Preconditions.checkNotNull(id); - - Integer speciesBatchId = Integer.valueOf(id); + public void deleteSpeciesSubBatch(Integer speciesBatchId) { + Preconditions.checkNotNull(speciesBatchId); CatchBatch catchBatch = getRootCatchBatchByBatchId(speciesBatchId); synchronizationStatusHelper.setDirty(catchBatch); @@ -852,24 +844,23 @@ public class BatchPersistenceHelper extends AbstractPersistenceService { Integer childBatchId = childBatch.getId(); if (log.isDebugEnabled()) { - log.debug("Delete child [" + childBatchId + "] of species batch: " + id); + log.debug("Delete child [" + childBatchId + "] of species batch: " + speciesBatchId); } removeWithChildren(childBatchId); } } } - public void changeBatchSpecies(String id, Species species) { + public void changeBatchSpecies(Integer batchId, Species species) { - Preconditions.checkNotNull(id); + Preconditions.checkNotNull(batchId); Preconditions.checkNotNull(species); Preconditions.checkNotNull(species.getReferenceTaxonId()); - Integer batchId = Integer.valueOf(id); CatchBatch catchBatch = getRootCatchBatchByBatchId(batchId); synchronizationStatusHelper.setDirty(catchBatch); - catchBatchDao.setSortingBatchReferenceTaxon(id, species.getReferenceTaxonId()); + catchBatchDao.setSortingBatchReferenceTaxon(String.valueOf(batchId), species.getReferenceTaxonId()); } public <S extends SpeciesAbleBatch> void setSampleCategoryQualitative(S target, diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchTreeHelper.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchTreeHelper.java index 5127478..c441b01 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchTreeHelper.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchTreeHelper.java @@ -478,12 +478,11 @@ public class BatchTreeHelper extends AbstractPersistenceService { protected SortingBatch get(Batch parentBatch, Integer sortingPmfmId, Integer sortingQualitativeValueId) { - SortingBatch result = getSortingBatch( + return getSortingBatch( parentBatch, null, sortingPmfmId, sortingQualitativeValueId); - return result; } protected SortingBatch getSortingBatch(Batch source, diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/MeasurementPersistenceHelper.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/MeasurementPersistenceHelper.java index 3b058a8..b294e3e 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/MeasurementPersistenceHelper.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/MeasurementPersistenceHelper.java @@ -141,8 +141,7 @@ public class MeasurementPersistenceHelper extends AbstractPersistenceService { } public QuantificationMeasurement getWeightMeasurementQuantificationMeasurement(Batch batch) { - QuantificationMeasurement quantificationMeasurement = catchBatchDao.getQuantificationMeasurement(batch, PmfmId.WEIGHT_MEASURED.getValue()); - return quantificationMeasurement; + return catchBatchDao.getQuantificationMeasurement(batch, PmfmId.WEIGHT_MEASURED.getValue()); } public void removeWeightMeasurementQuantificationMeasurement(Batch batch, QuantificationMeasurement quantificationMeasurement) { diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java index 9b8cf5e..27314c9 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseFixtures.java @@ -77,9 +77,9 @@ public class DatabaseFixtures { return "CAM-CGFS"; } - public String cruiseId() { + public Integer cruiseId() { // cruise CGFS2010 - return "100000"; + return 100000; } public String fishingVesselCode() { @@ -297,8 +297,7 @@ public class DatabaseFixtures { cruise.setMultirigNumber(2); - Cruise result = cruiseService.createCruise(cruise); - return result; + return cruiseService.createCruise(cruise); } public FishingOperation createFishingOperation(Cruise cruise) { @@ -406,8 +405,7 @@ public class DatabaseFixtures { localite.setId(localite()); fishingOperation.setLocation(localite); - FishingOperation result = fishingOperationService.createFishingOperation(fishingOperation); - return result; + return fishingOperationService.createFishingOperation(fishingOperation); } public CatchBatch createMinimalCatchBatch(FishingOperation fishingOperation) { @@ -416,8 +414,7 @@ public class DatabaseFixtures { CatchBatch catchBatch = CatchBatchs.newCatchBatch(); catchBatch.setFishingOperation(fishingOperation); - CatchBatch result = catchBatchService.createCatchBatch(catchBatch); - return result; + return catchBatchService.createCatchBatch(catchBatch); } public AccidentalBatch createMinimalAccidentalBatch(FishingOperation fishingOperation) { @@ -428,9 +425,7 @@ public class DatabaseFixtures { minimalAccidentalBatch.setFishingOperation(fishingOperation); minimalAccidentalBatch.setSpecies(speciesService.getSpeciesByReferenceTaxonId(refSpeciesTaxonId())); minimalAccidentalBatch.setCaracteristics(new CaracteristicMap()); - AccidentalBatch result = - accidentalBatchService.createAccidentalBatch(minimalAccidentalBatch); - return result; + return accidentalBatchService.createAccidentalBatch(minimalAccidentalBatch); } public IndividualObservationBatch createMinimalIndividualObservationBatch(FishingOperation fishingOperation) { @@ -445,8 +440,6 @@ public class DatabaseFixtures { minimalAccidentalBatch.setSize(10.0f); minimalAccidentalBatch.setWeight(5.f); - IndividualObservationBatch result = - individualObservationBatchService.createIndividualObservationBatch(minimalAccidentalBatch); - return result; + return individualObservationBatchService.createIndividualObservationBatch(minimalAccidentalBatch); } } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Numbers.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Numbers.java index 629b9d5..1e2b081 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Numbers.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Numbers.java @@ -36,8 +36,7 @@ public class Numbers { public static float getRoundedLengthStep(float lengthStep, boolean aroundUp) { int intValue = (int) ((lengthStep + (aroundUp ? 0.001f : 0f)) * 10); - float result = intValue / 10f; - return result; + return intValue / 10f; } public static <N extends Number> N getValueOrComputedValue(N value, N computedValue) { diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Weights.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Weights.java index 3e882b6..4be5791 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Weights.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/util/Weights.java @@ -83,8 +83,7 @@ public class Weights { BigDecimal sumB = new BigDecimal(String.valueOf(value)) .setScale(3, BigDecimal.ROUND_HALF_UP) .abs(); - float result = sumB.floatValue(); - return result; + return sumB.floatValue(); } /** diff --git a/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml b/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml index c9ba0e0..0654c36 100644 --- a/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml +++ b/tutti-persistence/src/main/resources/queries-failsafe.hbm.xml @@ -491,7 +491,7 @@ <query-param name="fishingOperationId" type="java.lang.Integer"/> </query> - <!-- [DAT-23] Get all fishing operations samples with a giben batch --> + <!-- [DAT-23] Get all fishing operations samples with a batch (they are all individual observations in Tutti) --> <query cacheable="true" name="allFishingOperationSamplesWithBatch"> <![CDATA[ SELECT @@ -503,11 +503,28 @@ SampleImpl s WHERE s.fishingOperation.id= :fishingOperationId - AND s.batch.id = :batchId + AND s.batch IS NOT NULL ORDER BY s.id ]]> <query-param name="fishingOperationId" type="java.lang.Integer"/> + </query> + + <!-- [DAT-23] Get all fishing operations samples for a given batch --> + <query cacheable="true" name="allFishingOperationSamplesForBatch"> + <![CDATA[ + SELECT + s.id AS id, + s.referenceTaxon.id AS referenceTaxon, + s.comments AS comment, + s.synchronizationStatus AS synchronizationStatus + FROM + SampleImpl s + WHERE + s.batch.id = :batchId + ORDER BY + s.id + ]]> <query-param name="batchId" type="java.lang.Integer"/> </query> diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigTest.java index b09b396..1b6bf32 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigTest.java @@ -190,7 +190,6 @@ public class TuttiPersistenceConfigTest { applicationConfig.parse(); - TuttiConfiguration config = new TuttiConfiguration(applicationConfig); - return config; + return new TuttiConfiguration(applicationConfig); } } diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceWriteTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceWriteTest.java index 9c5fd7b..8c2c3ef 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceWriteTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/AccidentalBatchPersistenceServiceWriteTest.java @@ -76,7 +76,7 @@ public class AccidentalBatchPersistenceServiceWriteTest { Assert.assertNotNull(createdAccidentalBatch.getId()); // reload it - List<AccidentalBatch> allAccidentalBatch = service.getAllAccidentalBatch(fishingOperation.getId()); + List<AccidentalBatch> allAccidentalBatch = service.getAllAccidentalBatch(fishingOperation.getIdAsInt()); Assert.assertTrue(CollectionUtils.isNotEmpty(allAccidentalBatch)); AccidentalBatch reloadedAccidentalBatch = allAccidentalBatch.get(0); reloadedAccidentalBatch.setFishingOperation(fishingOperation); @@ -86,11 +86,10 @@ public class AccidentalBatchPersistenceServiceWriteTest { // 2. Create a full with all properties // ----------------------------------------------------------------------------- - AccidentalBatch fullAccidentalBatch = createdAccidentalBatch; - fullAccidentalBatch.setId((String) null); + createdAccidentalBatch.setId((String) null); CaracteristicMap caracteristicMap = new CaracteristicMap(); - fullAccidentalBatch.setCaracteristics(caracteristicMap); + createdAccidentalBatch.setCaracteristics(caracteristicMap); // add a qualitative caracteristic Caracteristic maturityCaracteristic = caracteristicService.getMaturityCaracteristic(); @@ -104,26 +103,26 @@ public class AccidentalBatchPersistenceServiceWriteTest { Caracteristic stringCaracteristic = caracteristicService.getCaracteristic(dbResource.getFixtures().refAlphanumericPmfmId()); caracteristicMap.put(stringCaracteristic, "Un texte!"); - fullAccidentalBatch.setComment("AccidentalBatch-full"); - fullAccidentalBatch.setDeadOrAlive(caracteristicService.getDeadOrAliveCaracteristic().getQualitativeValue(0)); - fullAccidentalBatch.setGender(caracteristicService.getSexCaracteristic().getQualitativeValue(0)); + createdAccidentalBatch.setComment("AccidentalBatch-full"); + createdAccidentalBatch.setDeadOrAlive(caracteristicService.getDeadOrAliveCaracteristic().getQualitativeValue(0)); + createdAccidentalBatch.setGender(caracteristicService.getSexCaracteristic().getQualitativeValue(0)); - fullAccidentalBatch.setLengthStepCaracteristic(caracteristicService.getCaracteristic(dbResource.getFixtures().refNumericalPmfmId())); - fullAccidentalBatch.setSize(10.0f); + createdAccidentalBatch.setLengthStepCaracteristic(caracteristicService.getCaracteristic(dbResource.getFixtures().refNumericalPmfmId())); + createdAccidentalBatch.setSize(10.0f); - fullAccidentalBatch.setWeight(5.f); + createdAccidentalBatch.setWeight(5.f); AccidentalBatch createdAccidentalBatch2 = - service.createAccidentalBatch(fullAccidentalBatch); + service.createAccidentalBatch(createdAccidentalBatch); - assertEqualsAccidentalBatch(fullAccidentalBatch, createdAccidentalBatch2); + assertEqualsAccidentalBatch(createdAccidentalBatch, createdAccidentalBatch2); Assert.assertNotNull(createdAccidentalBatch2); Assert.assertNotNull(createdAccidentalBatch2.getId()); - assertEqualsAccidentalBatch(fullAccidentalBatch, createdAccidentalBatch2); + assertEqualsAccidentalBatch(createdAccidentalBatch, createdAccidentalBatch2); // reload it - allAccidentalBatch = service.getAllAccidentalBatch(fishingOperation.getId()); + allAccidentalBatch = service.getAllAccidentalBatch(fishingOperation.getIdAsInt()); Assert.assertTrue(CollectionUtils.isNotEmpty(allAccidentalBatch)); Assert.assertEquals(2, allAccidentalBatch.size()); AccidentalBatch reloadedAccidentalBatch2 = TuttiEntities.splitById(allAccidentalBatch).get(createdAccidentalBatch2.getId()); @@ -133,18 +132,17 @@ public class AccidentalBatchPersistenceServiceWriteTest { // ----------------------------------------------------------------------------- // 2. Modify some properties and save // ----------------------------------------------------------------------------- - AccidentalBatch modifiedAccidentalBatch = reloadedAccidentalBatch2; - modifiedAccidentalBatch.setComment("Comment2"); - modifiedAccidentalBatch.setSize(15f); - modifiedAccidentalBatch.setWeight(35f); - modifiedAccidentalBatch.setDeadOrAlive(caracteristicService.getDeadOrAliveCaracteristic().getQualitativeValue(1)); - modifiedAccidentalBatch.setGender(caracteristicService.getSexCaracteristic().getQualitativeValue(1)); - modifiedAccidentalBatch.getCaracteristics().clear(); - - AccidentalBatch savedAccidentalBatch = service.saveAccidentalBatch(modifiedAccidentalBatch); - assertEqualsAccidentalBatch(modifiedAccidentalBatch, savedAccidentalBatch); - - allAccidentalBatch = service.getAllAccidentalBatch(fishingOperation.getId()); + reloadedAccidentalBatch2.setComment("Comment2"); + reloadedAccidentalBatch2.setSize(15f); + reloadedAccidentalBatch2.setWeight(35f); + reloadedAccidentalBatch2.setDeadOrAlive(caracteristicService.getDeadOrAliveCaracteristic().getQualitativeValue(1)); + reloadedAccidentalBatch2.setGender(caracteristicService.getSexCaracteristic().getQualitativeValue(1)); + reloadedAccidentalBatch2.getCaracteristics().clear(); + + AccidentalBatch savedAccidentalBatch = service.saveAccidentalBatch(reloadedAccidentalBatch2); + assertEqualsAccidentalBatch(reloadedAccidentalBatch2, savedAccidentalBatch); + + allAccidentalBatch = service.getAllAccidentalBatch(fishingOperation.getIdAsInt()); Assert.assertTrue(CollectionUtils.isNotEmpty(allAccidentalBatch)); AccidentalBatch reloadedAccidentalBatch3 = TuttiEntities.splitById(allAccidentalBatch).get(createdAccidentalBatch2.getId()); reloadedAccidentalBatch3.setFishingOperation(fishingOperation); @@ -158,12 +156,12 @@ public class AccidentalBatchPersistenceServiceWriteTest { dbResource.getFixtures().createMinimalAccidentalBatch( fishingOperation); - List<AccidentalBatch> allAccidentalBatch = service.getAllAccidentalBatch(fishingOperation.getId()); + List<AccidentalBatch> allAccidentalBatch = service.getAllAccidentalBatch(fishingOperation.getIdAsInt()); Assert.assertFalse(CollectionUtils.isEmpty(allAccidentalBatch)); service.deleteAccidentalBatch(createdAccidentalBatch.getId()); - List<AccidentalBatch> allAccidentalBatch2 = service.getAllAccidentalBatch(fishingOperation.getId()); + List<AccidentalBatch> allAccidentalBatch2 = service.getAllAccidentalBatch(fishingOperation.getIdAsInt()); Assert.assertTrue(CollectionUtils.isEmpty(allAccidentalBatch2)); } @@ -176,12 +174,12 @@ public class AccidentalBatchPersistenceServiceWriteTest { dbResource.getFixtures().createMinimalAccidentalBatch( fishingOperation); - List<AccidentalBatch> allAccidentalBatch = service.getAllAccidentalBatch(fishingOperation.getId()); + List<AccidentalBatch> allAccidentalBatch = service.getAllAccidentalBatch(fishingOperation.getIdAsInt()); Assert.assertFalse(CollectionUtils.isEmpty(allAccidentalBatch)); - service.deleteAccidentalBatchForFishingOperation(fishingOperation.getId()); + service.deleteAccidentalBatchForFishingOperation(fishingOperation.getIdAsInt()); - List<AccidentalBatch> allAccidentalBatch2 = service.getAllAccidentalBatch(fishingOperation.getId()); + List<AccidentalBatch> allAccidentalBatch2 = service.getAllAccidentalBatch(fishingOperation.getIdAsInt()); Assert.assertTrue(CollectionUtils.isEmpty(allAccidentalBatch2)); } diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceReadTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceReadTest.java index 65d8cfc..ca8210d 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceReadTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceReadTest.java @@ -79,14 +79,14 @@ public class BenthosBatchPersistenceServiceReadTest { @Test public void getRootBenthosBatch(/*String fishingOperationId*/) { //TODO Do me! - service.getRootBenthosBatch(fishingOperation.getId(), false); + service.getRootBenthosBatch(fishingOperation.getIdAsInt(), false); } @Ignore @Test public void getAllBenthosBatchFrequency(/*String benthosBatchId*/) { //TODO Do me! - service.getAllBenthosBatchFrequency(fishingOperation.getId()); + service.getAllBenthosBatchFrequency(fishingOperation.getIdAsInt()); } @@ -158,13 +158,13 @@ public class BenthosBatchPersistenceServiceReadTest { } } - public BenthosBatch getBenthosBatch(String fishingOperationId, - String speciesBatchId) { + public BenthosBatch getBenthosBatch(Integer fishingOperationId, + Integer speciesBatchId) { BatchContainer<BenthosBatch> rootSpeciesBatch = service.getRootBenthosBatch(fishingOperationId, false); return getBenthosBatch(speciesBatchId, rootSpeciesBatch.getChildren()); } - public static BenthosBatch getBenthosBatch(String speciesBatchId, + public static BenthosBatch getBenthosBatch(Integer speciesBatchId, List<BenthosBatch> speciesBatchs) { if (speciesBatchs == null) { return null; diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceWriteTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceWriteTest.java index fa14ec3..3fd2ddd 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceWriteTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceWriteTest.java @@ -83,9 +83,9 @@ public class BenthosBatchPersistenceServiceWriteTest { protected CaracteristicPersistenceService caracteristicService; - private LocationPersistenceService locationService; + protected LocationPersistenceService locationService; - private SpeciesPersistenceService speciesService; + protected SpeciesPersistenceService speciesService; /* * Entities prepared in setUp() : @@ -154,7 +154,7 @@ public class BenthosBatchPersistenceServiceWriteTest { assertNotNull(fishingOperations); assertTrue(fishingOperations.size() > 0); fishingOperationNoCatchBatch = fishingOperations.get(0); - fishingOperationNoCatchBatch = fishingOperationService.getFishingOperation(fishingOperationNoCatchBatch.getId()); + fishingOperationNoCatchBatch = fishingOperationService.getFishingOperation(fishingOperationNoCatchBatch.getIdAsInt()); fishingOperationNoCatchBatch.setId((String) null); fishingOperationNoCatchBatch.setCruise(cruise); calendar.setTime(new Date()); @@ -169,7 +169,7 @@ public class BenthosBatchPersistenceServiceWriteTest { // Create a second operation, with no cacth batch : to test CatchBatch insert/update : fishingOperationWithEmptyBatch = fishingOperations.get(1); - fishingOperationWithEmptyBatch = fishingOperationService.getFishingOperation(fishingOperationWithEmptyBatch.getId()); + fishingOperationWithEmptyBatch = fishingOperationService.getFishingOperation(fishingOperationWithEmptyBatch.getIdAsInt()); fishingOperationWithEmptyBatch.setId((String) null); fishingOperationWithEmptyBatch.setCruise(cruise); calendar.setTime(new Date()); @@ -250,7 +250,7 @@ public class BenthosBatchPersistenceServiceWriteTest { batch.setWeight(1f); batch.setNumber(7); - assertCreateAndReloadBenthosBatch(batch, batch.getParentBatch().getId()); + assertCreateAndReloadBenthosBatch(batch, batch.getParentBatch().getIdAsInt()); // ----------------------------------------------------------------------------- // 3. Test child "Female/2" @@ -267,7 +267,7 @@ public class BenthosBatchPersistenceServiceWriteTest { batch.setWeight(null); batch.setNumber(14); - assertCreateAndReloadBenthosBatch(batch, batch.getParentBatch().getId()); + assertCreateAndReloadBenthosBatch(batch, batch.getParentBatch().getIdAsInt()); // ----------------------------------------------------------------------------- // 4. Test : ESP2 - Vrac/7 @@ -296,7 +296,7 @@ public class BenthosBatchPersistenceServiceWriteTest { batch.setWeight(1f); batch.setNumber(11); - assertCreateAndReloadBenthosBatch(batch, batch.getParentBatch().getId()); + assertCreateAndReloadBenthosBatch(batch, batch.getParentBatch().getIdAsInt()); // ----------------------------------------------------------------------------- // 5. Test save after modifications @@ -313,7 +313,7 @@ public class BenthosBatchPersistenceServiceWriteTest { // Save and reload, then check BenthosBatch savedBatch = service.saveBenthosBatch(batch); assertBenthosBatch(savedBatch, batch, false); - BenthosBatch reloadedBatch = getBenthosBatch(fishingOperationWithEmptyBatch.getId(), savedBatch.getId()); + BenthosBatch reloadedBatch = getBenthosBatch(fishingOperationWithEmptyBatch.getIdAsInt(), savedBatch.getIdAsInt()); assertBenthosBatch(savedBatch, reloadedBatch, true); // Save batch for later @@ -323,15 +323,15 @@ public class BenthosBatchPersistenceServiceWriteTest { // 6. Test change species // ----------------------------------------------------------------------------- esp2Batch.setSpecies(taxon1); - service.changeBenthosBatchSpecies(esp2Batch.getId(), taxon1); + service.changeBenthosBatchSpecies(esp2Batch.getIdAsInt(), taxon1); assertBenthosBatch(savedBatch, batch, false); - reloadedBatch = getBenthosBatch(fishingOperationWithEmptyBatch.getId(), esp2Batch.getId()); + reloadedBatch = getBenthosBatch(fishingOperationWithEmptyBatch.getIdAsInt(), esp2Batch.getIdAsInt()); assertBenthosBatch(esp2Batch, reloadedBatch, true); // ----------------------------------------------------------------------------- // 7. Test get all root species // ----------------------------------------------------------------------------- - List<BenthosBatch> rootBenthosBatch = service.getRootBenthosBatch(fishingOperationWithEmptyBatch.getId(), false).getChildren(); + List<BenthosBatch> rootBenthosBatch = service.getRootBenthosBatch(fishingOperationWithEmptyBatch.getIdAsInt(), false).getChildren(); assertNotNull(rootBenthosBatch); assertEquals(2, rootBenthosBatch.size()); assertNotNull(rootBenthosBatch.get(0).getChildBatchs()); @@ -354,7 +354,7 @@ public class BenthosBatchPersistenceServiceWriteTest { frequency.setBatch(frequenciesParentBatch); frequencies.add(frequency); } - List<BenthosBatchFrequency> createdFrequencies = assertCreateAndReloadBenthosBatchFrequency(frequencies, frequenciesParentBatch.getId()); + List<BenthosBatchFrequency> createdFrequencies = assertCreateAndReloadBenthosBatchFrequency(frequencies, frequenciesParentBatch.getIdAsInt()); // ----------------------------------------------------------------------------- // 9. Test batch frequency update @@ -371,7 +371,7 @@ public class BenthosBatchPersistenceServiceWriteTest { createdFrequencies = Lists.newArrayList(createdFrequencies); createdFrequencies.remove(createdFrequencies.size() - 1); - List<BenthosBatchFrequency> savedFrequencies = service.saveBenthosBatchFrequency(frequenciesParentBatch.getId(), createdFrequencies); + List<BenthosBatchFrequency> savedFrequencies = service.saveBenthosBatchFrequency(frequenciesParentBatch.getIdAsInt(), createdFrequencies); assertBatchFrequencies(createdFrequencies, savedFrequencies, true); } @@ -403,21 +403,21 @@ public class BenthosBatchPersistenceServiceWriteTest { batch.setSampleCategoryId(PmfmId.SEX.getValue()); batch.setSampleCategoryValue(maleQualitativeValue); batch.setSampleCategoryWeight(2f); - assertCreateAndReloadBenthosBatch(batch, esp1Batch.getId()); + assertCreateAndReloadBenthosBatch(batch, esp1Batch.getIdAsInt()); // Try to remove - service.deleteBenthosBatch(esp1Batch.getId()); + service.deleteBenthosBatch(esp1Batch.getIdAsInt()); // Check if remove try { - batch = getBenthosBatch(fishingOperationWithEmptyBatch.getId(), esp1Batch.getId()); + batch = getBenthosBatch(fishingOperationWithEmptyBatch.getIdAsInt(), esp1Batch.getIdAsInt()); assertNull(batch); } catch (DataRetrievalFailureException drfe) { assertNotNull(drfe); } } - protected void assertCreateAndReloadBenthosBatch(BenthosBatch batch, String parentBatchId) { + protected void assertCreateAndReloadBenthosBatch(BenthosBatch batch, Integer parentBatchId) { batch.setFishingOperation(fishingOperationWithEmptyBatch); // Create batch @@ -425,12 +425,12 @@ public class BenthosBatchPersistenceServiceWriteTest { assertBenthosBatch(batch, createdBatch, false); // then reload (for round trip check) - BenthosBatch reloadedBatch = getBenthosBatch(fishingOperationWithEmptyBatch.getId(), createdBatch.getId()); + BenthosBatch reloadedBatch = getBenthosBatch(fishingOperationWithEmptyBatch.getIdAsInt(), createdBatch.getIdAsInt()); if (parentBatchId == null) { assertNull(reloadedBatch.getParentBatch()); } else { assertNotNull(reloadedBatch.getParentBatch()); - assertEquals(parentBatchId, reloadedBatch.getParentBatch().getId()); + assertEquals(parentBatchId, reloadedBatch.getParentBatch().getIdAsInt()); } assertBenthosBatch(createdBatch, reloadedBatch, false); @@ -470,7 +470,7 @@ public class BenthosBatchPersistenceServiceWriteTest { } } - protected List<BenthosBatchFrequency> assertCreateAndReloadBenthosBatchFrequency(List<BenthosBatchFrequency> frequencies, String parentBatchId) { + protected List<BenthosBatchFrequency> assertCreateAndReloadBenthosBatchFrequency(List<BenthosBatchFrequency> frequencies, Integer parentBatchId) { // Create batch List<BenthosBatchFrequency> createdFrequencies = service.saveBenthosBatchFrequency(parentBatchId, frequencies); @@ -519,16 +519,16 @@ public class BenthosBatchPersistenceServiceWriteTest { } } - protected BenthosBatch getBenthosBatch(String fishingOperationId, String speciesBatchId) { + protected BenthosBatch getBenthosBatch(Integer fishingOperationId, Integer speciesBatchId) { return getBenthosBatch(speciesBatchId, service.getRootBenthosBatch(fishingOperationId, false).getChildren()); } - protected BenthosBatch getBenthosBatch(String speciesBatchId, List<BenthosBatch> speciesBatchs) { + protected BenthosBatch getBenthosBatch(Integer speciesBatchId, List<BenthosBatch> speciesBatchs) { if (speciesBatchs == null) { return null; } for (BenthosBatch speciesBatch : speciesBatchs) { - if (speciesBatchId.equals(speciesBatch.getId())) { + if (speciesBatchId.equals(speciesBatch.getIdAsInt())) { return speciesBatch; } if (speciesBatch.getChildBatchs() != null) { diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceReadTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceReadTest.java index d05cf95..54c8e96 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceReadTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceReadTest.java @@ -71,7 +71,7 @@ public class CatchBatchPersistenceServiceReadTest { //TODO-TC Change test when data will be Tutti-aware // old CGFS tree structure is still not valid - service.getCatchBatchFromFishingOperation(fishingOperation.getId()); + service.getCatchBatchFromFishingOperation(fishingOperation.getIdAsInt()); } } diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceWriteTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceWriteTest.java index 339d769..a078fd0 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceWriteTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceWriteTest.java @@ -54,8 +54,6 @@ public class CatchBatchPersistenceServiceWriteTest { protected CruisePersistenceService cruiseService; - protected ProgramPersistenceService programService; - protected FishingOperationPersistenceService fishingOperationService; protected IndividualObservationBatchPersistenceService individualObservationBatchPersistenceService; @@ -90,7 +88,7 @@ public class CatchBatchPersistenceServiceWriteTest { // ----------------------------------------------------------------------------- // Create and reload (test round trip) - assertCreateAndReloadCatchBatch(catchBatch, fishingOperation.getId()); + assertCreateAndReloadCatchBatch(catchBatch, fishingOperation.getIdAsInt()); // ----------------------------------------------------------------------------- // 2. Test with all properties @@ -128,7 +126,7 @@ public class CatchBatchPersistenceServiceWriteTest { catchBatch.setCatchTotalRejectedWeight(15f); // Create and reload (test round trip) - assertCreateAndReloadCatchBatch(catchBatch, fishingOperation.getId()); + assertCreateAndReloadCatchBatch(catchBatch, fishingOperation.getIdAsInt()); // ----------------------------------------------------------------------------- // 2. Test save after modification @@ -138,7 +136,7 @@ public class CatchBatchPersistenceServiceWriteTest { catchBatch.setSpeciesTotalSortedWeight(null); catchBatch.setBenthosTotalSortedWeight(null); - assertSaveAndReloadCatchBatch(catchBatch, fishingOperation.getId()); + assertSaveAndReloadCatchBatch(catchBatch, fishingOperation.getIdAsInt()); } @Test @@ -175,10 +173,10 @@ public class CatchBatchPersistenceServiceWriteTest { dbResource.getFixtures().createMinimalIndividualObservationBatch(fishingOperation); - String fishingOperationId = fishingOperation.getId(); + Integer fishingOperationId = fishingOperation.getIdAsInt(); Assert.assertNotNull(service.getCatchBatchFromFishingOperation(fishingOperationId)); - Assert.assertFalse(CollectionUtils.isEmpty(individualObservationBatchPersistenceService.getAllIndividualObservationBatch(fishingOperationId))); + Assert.assertFalse(CollectionUtils.isEmpty(individualObservationBatchPersistenceService.getAllIndividualObservationBatchsForFishingOperation(fishingOperationId))); service.deleteCatchBatch(fishingOperationId); try { @@ -189,7 +187,7 @@ public class CatchBatchPersistenceServiceWriteTest { } try { - individualObservationBatchPersistenceService.getAllIndividualObservationBatch(fishingOperationId); + individualObservationBatchPersistenceService.getAllIndividualObservationBatchsForFishingOperation(fishingOperationId); Assert.fail(); } catch (DataRetrievalFailureException e) { // feel good, no catch batch associated with fishing operation @@ -197,7 +195,7 @@ public class CatchBatchPersistenceServiceWriteTest { } - protected void assertCreateAndReloadCatchBatch(CatchBatch catchBatch, String fishingOperationId) { + protected void assertCreateAndReloadCatchBatch(CatchBatch catchBatch, Integer fishingOperationId) { CatchBatch createdCatchBatch = service.createCatchBatch(catchBatch); assertNotNull(createdCatchBatch); assertNotNull(createdCatchBatch.getId()); @@ -214,7 +212,7 @@ public class CatchBatchPersistenceServiceWriteTest { catchBatch.setId(createdCatchBatch.getId()); } - protected void assertSaveAndReloadCatchBatch(CatchBatch catchBatch, String fishingOperationId) { + protected void assertSaveAndReloadCatchBatch(CatchBatch catchBatch, Integer fishingOperationId) { CatchBatch savedCatchBatch = service.saveCatchBatch(catchBatch); assertNotNull(savedCatchBatch); assertNotNull(savedCatchBatch.getId()); diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceReadTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceReadTest.java index 0d465ac..97d982d 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceReadTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceReadTest.java @@ -62,7 +62,7 @@ public class CruisePersistenceServiceReadTest { @Test public void getCruise(/*String id*/) { - String cruiseId = dbResource.getFixtures().cruiseId(); + Integer cruiseId = dbResource.getFixtures().cruiseId(); Cruise result = service.getCruise(cruiseId); Assert.assertNotNull(result); } diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceWriteTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceWriteTest.java index 7b75513..cf1255d 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceWriteTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceWriteTest.java @@ -151,7 +151,7 @@ public class CruisePersistenceServiceWriteTest { } // Then reload cruise and compare - Cruise reloadedCruise = service.getCruise(createdCruise.getId()); + Cruise reloadedCruise = service.getCruise(createdCruise.getIdAsInt()); calendar.setTime(createdCruise.getBeginDate()); calendar.set(Calendar.SECOND, 0); calendar.set(Calendar.MILLISECOND, 0); @@ -192,7 +192,7 @@ public class CruisePersistenceServiceWriteTest { assertEquals(cruise.getHeadOfSortRoom(), createdCruise.getHeadOfSortRoom()); // Reload to compare - reloadedCruise = service.getCruise(createdCruise.getId()); + reloadedCruise = service.getCruise(createdCruise.getIdAsInt()); calendar.setTime(createdCruise.getBeginDate()); calendar.set(Calendar.SECOND, 0); @@ -271,7 +271,7 @@ public class CruisePersistenceServiceWriteTest { // Save changes, then check Cruise savedCruise = service.saveCruise(cruise, true, true); assertNotNull(savedCruise); - Cruise reloadedCruise = service.getCruise(savedCruise.getId()); + Cruise reloadedCruise = service.getCruise(savedCruise.getIdAsInt()); assertEquals(cruise.getId(), reloadedCruise.getId()); assertEquals(cruise.getName(), reloadedCruise.getName()); diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceAno4995Test.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceAno4995Test.java index 4e0632f..e3c886b 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceAno4995Test.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceAno4995Test.java @@ -25,7 +25,6 @@ package fr.ifremer.tutti.persistence.service; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.test.DatabaseResource; -import org.hibernate.NonUniqueObjectException; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; @@ -54,8 +53,8 @@ public class FishingOperationPersistenceServiceAno4995Test { service = TuttiPersistenceServiceLocator.getFishingOperationPersistenceService(); // get fishing operation - Cruise cruise = TuttiPersistenceServiceLocator.getCruisePersistenceService().getCruise("0"); - fishingOperation = service.getFishingOperation("0"); + Cruise cruise = TuttiPersistenceServiceLocator.getCruisePersistenceService().getCruise(0); + fishingOperation = service.getFishingOperation(0); fishingOperation.setCruise(cruise); } diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceWriteTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceWriteTest.java index 48e0916..929907d 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceWriteTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceWriteTest.java @@ -193,7 +193,7 @@ public class FishingOperationPersistenceServiceWriteTest { assertNotNull(createdFishingOperation.getId()); // Trying to reload this fishing operation - reloadedFishingOperation = service.getFishingOperation(createdFishingOperation.getId()); + reloadedFishingOperation = service.getFishingOperation(createdFishingOperation.getIdAsInt()); assertNotNull(reloadedFishingOperation); assertNull(reloadedFishingOperation.getGearShootingStartDate()); @@ -242,7 +242,7 @@ public class FishingOperationPersistenceServiceWriteTest { assertNotNull("Fishing operation ID must not be null after creation in database", createdFishingOperation); assertNotNull(createdFishingOperation.getId()); - reloadedFishingOperation = service.getFishingOperation(createdFishingOperation.getId()); + reloadedFishingOperation = service.getFishingOperation(createdFishingOperation.getIdAsInt()); assertNotNull(reloadedFishingOperation.getGear()); assertNotNull(reloadedFishingOperation.getVessel()); assertEquals(fishingOperation.getVessel().getId(), reloadedFishingOperation.getVessel().getId()); @@ -367,7 +367,7 @@ public class FishingOperationPersistenceServiceWriteTest { fishingOperation.setGearUseFeatures(gearShootingCaracteristicsOneEntry); fishingOperation.setComment(fishingOperation.getComment() + "\n\nUnit test createFishingOperation() - Part n°5 : check if deleted sub items in DB"); createdFishingOperation = service.saveFishingOperation(fishingOperation); - reloadedFishingOperation = service.getFishingOperation(createdFishingOperation.getId()); + reloadedFishingOperation = service.getFishingOperation(createdFishingOperation.getIdAsInt()); assertNull(reloadedFishingOperation.getGearShootingStartLatitude()); assertNull(reloadedFishingOperation.getGearShootingStartLongitude()); assertNull(reloadedFishingOperation.getGearShootingEndDate()); @@ -397,11 +397,11 @@ public class FishingOperationPersistenceServiceWriteTest { dbResource.getFixtures().createMinimalAccidentalBatch(fishingOperation); dbResource.getFixtures().createMinimalIndividualObservationBatch(fishingOperation); - String fishingOperationId = fishingOperation.getId(); - Assert.assertFalse(CollectionUtils.isEmpty(service.getAllFishingOperation(cruise.getId()))); + Integer fishingOperationId = fishingOperation.getIdAsInt(); + Assert.assertFalse(CollectionUtils.isEmpty(service.getAllFishingOperation(cruise.getIdAsInt()))); Assert.assertNotNull(catchBatchPersistenceService.getCatchBatchFromFishingOperation(fishingOperationId)); Assert.assertFalse(CollectionUtils.isEmpty(accidentalBatchPersistenceService.getAllAccidentalBatch(fishingOperationId))); - Assert.assertFalse(CollectionUtils.isEmpty(individualObservationBatchPersistenceService.getAllIndividualObservationBatch(fishingOperationId))); + Assert.assertFalse(CollectionUtils.isEmpty(individualObservationBatchPersistenceService.getAllIndividualObservationBatchsForFishingOperation(fishingOperationId))); if (log.isInfoEnabled()) { log.info("\n\n\nWill delete fishing operation: " + fishingOperationId); @@ -409,7 +409,7 @@ public class FishingOperationPersistenceServiceWriteTest { service.deleteFishingOperation(fishingOperationId); - Assert.assertTrue(CollectionUtils.isEmpty(service.getAllFishingOperation(cruise.getId()))); + Assert.assertTrue(CollectionUtils.isEmpty(service.getAllFishingOperation(cruise.getIdAsInt()))); try { catchBatchPersistenceService.getCatchBatchFromFishingOperation(fishingOperationId); Assert.fail(); @@ -417,7 +417,7 @@ public class FishingOperationPersistenceServiceWriteTest { // feel good, no catch batch associated with fishing operation } try { - individualObservationBatchPersistenceService.getAllIndividualObservationBatch(fishingOperationId); + individualObservationBatchPersistenceService.getAllIndividualObservationBatchsForFishingOperation(fishingOperationId); Assert.fail(); } catch (DataRetrievalFailureException e) { // feel good, no catch batch associated with fishing operation diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceWriteTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceWriteTest.java index 331caa6..c7d243d 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceWriteTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/IndividualObservationBatchPersistenceServiceWriteTest.java @@ -79,7 +79,7 @@ public class IndividualObservationBatchPersistenceServiceWriteTest { Assert.assertNotNull(createdIndividualObservationBatch.getId()); // reload it - List<IndividualObservationBatch> allIndividualObservationBatch = service.getAllIndividualObservationBatch(fishingOperation.getId()); + List<IndividualObservationBatch> allIndividualObservationBatch = service.getAllIndividualObservationBatchsForFishingOperation(fishingOperation.getIdAsInt()); Assert.assertTrue(CollectionUtils.isNotEmpty(allIndividualObservationBatch)); IndividualObservationBatch reloadedIndividualObservationBatch = allIndividualObservationBatch.get(0); reloadedIndividualObservationBatch.setFishingOperation(fishingOperation); @@ -89,11 +89,10 @@ public class IndividualObservationBatchPersistenceServiceWriteTest { // 2. Create a full with all properties // ----------------------------------------------------------------------------- - IndividualObservationBatch fullIndividualObservationBatch = createdIndividualObservationBatch; - fullIndividualObservationBatch.setId((String) null); + createdIndividualObservationBatch.setId((String) null); CaracteristicMap caracteristicMap = new CaracteristicMap(); - fullIndividualObservationBatch.setCaracteristics(caracteristicMap); + createdIndividualObservationBatch.setCaracteristics(caracteristicMap); // add a qualitative caracteristic Caracteristic maturityCaracteristic = caracteristicService.getMaturityCaracteristic(); @@ -107,25 +106,25 @@ public class IndividualObservationBatchPersistenceServiceWriteTest { Caracteristic stringCaracteristic = caracteristicService.getCaracteristic(dbResource.getFixtures().refAlphanumericPmfmId()); caracteristicMap.put(stringCaracteristic, "Un texte!"); - fullIndividualObservationBatch.setComment("IndividualObservationBatch-full"); + createdIndividualObservationBatch.setComment("IndividualObservationBatch-full"); // fullIndividualObservationBatch.setSamplingCode("SamplingCode"); // fullIndividualObservationBatch.setCalcifiedPieceSamplingCode("CalcifiedPieceSamplingCode"); - fullIndividualObservationBatch.setLengthStepCaracteristic(caracteristicService.getCaracteristic(dbResource.getFixtures().refNumericalPmfmId())); - fullIndividualObservationBatch.setSize(10.0f); - fullIndividualObservationBatch.setWeight(5.f); + createdIndividualObservationBatch.setLengthStepCaracteristic(caracteristicService.getCaracteristic(dbResource.getFixtures().refNumericalPmfmId())); + createdIndividualObservationBatch.setSize(10.0f); + createdIndividualObservationBatch.setWeight(5.f); IndividualObservationBatch createdIndividualObservationBatch2 = - service.createIndividualObservationBatch(fullIndividualObservationBatch); + service.createIndividualObservationBatch(createdIndividualObservationBatch); - assertEqualsIndividualObservationBatch(fullIndividualObservationBatch, createdIndividualObservationBatch2); + assertEqualsIndividualObservationBatch(createdIndividualObservationBatch, createdIndividualObservationBatch2); Assert.assertNotNull(createdIndividualObservationBatch2); Assert.assertNotNull(createdIndividualObservationBatch2.getId()); - assertEqualsIndividualObservationBatch(fullIndividualObservationBatch, createdIndividualObservationBatch2); + assertEqualsIndividualObservationBatch(createdIndividualObservationBatch, createdIndividualObservationBatch2); // reload it - allIndividualObservationBatch = service.getAllIndividualObservationBatch(fishingOperation.getId()); + allIndividualObservationBatch = service.getAllIndividualObservationBatchsForFishingOperation(fishingOperation.getIdAsInt()); Assert.assertTrue(CollectionUtils.isNotEmpty(allIndividualObservationBatch)); Assert.assertEquals(2, allIndividualObservationBatch.size()); IndividualObservationBatch reloadedIndividualObservationBatch2 = TuttiEntities.splitById(allIndividualObservationBatch).get(createdIndividualObservationBatch2.getId()); @@ -135,18 +134,17 @@ public class IndividualObservationBatchPersistenceServiceWriteTest { // ----------------------------------------------------------------------------- // 2. Modify some properties and save // ----------------------------------------------------------------------------- - IndividualObservationBatch modifiedIndividualObservationBatch = reloadedIndividualObservationBatch2; - modifiedIndividualObservationBatch.setSize(15f); - modifiedIndividualObservationBatch.setWeight(35f); - fullIndividualObservationBatch.setComment("IndividualObservationBatch-modified"); + reloadedIndividualObservationBatch2.setSize(15f); + reloadedIndividualObservationBatch2.setWeight(35f); + createdIndividualObservationBatch.setComment("IndividualObservationBatch-modified"); // fullIndividualObservationBatch.setSamplingCode("SamplingCode"); // fullIndividualObservationBatch.setCalcifiedPieceSamplingCode("CalcifiedPieceSamplingCode"); - modifiedIndividualObservationBatch.getCaracteristics().clear(); + reloadedIndividualObservationBatch2.getCaracteristics().clear(); - IndividualObservationBatch savedIndividualObservationBatch = service.saveIndividualObservationBatch(modifiedIndividualObservationBatch); - assertEqualsIndividualObservationBatch(modifiedIndividualObservationBatch, savedIndividualObservationBatch); + IndividualObservationBatch savedIndividualObservationBatch = service.saveIndividualObservationBatch(reloadedIndividualObservationBatch2); + assertEqualsIndividualObservationBatch(reloadedIndividualObservationBatch2, savedIndividualObservationBatch); - allIndividualObservationBatch = service.getAllIndividualObservationBatch(fishingOperation.getId()); + allIndividualObservationBatch = service.getAllIndividualObservationBatchsForFishingOperation(fishingOperation.getIdAsInt()); Assert.assertTrue(CollectionUtils.isNotEmpty(allIndividualObservationBatch)); IndividualObservationBatch reloadedIndividualObservationBatch3 = TuttiEntities.splitById(allIndividualObservationBatch).get(createdIndividualObservationBatch2.getId()); reloadedIndividualObservationBatch3.setFishingOperation(fishingOperation); @@ -159,12 +157,12 @@ public class IndividualObservationBatchPersistenceServiceWriteTest { IndividualObservationBatch createdIndividualObservationBatch = dbResource.getFixtures().createMinimalIndividualObservationBatch(fishingOperation); - List<IndividualObservationBatch> allIndividualObservationBatch = service.getAllIndividualObservationBatch(fishingOperation.getId()); + List<IndividualObservationBatch> allIndividualObservationBatch = service.getAllIndividualObservationBatchsForFishingOperation(fishingOperation.getIdAsInt() ); Assert.assertFalse(CollectionUtils.isEmpty(allIndividualObservationBatch)); - service.deleteIndividualObservationBatch(createdIndividualObservationBatch.getId()); + service.deleteIndividualObservationBatch(createdIndividualObservationBatch.getIdAsInt() ); - List<IndividualObservationBatch> allIndividualObservationBatch2 = service.getAllIndividualObservationBatch(fishingOperation.getId()); + List<IndividualObservationBatch> allIndividualObservationBatch2 = service.getAllIndividualObservationBatchsForFishingOperation(fishingOperation.getIdAsInt() ); Assert.assertTrue(CollectionUtils.isEmpty(allIndividualObservationBatch2)); } @@ -175,12 +173,12 @@ public class IndividualObservationBatchPersistenceServiceWriteTest { dbResource.getFixtures().createMinimalIndividualObservationBatch(fishingOperation); - List<IndividualObservationBatch> allIndividualObservationBatch = service.getAllIndividualObservationBatch(fishingOperation.getId()); + List<IndividualObservationBatch> allIndividualObservationBatch = service.getAllIndividualObservationBatchsForFishingOperation(fishingOperation.getIdAsInt() ); Assert.assertFalse(CollectionUtils.isEmpty(allIndividualObservationBatch)); - service.deleteIndividualObservationBatchForFishingOperation(fishingOperation.getId()); + service.deleteIndividualObservationBatchForFishingOperation(fishingOperation.getIdAsInt() ); - List<IndividualObservationBatch> allIndividualObservationBatch2 = service.getAllIndividualObservationBatch(fishingOperation.getId()); + List<IndividualObservationBatch> allIndividualObservationBatch2 = service.getAllIndividualObservationBatchsForFishingOperation(fishingOperation.getIdAsInt()); Assert.assertTrue(CollectionUtils.isEmpty(allIndividualObservationBatch2)); } diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceWriteTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceWriteTest.java index d40c261..1bbea01 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceWriteTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceWriteTest.java @@ -111,7 +111,7 @@ public class MarineLitterBatchPersistenceServiceWriteTest { assertNotNull(fishingOperations); assertTrue(fishingOperations.size() > 0); fishingOperationNoCatchBatch = fishingOperations.get(0); - fishingOperationNoCatchBatch = fishingOperationService.getFishingOperation(fishingOperationNoCatchBatch.getId()); + fishingOperationNoCatchBatch = fishingOperationService.getFishingOperation(fishingOperationNoCatchBatch.getIdAsInt() ); fishingOperationNoCatchBatch.setId((String) null); fishingOperationNoCatchBatch.setCruise(cruise); calendar.setTime(new Date()); @@ -126,7 +126,7 @@ public class MarineLitterBatchPersistenceServiceWriteTest { // Create a second operation, with no cacth batch : to test CatchBatch insert/update : fishingOperationWithEmptyBatch = fishingOperations.get(1); - fishingOperationWithEmptyBatch = fishingOperationService.getFishingOperation(fishingOperationWithEmptyBatch.getId()); + fishingOperationWithEmptyBatch = fishingOperationService.getFishingOperation(fishingOperationWithEmptyBatch.getIdAsInt() ); fishingOperationWithEmptyBatch.setId((String) null); fishingOperationWithEmptyBatch.setCruise(cruise); calendar.setTime(new Date()); @@ -161,7 +161,7 @@ public class MarineLitterBatchPersistenceServiceWriteTest { // then reload (for round trip check) MarineLitterBatch reloadedBatch = getMarineLitterBatch( - newMarineLitter.getFishingOperation().getId(), createdBatch.getId()); + newMarineLitter.getFishingOperation().getIdAsInt(), createdBatch.getIdAsInt()); assertMarineLitterBatch(newMarineLitter, reloadedBatch); } @@ -201,15 +201,15 @@ public class MarineLitterBatchPersistenceServiceWriteTest { MarineLitterBatch createdMarineLitterBatch = service.createMarineLitterBatch(newMarineLitter); - BatchContainer<MarineLitterBatch> rootMarineLitterBatch = service.getRootMarineLitterBatch(fishingOperationWithEmptyBatch.getId()); + BatchContainer<MarineLitterBatch> rootMarineLitterBatch = service.getRootMarineLitterBatch(fishingOperationWithEmptyBatch.getIdAsInt() ); Assert.assertNotNull(rootMarineLitterBatch); Assert.assertFalse(rootMarineLitterBatch.getChildren().isEmpty()); // delete it - service.deleteMarineLitterBatch(createdMarineLitterBatch.getId()); + service.deleteMarineLitterBatch(createdMarineLitterBatch.getIdAsInt() ); - rootMarineLitterBatch = service.getRootMarineLitterBatch(fishingOperationWithEmptyBatch.getId()); + rootMarineLitterBatch = service.getRootMarineLitterBatch(fishingOperationWithEmptyBatch.getIdAsInt() ); Assert.assertNotNull(rootMarineLitterBatch); Assert.assertTrue(rootMarineLitterBatch.getChildren().isEmpty()); @@ -228,10 +228,10 @@ public class MarineLitterBatchPersistenceServiceWriteTest { assertEquals(expectedBatch.getComment(), actualBatch.getComment()); } - protected MarineLitterBatch getMarineLitterBatch(String fishingOperationId, String id) { + protected MarineLitterBatch getMarineLitterBatch(Integer fishingOperationId, Integer id) { BatchContainer<MarineLitterBatch> rootMarineLitterBatch = service.getRootMarineLitterBatch(fishingOperationId); for (MarineLitterBatch marineLitterBatch : rootMarineLitterBatch.getChildren()) { - if (id.equals(marineLitterBatch.getId())) { + if (id.equals(marineLitterBatch.getIdAsInt())) { return marineLitterBatch; } } diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceReadTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceReadTest.java index 5faecc3..4e84069 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceReadTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceReadTest.java @@ -78,7 +78,7 @@ public class SpeciesBatchPersistenceServiceReadTest { @Test public void getRootSpeciesBatch(/*String fishingOperationId*/) { //TODO Do me! - service.getRootSpeciesBatch(fishingOperation.getId(), false); + service.getRootSpeciesBatch(fishingOperation.getIdAsInt(), false); } @Ignore @@ -162,19 +162,19 @@ public class SpeciesBatchPersistenceServiceReadTest { } } - public SpeciesBatch getSpeciesBatch(String fishingOperationId, - String speciesBatchId) { + public SpeciesBatch getSpeciesBatch(Integer fishingOperationId, + Integer speciesBatchId) { BatchContainer<SpeciesBatch> rootSpeciesBatch = service.getRootSpeciesBatch(fishingOperationId, false); return getSpeciesBatch(speciesBatchId, rootSpeciesBatch.getChildren()); } - public static SpeciesBatch getSpeciesBatch(String speciesBatchId, + public static SpeciesBatch getSpeciesBatch(Integer speciesBatchId, List<SpeciesBatch> speciesBatchs) { if (speciesBatchs == null) { return null; } for (SpeciesBatch speciesBatch : speciesBatchs) { - if (speciesBatchId.equals(speciesBatch.getId())) { + if (speciesBatchId.equals(speciesBatch.getIdAsInt())) { return speciesBatch; } if (speciesBatch.getChildBatchs() != null) { diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceWriteTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceWriteTest.java index bf2440b..acdd5d8 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceWriteTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceWriteTest.java @@ -142,7 +142,7 @@ public class SpeciesBatchPersistenceServiceWriteTest { assertNotNull(fishingOperations); assertTrue(fishingOperations.size() > 0); fishingOperationNoCatchBatch = fishingOperations.get(0); - fishingOperationNoCatchBatch = fishingOperationService.getFishingOperation(fishingOperationNoCatchBatch.getId()); + fishingOperationNoCatchBatch = fishingOperationService.getFishingOperation(fishingOperationNoCatchBatch.getIdAsInt()); fishingOperationNoCatchBatch.setId((String) null); fishingOperationNoCatchBatch.setCruise(cruise); calendar.setTime(new Date()); @@ -157,7 +157,7 @@ public class SpeciesBatchPersistenceServiceWriteTest { // Create a second operation, with no cacth batch : to test CatchBatch insert/update : fishingOperationWithEmptyBatch = fishingOperations.get(1); - fishingOperationWithEmptyBatch = fishingOperationService.getFishingOperation(fishingOperationWithEmptyBatch.getId()); + fishingOperationWithEmptyBatch = fishingOperationService.getFishingOperation(fishingOperationWithEmptyBatch.getIdAsInt()); fishingOperationWithEmptyBatch.setId((String) null); fishingOperationWithEmptyBatch.setCruise(cruise); calendar.setTime(new Date()); @@ -238,7 +238,7 @@ public class SpeciesBatchPersistenceServiceWriteTest { batch.setWeight(1f); batch.setNumber(7); - assertCreateAndReloadSpeciesBatch(batch, batch.getParentBatch().getId()); + assertCreateAndReloadSpeciesBatch(batch, batch.getParentBatch().getIdAsInt()); // ----------------------------------------------------------------------------- // 3. Test child "Female/2" @@ -255,7 +255,7 @@ public class SpeciesBatchPersistenceServiceWriteTest { batch.setWeight(null); batch.setNumber(14); - assertCreateAndReloadSpeciesBatch(batch, batch.getParentBatch().getId()); + assertCreateAndReloadSpeciesBatch(batch, batch.getParentBatch().getIdAsInt()); // ----------------------------------------------------------------------------- // 4. Test : ESP2 - Vrac/7 @@ -284,7 +284,7 @@ public class SpeciesBatchPersistenceServiceWriteTest { batch.setWeight(1f); batch.setNumber(11); - assertCreateAndReloadSpeciesBatch(batch, batch.getParentBatch().getId()); + assertCreateAndReloadSpeciesBatch(batch, batch.getParentBatch().getIdAsInt()); // ----------------------------------------------------------------------------- // 5. Test save after modifications @@ -301,7 +301,7 @@ public class SpeciesBatchPersistenceServiceWriteTest { // Save and reload, then check SpeciesBatch savedBatch = service.saveSpeciesBatch(batch); assertSpeciesBatch(savedBatch, batch, false); - SpeciesBatch reloadedBatch = getSpeciesBatch(fishingOperationWithEmptyBatch.getId(), savedBatch.getId()); + SpeciesBatch reloadedBatch = getSpeciesBatch(fishingOperationWithEmptyBatch.getIdAsInt(), savedBatch.getIdAsInt()); assertSpeciesBatch(savedBatch, reloadedBatch, true); // Save batch for later @@ -311,15 +311,15 @@ public class SpeciesBatchPersistenceServiceWriteTest { // 6. Test change species // ----------------------------------------------------------------------------- esp2Batch.setSpecies(taxon1); - service.changeSpeciesBatchSpecies(esp2Batch.getId(), taxon1); + service.changeSpeciesBatchSpecies(esp2Batch.getIdAsInt(), taxon1); assertSpeciesBatch(savedBatch, batch, false); - reloadedBatch = getSpeciesBatch(fishingOperationWithEmptyBatch.getId(), esp2Batch.getId()); + reloadedBatch = getSpeciesBatch(fishingOperationWithEmptyBatch.getIdAsInt(), esp2Batch.getIdAsInt()); assertSpeciesBatch(esp2Batch, reloadedBatch, true); // ----------------------------------------------------------------------------- // 7. Test get all root species // ----------------------------------------------------------------------------- - BatchContainer<SpeciesBatch> rootSpeciesBatc = service.getRootSpeciesBatch(fishingOperationWithEmptyBatch.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatc = service.getRootSpeciesBatch(fishingOperationWithEmptyBatch.getIdAsInt(), false); List<SpeciesBatch> rootSpeciesBatch = rootSpeciesBatc.getChildren(); assertNotNull(rootSpeciesBatch); assertEquals(2, rootSpeciesBatch.size()); @@ -343,7 +343,7 @@ public class SpeciesBatchPersistenceServiceWriteTest { frequency.setBatch(frequenciesParentBatch); frequencies.add(frequency); } - List<SpeciesBatchFrequency> createdFrequencies = assertCreateAndReloadSpeciesBatchFrequency(frequencies, frequenciesParentBatch.getId()); + List<SpeciesBatchFrequency> createdFrequencies = assertCreateAndReloadSpeciesBatchFrequency(frequencies, frequenciesParentBatch.getIdAsInt()); // ----------------------------------------------------------------------------- // 9. Test batch frequency update @@ -360,7 +360,7 @@ public class SpeciesBatchPersistenceServiceWriteTest { createdFrequencies = Lists.newArrayList(createdFrequencies); createdFrequencies.remove(createdFrequencies.size() - 1); - List<SpeciesBatchFrequency> savedFrequencies = service.saveSpeciesBatchFrequency(frequenciesParentBatch.getId(), createdFrequencies); + List<SpeciesBatchFrequency> savedFrequencies = service.saveSpeciesBatchFrequency(frequenciesParentBatch.getIdAsInt(), createdFrequencies); assertBatchFrequencies(createdFrequencies, savedFrequencies, true); } @@ -392,21 +392,21 @@ public class SpeciesBatchPersistenceServiceWriteTest { batch.setSampleCategoryId(PmfmId.SEX.getValue()); batch.setSampleCategoryValue(maleQualitativeValue); batch.setSampleCategoryWeight(2f); - assertCreateAndReloadSpeciesBatch(batch, esp1Batch.getId()); + assertCreateAndReloadSpeciesBatch(batch, esp1Batch.getIdAsInt()); // Try to remove - service.deleteSpeciesBatch(esp1Batch.getId()); + service.deleteSpeciesBatch(esp1Batch.getIdAsInt()); // Check if remove try { - batch = getSpeciesBatch(fishingOperationWithEmptyBatch.getId(), esp1Batch.getId()); + batch = getSpeciesBatch(fishingOperationWithEmptyBatch.getIdAsInt(), esp1Batch.getIdAsInt()); assertNull(batch); } catch (DataRetrievalFailureException drfe) { assertNotNull(drfe); } } - protected void assertCreateAndReloadSpeciesBatch(SpeciesBatch batch, String parentBatchId) { + protected void assertCreateAndReloadSpeciesBatch(SpeciesBatch batch, Integer parentBatchId) { batch.setFishingOperation(fishingOperationWithEmptyBatch); // Create batch @@ -414,12 +414,12 @@ public class SpeciesBatchPersistenceServiceWriteTest { assertSpeciesBatch(batch, createdBatch, false); // then reload (for round trip check) - SpeciesBatch reloadedBatch = getSpeciesBatch(fishingOperationWithEmptyBatch.getId(), createdBatch.getId()); + SpeciesBatch reloadedBatch = getSpeciesBatch(fishingOperationWithEmptyBatch.getIdAsInt(), createdBatch.getIdAsInt()); if (parentBatchId == null) { assertNull(reloadedBatch.getParentBatch()); } else { assertNotNull(reloadedBatch.getParentBatch()); - assertEquals(parentBatchId, reloadedBatch.getParentBatch().getId()); + assertEquals(parentBatchId, reloadedBatch.getParentBatch().getIdAsInt()); } assertSpeciesBatch(createdBatch, reloadedBatch, false); @@ -459,7 +459,7 @@ public class SpeciesBatchPersistenceServiceWriteTest { } } - protected List<SpeciesBatchFrequency> assertCreateAndReloadSpeciesBatchFrequency(List<SpeciesBatchFrequency> frequencies, String parentBatchId) { + protected List<SpeciesBatchFrequency> assertCreateAndReloadSpeciesBatchFrequency(List<SpeciesBatchFrequency> frequencies, Integer parentBatchId) { // Create batch List<SpeciesBatchFrequency> createdFrequencies = service.saveSpeciesBatchFrequency(parentBatchId, frequencies); @@ -507,16 +507,16 @@ public class SpeciesBatchPersistenceServiceWriteTest { } } - protected SpeciesBatch getSpeciesBatch(String fishingOperationId, String speciesBatchId) { + protected SpeciesBatch getSpeciesBatch(Integer fishingOperationId, Integer speciesBatchId) { return getSpeciesBatch(speciesBatchId, service.getRootSpeciesBatch(fishingOperationId, false).getChildren()); } - protected SpeciesBatch getSpeciesBatch(String speciesBatchId, List<SpeciesBatch> speciesBatchs) { + protected SpeciesBatch getSpeciesBatch(Integer speciesBatchId, List<SpeciesBatch> speciesBatchs) { if (speciesBatchs == null) { return null; } for (SpeciesBatch speciesBatch : speciesBatchs) { - if (speciesBatchId.equals(speciesBatch.getId())) { + if (speciesBatchId.equals(speciesBatch.getIdAsInt())) { return speciesBatch; } if (speciesBatch.getChildBatchs() != null) { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/AbstractTuttiService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/AbstractTuttiService.java index 5510963..3961952 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/AbstractTuttiService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/AbstractTuttiService.java @@ -22,15 +22,8 @@ package fr.ifremer.tutti.service; * #L% */ -import org.apache.commons.io.FileUtils; -import org.nuiton.jaxx.application.ApplicationTechnicalException; -import org.nuiton.util.ZipUtil; - -import java.io.File; import java.io.IOException; -import static org.nuiton.i18n.I18n.t; - /** * Sammoa service support. * @@ -61,19 +54,19 @@ public abstract class AbstractTuttiService implements TuttiService { // by default nothing to close } - protected void compressZipFile(File zipFile, File directory) { - - try { - FileUtils.forceMkdir(zipFile.getParentFile()); - - try { - ZipUtil.compress(zipFile, directory); - } finally { - FileUtils.deleteDirectory(directory); - - } - } catch (IOException e) { - throw new ApplicationTechnicalException(t("tutti.service.compressZipFile.error", directory, zipFile), e); - } - } +// protected void compressZipFile(File zipFile, File directory) { +// +// try { +// FileUtils.forceMkdir(zipFile.getParentFile()); +// +// try { +// ZipUtil.compress(zipFile, directory); +// } finally { +// FileUtils.deleteDirectory(directory); +// +// } +// } catch (IOException e) { +// throw new ApplicationTechnicalException(t("tutti.service.compressZipFile.error", directory, zipFile), e); +// } +// } } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java index 3fd86a2..d22d01a 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java @@ -84,12 +84,7 @@ public class DecoratorService extends AbstractTuttiService { public static final String SEPARATOR = "#"; - public static final Comparator<FishingOperation> FISHING_OPERATION_COMPARATOR_BY_GEAR_SHOOTING_START_DATE = new Comparator<FishingOperation>() { - @Override - public int compare(FishingOperation o1, FishingOperation o2) { - return o1.getGearShootingStartDate().compareTo(o2.getGearShootingStartDate()); - } - }; + public static final Comparator<FishingOperation> FISHING_OPERATION_COMPARATOR_BY_GEAR_SHOOTING_START_DATE = (o1, o2) -> o1.getGearShootingStartDate().compareTo(o2.getGearShootingStartDate()); /** Delegate decorator provider. */ diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java index e0a7785..b118732 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java @@ -123,29 +123,25 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer public List<Gear> retainTemporaryGearList(List<Gear> targetList) { - List<Gear> sourceList = retainTemporaryList(Gears.IS_TEMPORARY, targetList); - return sourceList; + return retainTemporaryList(Gears.IS_TEMPORARY, targetList); } public List<Person> retainTemporaryPersonList(List<Person> targetList) { - List<Person> sourceList = retainTemporaryList(Persons.IS_TEMPORARY, targetList); - return sourceList; + return retainTemporaryList(Persons.IS_TEMPORARY, targetList); } public List<Species> retainTemporarySpeciesList(List<Species> targetList) { - List<Species> sourceList = retainTemporaryList(Speciess.IS_TEMPORARY, targetList); - return sourceList; + return retainTemporaryList(Speciess.IS_TEMPORARY, targetList); } public List<Vessel> retainTemporaryVesselList(List<Vessel> targetList) { - List<Vessel> sourceList = retainTemporaryList(Vessels.IS_TEMPORARY, targetList); - return sourceList; + return retainTemporaryList(Vessels.IS_TEMPORARY, targetList); } @@ -167,25 +163,11 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer } public FrequencyFunction<SpeciesBatch, SpeciesBatchFrequency> newSpeciesFrequenciesFunction() { - return new FrequencyFunction<SpeciesBatch, SpeciesBatchFrequency>() { - - @Override - public List<SpeciesBatchFrequency> apply(SpeciesBatch input) { - - return getAllSpeciesBatchFrequency(input.getId()); - } - }; + return input -> getAllSpeciesBatchFrequency(input.getIdAsInt()); } public FrequencyFunction<BenthosBatch, BenthosBatchFrequency> newBenthosFrequenciesFunction() { - return new FrequencyFunction<BenthosBatch, BenthosBatchFrequency>() { - - @Override - public List<BenthosBatchFrequency> apply(BenthosBatch input) { - - return getAllBenthosBatchFrequency(input.getId()); - } - }; + return input -> getAllBenthosBatchFrequency(input.getIdAsInt()); } public <F extends SpeciesAbleBatchFrequency> Float countFrequenciesWeight(List<F> frequencies, boolean stopIfNullFound) { @@ -246,12 +228,12 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer } @Override - public ProgramDataModel loadCruises(String programId, boolean loadFishingOperation, String... cruiseIds) { + public ProgramDataModel loadCruises(String programId, boolean loadFishingOperation, Integer... cruiseIds) { return driver.loadCruises(programId, loadFishingOperation, cruiseIds); } @Override - public ProgramDataModel loadCruise(String programId, String cruiseId, String... fishingOperationIds) { + public ProgramDataModel loadCruise(String programId, Integer cruiseId, Integer... fishingOperationIds) { return driver.loadCruise(programId, cruiseId, fishingOperationIds); } @@ -354,7 +336,7 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer } } - public static enum ImportStructureType { + public enum ImportStructureType { NORMAL, // normal structure with a db directory + optional meas_file directory INLINE } @@ -1124,7 +1106,7 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer //------------------------------------------------------------------------// @Override - public List<String> getAllCruiseId(String programId) { + public List<Integer> getAllCruiseId(String programId) { return driver.getAllCruiseId(programId); } @@ -1134,7 +1116,7 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer } @Override - public Cruise getCruise(String id) { + public Cruise getCruise(Integer id) { return driver.getCruise(id); } @@ -1154,7 +1136,7 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer } @Override - public CaracteristicMap getGearCaracteristics(String cruiseId, String gearId, short rankOrder) { + public CaracteristicMap getGearCaracteristics(Integer cruiseId, Integer gearId, short rankOrder) { return driver.getGearCaracteristics(cruiseId, gearId, rankOrder); } @@ -1243,22 +1225,22 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer //------------------------------------------------------------------------// @Override - public int getFishingOperationCount(String cruiseId) { + public int getFishingOperationCount(Integer cruiseId) { return driver.getFishingOperationCount(cruiseId); } @Override - public List<String> getAllFishingOperationIds(String cruiseId) { + public List<Integer> getAllFishingOperationIds(Integer cruiseId) { return driver.getAllFishingOperationIds(cruiseId); } @Override - public List<FishingOperation> getAllFishingOperation(String cruiseId) { + public List<FishingOperation> getAllFishingOperation(Integer cruiseId) { return driver.getAllFishingOperation(cruiseId); } @Override - public FishingOperation getFishingOperation(String id) { + public FishingOperation getFishingOperation(Integer id) { FishingOperation bean = driver.getFishingOperation(id); // see http://forge.codelutin.com/issues/2014 @@ -1269,7 +1251,7 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer } @Override - public List<Vessel> getFishingOperationSecondaryVessel(String fishingOperationId) { + public List<Vessel> getFishingOperationSecondaryVessel(Integer fishingOperationId) { return driver.getFishingOperationSecondaryVessel(fishingOperationId); } @@ -1298,7 +1280,7 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer } @Override - public void deleteFishingOperation(String id) { + public void deleteFishingOperation(Integer id) { driver.deleteFishingOperation(id); } @@ -1307,12 +1289,12 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer //------------------------------------------------------------------------// @Override - public boolean isFishingOperationWithCatchBatch(String operationId) { + public boolean isFishingOperationWithCatchBatch(Integer operationId) { return driver.isFishingOperationWithCatchBatch(operationId); } @Override - public CatchBatch getCatchBatchFromFishingOperation(String id) throws InvalidBatchModelException { + public CatchBatch getCatchBatchFromFishingOperation(Integer id) throws InvalidBatchModelException { return driver.getCatchBatchFromFishingOperation(id); } @@ -1328,12 +1310,12 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer } @Override - public void deleteCatchBatch(String fishingOperationId) { + public void deleteCatchBatch(Integer fishingOperationId) { driver.deleteCatchBatch(fishingOperationId); } @Override - public void recomputeCatchBatchSampleRatios(String fishingOperationId) { + public void recomputeCatchBatchSampleRatios(Integer fishingOperationId) { driver.recomputeCatchBatchSampleRatios(fishingOperationId); } @@ -1342,17 +1324,17 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer //------------------------------------------------------------------------// @Override - public BatchContainer<SpeciesBatch> getRootSpeciesBatch(String fishingOperationId, boolean validateTree) { + public BatchContainer<SpeciesBatch> getRootSpeciesBatch(Integer fishingOperationId, boolean validateTree) { return driver.getRootSpeciesBatch(fishingOperationId, validateTree); } @Override - public SpeciesBatch createSpeciesBatch(SpeciesBatch bean, String parentBatchId, boolean computeRankOrder) { + public SpeciesBatch createSpeciesBatch(SpeciesBatch bean, Integer parentBatchId, boolean computeRankOrder) { return driver.createSpeciesBatch(bean, parentBatchId, computeRankOrder); } @Override - public Collection<SpeciesBatch> createSpeciesBatches(String fishingOperationId, Collection<SpeciesBatch> beans) { + public Collection<SpeciesBatch> createSpeciesBatches(Integer fishingOperationId, Collection<SpeciesBatch> beans) { return driver.createSpeciesBatches(fishingOperationId, beans); } @@ -1362,27 +1344,27 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer } @Override - public void deleteSpeciesBatch(String id) { + public void deleteSpeciesBatch(Integer id) { driver.deleteSpeciesBatch(id); } @Override - public void deleteSpeciesSubBatch(String id) { + public void deleteSpeciesSubBatch(Integer id) { driver.deleteSpeciesSubBatch(id); } @Override - public void changeSpeciesBatchSpecies(String batchId, Species species) { + public void changeSpeciesBatchSpecies(Integer batchId, Species species) { driver.changeSpeciesBatchSpecies(batchId, species); } @Override - public List<SpeciesBatch> getAllSpeciesBatchToConfirm(String fishingOperationId) throws InvalidBatchModelException { + public List<SpeciesBatch> getAllSpeciesBatchToConfirm(Integer fishingOperationId) throws InvalidBatchModelException { return driver.getAllSpeciesBatchToConfirm(fishingOperationId); } @Override - public List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency(String speciesBatchId) { + public List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency(Integer speciesBatchId) { return driver.getAllSpeciesBatchFrequency(speciesBatchId); } @@ -1392,7 +1374,7 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer } @Override - public List<SpeciesBatchFrequency> saveSpeciesBatchFrequency(String speciesBatchId, + public List<SpeciesBatchFrequency> saveSpeciesBatchFrequency(Integer speciesBatchId, List<SpeciesBatchFrequency> frequencies) { return driver.saveSpeciesBatchFrequency(speciesBatchId, frequencies); } @@ -1402,17 +1384,17 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer //------------------------------------------------------------------------// @Override - public BatchContainer<BenthosBatch> getRootBenthosBatch(String fishingOperationId, boolean validateTree) throws InvalidBatchModelException { + public BatchContainer<BenthosBatch> getRootBenthosBatch(Integer fishingOperationId, boolean validateTree) throws InvalidBatchModelException { return driver.getRootBenthosBatch(fishingOperationId, validateTree); } @Override - public BenthosBatch createBenthosBatch(BenthosBatch bean, String parentBatchId, boolean computeRankOrder) { + public BenthosBatch createBenthosBatch(BenthosBatch bean, Integer parentBatchId, boolean computeRankOrder) { return driver.createBenthosBatch(bean, parentBatchId, computeRankOrder); } @Override - public Collection<BenthosBatch> createBenthosBatches(String fishingOperationId, Collection<BenthosBatch> beans) { + public Collection<BenthosBatch> createBenthosBatches(Integer fishingOperationId, Collection<BenthosBatch> beans) { return driver.createBenthosBatches(fishingOperationId, beans); } @@ -1422,27 +1404,27 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer } @Override - public void deleteBenthosBatch(String id) { + public void deleteBenthosBatch(Integer id) { driver.deleteBenthosBatch(id); } @Override - public void deleteBenthosSubBatch(String id) { + public void deleteBenthosSubBatch(Integer id) { driver.deleteBenthosSubBatch(id); } @Override - public void changeBenthosBatchSpecies(String batchId, Species species) { + public void changeBenthosBatchSpecies(Integer batchId, Species species) { driver.changeBenthosBatchSpecies(batchId, species); } @Override - public List<BenthosBatch> getAllBenthosBatchToConfirm(String fishingOperationId) throws InvalidBatchModelException { + public List<BenthosBatch> getAllBenthosBatchToConfirm(Integer fishingOperationId) throws InvalidBatchModelException { return driver.getAllBenthosBatchToConfirm(fishingOperationId); } @Override - public List<BenthosBatchFrequency> getAllBenthosBatchFrequency(String benthosBatchId) { + public List<BenthosBatchFrequency> getAllBenthosBatchFrequency(Integer benthosBatchId) { return driver.getAllBenthosBatchFrequency(benthosBatchId); } @@ -1452,7 +1434,7 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer } @Override - public List<BenthosBatchFrequency> saveBenthosBatchFrequency(String benthosBatchId, + public List<BenthosBatchFrequency> saveBenthosBatchFrequency(Integer benthosBatchId, List<BenthosBatchFrequency> frequencies) { return driver.saveBenthosBatchFrequency(benthosBatchId, frequencies); } @@ -1462,7 +1444,7 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer //------------------------------------------------------------------------// @Override - public BatchContainer<MarineLitterBatch> getRootMarineLitterBatch(String fishingOperationId) { + public BatchContainer<MarineLitterBatch> getRootMarineLitterBatch(Integer fishingOperationId) { return driver.getRootMarineLitterBatch(fishingOperationId); } @@ -1472,7 +1454,7 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer } @Override - public Collection<MarineLitterBatch> createMarineLitterBatches(String fishingOperationId, Collection<MarineLitterBatch> beans) { + public Collection<MarineLitterBatch> createMarineLitterBatches(Integer fishingOperationId, Collection<MarineLitterBatch> beans) { return driver.createMarineLitterBatches(fishingOperationId, beans); } @@ -1482,7 +1464,7 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer } @Override - public void deleteMarineLitterBatch(String id) { + public void deleteMarineLitterBatch(Integer id) { driver.deleteMarineLitterBatch(id); } @@ -1491,12 +1473,12 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer //------------------------------------------------------------------------// @Override - public List<AccidentalBatch> getAllAccidentalBatch(String fishingOperationId) { + public List<AccidentalBatch> getAllAccidentalBatch(Integer fishingOperationId) { return driver.getAllAccidentalBatch(fishingOperationId); } @Override - public Collection<AccidentalBatch> createAccidentalBatches(String fishingOperationId, Collection<AccidentalBatch> beans) { + public Collection<AccidentalBatch> createAccidentalBatches(Integer fishingOperationId, Collection<AccidentalBatch> beans) { return driver.createAccidentalBatches(fishingOperationId, beans); } @@ -1516,7 +1498,7 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer } @Override - public void deleteAccidentalBatchForFishingOperation(String fishingOperationId) { + public void deleteAccidentalBatchForFishingOperation(Integer fishingOperationId) { driver.deleteAccidentalBatchForFishingOperation(fishingOperationId); } @@ -1525,18 +1507,23 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer //------------------------------------------------------------------------// @Override - public List<IndividualObservationBatch> getAllIndividualObservationBatch(String fishingOperationId) { - return driver.getAllIndividualObservationBatch(fishingOperationId); + public List<IndividualObservationBatch> getAllIndividualObservationBatchsForBatch(Integer batchId) { + return driver.getAllIndividualObservationBatchsForBatch(batchId); } @Override - public IndividualObservationBatch createIndividualObservationBatch(IndividualObservationBatch bean) { - return driver.createIndividualObservationBatch(bean); + public List<IndividualObservationBatch> getAllIndividualObservationBatchsForFishingOperation(Integer fishingOperationId) { + return driver.getAllIndividualObservationBatchsForFishingOperation(fishingOperationId); + } + + @Override + public List<IndividualObservationBatch> getAllIndividualObservationBatchsForCruise(Integer cruiseId) { + return driver.getAllIndividualObservationBatchsForCruise(cruiseId); } @Override - public Collection<IndividualObservationBatch> createIndividualObservationBatches(String fishingOperationId, Collection<IndividualObservationBatch> beans) { - return driver.createIndividualObservationBatches(fishingOperationId, beans); + public IndividualObservationBatch createIndividualObservationBatch(IndividualObservationBatch bean) { + return driver.createIndividualObservationBatch(bean); } @Override @@ -1545,12 +1532,12 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer } @Override - public void deleteIndividualObservationBatch(String id) { + public void deleteIndividualObservationBatch(Integer id) { driver.deleteIndividualObservationBatch(id); } @Override - public void deleteIndividualObservationBatchForFishingOperation(String fishingOperationId) { + public void deleteIndividualObservationBatchForFishingOperation(Integer fishingOperationId) { driver.deleteIndividualObservationBatchForFishingOperation(fishingOperationId); } } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java index bca6995..b496b89 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java @@ -45,12 +45,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.beans.AbstractBean; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.io.Closeable; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * Data context of ui. @@ -93,7 +92,7 @@ public class TuttiDataContext extends AbstractBean implements Closeable { * * @since 0.1 */ - protected String cruiseId; + protected Integer cruiseId; /** * Id of last selected protocol (can be null if none ever selected). @@ -107,7 +106,7 @@ public class TuttiDataContext extends AbstractBean implements Closeable { * * @since 1.2 */ - protected String fishingOperationId; + protected Integer fishingOperationId; /** * Model of sampling as defined in configuration. @@ -162,35 +161,15 @@ public class TuttiDataContext extends AbstractBean implements Closeable { protected PersistenceService service; TuttiDataContext() { - addPropertyChangeListener(PROPERTY_PROGRAM_ID, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - program = null; - } - }); - addPropertyChangeListener(PROPERTY_CRUISE_ID, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - cruise = null; - } + addPropertyChangeListener(PROPERTY_PROGRAM_ID, evt -> program = null); + addPropertyChangeListener(PROPERTY_CRUISE_ID, evt -> cruise = null); + addPropertyChangeListener(PROPERTY_PROTOCOL_ID, evt -> { + resetProtocol(); + resetSpecies(); }); - addPropertyChangeListener(PROPERTY_PROTOCOL_ID, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - resetProtocol(); - resetSpecies(); - } - }); - addPropertyChangeListener(PROPERTY_FISHING_OPERATION_ID, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - fishingOperation = null; - getValidationContext().resetExistingFishingOperations(); - } + addPropertyChangeListener(PROPERTY_FISHING_OPERATION_ID, evt -> { + fishingOperation = null; + getValidationContext().resetExistingFishingOperations(); }); } @@ -266,11 +245,11 @@ public class TuttiDataContext extends AbstractBean implements Closeable { String saneProtocolId = null; String saneProgramId = null; - String saneCruiseId = null; + Integer saneCruiseId = null; String oldProtocolId = getProtocolId(); String oldProgramId = getProgramId(); - String oldCruiseId = getCruiseId(); + Integer oldCruiseId = getCruiseId(); if (isProtocolFilled()) { @@ -403,7 +382,7 @@ public class TuttiDataContext extends AbstractBean implements Closeable { return programId; } - public String getCruiseId() { + public Integer getCruiseId() { return cruiseId; } @@ -411,12 +390,12 @@ public class TuttiDataContext extends AbstractBean implements Closeable { return protocolId; } - public String getFishingOperationId() { + public Integer getFishingOperationId() { return fishingOperationId; } public boolean isCruiseFilled() { - return isProgramFilled() && StringUtils.isNotBlank(cruiseId); + return isProgramFilled() && cruiseId != null; } public boolean isProtocolFilled() { @@ -428,7 +407,7 @@ public class TuttiDataContext extends AbstractBean implements Closeable { } public boolean isFishingOperationFilled() { - return StringUtils.isNotBlank(fishingOperationId); + return fishingOperationId!=null; } public void setProgramId(String programId) { @@ -443,7 +422,7 @@ public class TuttiDataContext extends AbstractBean implements Closeable { firePropertyChange(PROPERTY_CRUISE__FILLED, oldCruiseFilled, isCruiseFilled()); } - public void setCruiseId(String cruiseId) { + public void setCruiseId(Integer cruiseId) { boolean oldValue = isCruiseFilled(); this.cruiseId = cruiseId; @@ -469,7 +448,7 @@ public class TuttiDataContext extends AbstractBean implements Closeable { } } - public void setFishingOperationId(String fishingOperationId) { + public void setFishingOperationId(Integer fishingOperationId) { boolean oldValue = isFishingOperationFilled(); this.fishingOperationId = fishingOperationId; @@ -496,7 +475,7 @@ public class TuttiDataContext extends AbstractBean implements Closeable { checkOpened(); if (cruise == null) { if (isCruiseFilled()) { - String id = getCruiseId(); + Integer id = getCruiseId(); if (log.isInfoEnabled()) { log.info("Loading cruise: " + id); } @@ -509,7 +488,7 @@ public class TuttiDataContext extends AbstractBean implements Closeable { public Cruise reloadCruise() { checkOpened(); Preconditions.checkState(isCruiseFilled()); - String id = getCruiseId(); + Integer id = getCruiseId(); if (log.isInfoEnabled()) { log.info("Reloading cruise: " + id); } @@ -538,15 +517,14 @@ public class TuttiDataContext extends AbstractBean implements Closeable { service.setProtocol(null); } } - TuttiProtocol result = service.getProtocol(); - return result; + return service.getProtocol(); } public FishingOperation getFishingOperation() { checkOpened(); if (fishingOperation == null) { if (isFishingOperationFilled()) { - String id = getFishingOperationId(); + Integer id = getFishingOperationId(); if (log.isInfoEnabled()) { log.info("Loading fishingOperation: " + id); } @@ -559,7 +537,7 @@ public class TuttiDataContext extends AbstractBean implements Closeable { public FishingOperation reloadFishingOperation() { checkOpened(); Preconditions.checkState(isFishingOperationFilled()); - String id = getFishingOperationId(); + Integer id = getFishingOperationId(); if (log.isInfoEnabled()) { log.info("Reloading fishingOperation: " + id); } @@ -626,9 +604,7 @@ public class TuttiDataContext extends AbstractBean implements Closeable { speciesProtocol = service.getBenthosProtocol(species); } - SampleCategoryModelEntry selectedCategory = getBestFirstSampleCategory(categories, speciesProtocol); - - return selectedCategory; + return getBestFirstSampleCategory(categories, speciesProtocol); } /** @@ -655,9 +631,7 @@ public class TuttiDataContext extends AbstractBean implements Closeable { speciesProtocol = service.getSpeciesProtocol(species); } - SampleCategoryModelEntry selectedCategory = getBestFirstSampleCategory(categories, speciesProtocol); - - return selectedCategory; + return getBestFirstSampleCategory(categories, speciesProtocol); } protected SampleCategoryModelEntry getBestFirstSampleCategory(List<SampleCategoryModelEntry> categories, @@ -747,11 +721,10 @@ public class TuttiDataContext extends AbstractBean implements Closeable { result = new ArrayList<>(); Map<Integer, SpeciesProtocol> speciesProtocolMap = TuttiProtocols.toSpeciesProtocolMap(getProtocol()); - for (Species aSpecies : referentSpeciesWithSurveyCode) { - if (speciesProtocolMap.containsKey(aSpecies.getReferenceTaxonId())) { - result.add(aSpecies); - } - } + result.addAll(referentSpeciesWithSurveyCode + .stream() + .filter(aSpecies -> speciesProtocolMap.containsKey(aSpecies.getReferenceTaxonId())) + .collect(Collectors.toList())); } else { @@ -786,11 +759,10 @@ public class TuttiDataContext extends AbstractBean implements Closeable { result = new ArrayList<>(); Map<Integer, SpeciesProtocol> speciesProtocolMap = TuttiProtocols.toBenthosProtocolMap(getProtocol()); - for (Species aSpecies : referentBenthosWithSurveyCode) { - if (speciesProtocolMap.containsKey(aSpecies.getReferenceTaxonId())) { - result.add(aSpecies); - } - } + result.addAll(referentBenthosWithSurveyCode + .stream() + .filter(aSpecies -> speciesProtocolMap.containsKey(aSpecies.getReferenceTaxonId())) + .collect(Collectors.toList())); } else { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDecorator.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDecorator.java index 4857de3..fb8b14f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDecorator.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDecorator.java @@ -82,7 +82,7 @@ public class TuttiDecorator<O> extends MultiJXPathDecorator<O> implements Clonea String expression, String separator, String separatorReplacement) { - return new TuttiDecorator<O>(internalClass, expression, separator, separatorReplacement); + return new TuttiDecorator<>(internalClass, expression, separator, separatorReplacement); } protected TuttiDecorator(Class<O> internalClass, @@ -117,7 +117,7 @@ public class TuttiDecorator<O> extends MultiJXPathDecorator<O> implements Clonea int i = 0; for (Context<O> OContext : contexts) { - OContext.setComparator(new TuttiDecoratorComparator<O>(getProperty(i++))); + OContext.setComparator(new TuttiDecoratorComparator<>(getProperty(i++))); } this.cache = CacheBuilder.newBuilder().build(new CacheLoader<O, String>() { @@ -275,9 +275,7 @@ public class TuttiDecorator<O> extends MultiJXPathDecorator<O> implements Clonea @Override public TuttiDecoratorComparator<O> clone() { - TuttiDecoratorComparator<O> result = - new TuttiDecoratorComparator<O>(expression); - return result; + return new TuttiDecoratorComparator<>(expression); } public String getExpression() { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java index 547942d..564fb66 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiServiceContext.java @@ -104,8 +104,7 @@ public class TuttiServiceContext implements Closeable { return null; } try { - S s = (S) services.get(serviceType); - return s; + return (S) services.get(serviceType); } catch (ExecutionException e) { throw new ApplicationTechnicalException(t("tutti.service.context.serviceInstanciation.error", serviceType), e); } @@ -120,8 +119,7 @@ public class TuttiServiceContext implements Closeable { IOUtils.closeQuietly(service); } services.invalidate(serviceType); - S result = getService(serviceType); - return result; + return getService(serviceType); } @Override diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/ValidationService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/ValidationService.java index 4a9f102..495e75f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/ValidationService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/ValidationService.java @@ -52,110 +52,92 @@ public class ValidationService implements TuttiService { public NuitonValidatorResult validateValidateCruise(Cruise cruise) { NuitonValidator<Cruise> validator = NuitonValidatorFactory.newValidator(Cruise.class, VALIDATION_CONTEXT_VALIDATE); - NuitonValidatorResult result = validator.validate(cruise); - return result; + return validator.validate(cruise); } public NuitonValidatorResult validateEditCruise(Cruise cruise) { NuitonValidator<Cruise> validator = NuitonValidatorFactory.newValidator(Cruise.class, VALIDATION_CONTEXT_EDIT); - NuitonValidatorResult result = validator.validate(cruise); - return result; + return validator.validate(cruise); } public NuitonValidatorResult validateProgram(Program program) { NuitonValidator<Program> validator = NuitonValidatorFactory.newValidator(Program.class, VALIDATION_CONTEXT_EDIT); - NuitonValidatorResult result = validator.validate(program); - return result; + return validator.validate(program); } public NuitonValidatorResult validateProtocol(TuttiProtocol protocol) { NuitonValidator<TuttiProtocol> validator = NuitonValidatorFactory.newValidator(TuttiProtocol.class); - NuitonValidatorResult result = validator.validate(protocol); - return result; + return validator.validate(protocol); } public NuitonValidatorResult validateEditFishingOperation(FishingOperation fishingOperation) { NuitonValidator<FishingOperation> validator = NuitonValidatorFactory.newValidator(FishingOperation.class, VALIDATION_CONTEXT_EDIT); - NuitonValidatorResult result = validator.validate(fishingOperation); - return result; + return validator.validate(fishingOperation); } public NuitonValidatorResult validateValidateFishingOperation(FishingOperation fishingOperation) { NuitonValidator<FishingOperation> validator = NuitonValidatorFactory.newValidator(FishingOperation.class, VALIDATION_CONTEXT_VALIDATE); - NuitonValidatorResult result = validator.validate(fishingOperation); - return result; + return validator.validate(fishingOperation); } public NuitonValidatorResult validateCatchBatch(CatchBatch catchBatch, String context) { NuitonValidator<CatchBatch> validator = NuitonValidatorFactory.newValidator(CatchBatch.class, context); - NuitonValidatorResult result = validator.validate(catchBatch); - return result; + return validator.validate(catchBatch); } public NuitonValidatorResult validateValidateCatchBatch(CatchBatch catchBatch) { NuitonValidator<CatchBatch> validator = NuitonValidatorFactory.newValidator(CatchBatch.class, VALIDATION_CONTEXT_VALIDATE); - NuitonValidatorResult result = validator.validate(catchBatch); - return result; + return validator.validate(catchBatch); } public NuitonValidatorResult validateValidateSpeciesBatch(SpeciesBatch speciesBatch) { NuitonValidator<SpeciesBatch> validator = NuitonValidatorFactory.newValidator(SpeciesBatch.class, VALIDATION_CONTEXT_VALIDATE); - NuitonValidatorResult result = validator.validate(speciesBatch); - return result; + return validator.validate(speciesBatch); } public NuitonValidatorResult validateEditSpeciesBatch(SpeciesBatch speciesBatch) { NuitonValidator<SpeciesBatch> validator = NuitonValidatorFactory.newValidator(SpeciesBatch.class, VALIDATION_CONTEXT_EDIT); - NuitonValidatorResult result = validator.validate(speciesBatch); - return result; + return validator.validate(speciesBatch); } public NuitonValidatorResult validateValidateBenthosBatch(BenthosBatch benthosBatch) { NuitonValidator<BenthosBatch> validator = NuitonValidatorFactory.newValidator(BenthosBatch.class, VALIDATION_CONTEXT_VALIDATE); - NuitonValidatorResult result = validator.validate(benthosBatch); - return result; + return validator.validate(benthosBatch); } public NuitonValidatorResult validateEditBenthosBatch(BenthosBatch benthosBatch) { NuitonValidator<BenthosBatch> validator = NuitonValidatorFactory.newValidator(BenthosBatch.class, VALIDATION_CONTEXT_EDIT); - NuitonValidatorResult result = validator.validate(benthosBatch); - return result; + return validator.validate(benthosBatch); } public NuitonValidatorResult validateValidateMarineLitterBatch(MarineLitterBatch marineLitterBatch) { NuitonValidator<MarineLitterBatch> validator = NuitonValidatorFactory.newValidator(MarineLitterBatch.class, VALIDATION_CONTEXT_VALIDATE); - NuitonValidatorResult result = validator.validate(marineLitterBatch); - return result; + return validator.validate(marineLitterBatch); } public NuitonValidatorResult validateEditMarineLitterBatch(MarineLitterBatch marineLitterBatch) { NuitonValidator<MarineLitterBatch> validator = NuitonValidatorFactory.newValidator(MarineLitterBatch.class, VALIDATION_CONTEXT_EDIT); - NuitonValidatorResult result = validator.validate(marineLitterBatch); - return result; + return validator.validate(marineLitterBatch); } public NuitonValidatorResult validateValidateAccidentalBatch(AccidentalBatch accidentalBatch) { NuitonValidator<AccidentalBatch> validator = NuitonValidatorFactory.newValidator(AccidentalBatch.class, VALIDATION_CONTEXT_VALIDATE); - NuitonValidatorResult result = validator.validate(accidentalBatch); - return result; + return validator.validate(accidentalBatch); } public NuitonValidatorResult validateEditAccidentalBatch(AccidentalBatch accidentalBatch) { NuitonValidator<AccidentalBatch> validator = NuitonValidatorFactory.newValidator(AccidentalBatch.class, VALIDATION_CONTEXT_EDIT); - NuitonValidatorResult result = validator.validate(accidentalBatch); - return result; + return validator.validate(accidentalBatch); } public NuitonValidatorResult validateValidateIndividualObservationBatch(IndividualObservationBatch individualObservationBatch) { NuitonValidator<IndividualObservationBatch> validator = NuitonValidatorFactory.newValidator(IndividualObservationBatch.class, VALIDATION_CONTEXT_VALIDATE); - NuitonValidatorResult result = validator.validate(individualObservationBatch); - return result; + return validator.validate(individualObservationBatch); } public NuitonValidatorResult validateEditIndividualObservationBatch(IndividualObservationBatch individualObservationBatch) { NuitonValidator<IndividualObservationBatch> validator = NuitonValidatorFactory.newValidator(IndividualObservationBatch.class, VALIDATION_CONTEXT_EDIT); - NuitonValidatorResult result = validator.validate(individualObservationBatch); - return result; + return validator.validate(individualObservationBatch); } @Override diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportContext.java index 3f5f8c1..8f13285 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportContext.java @@ -24,7 +24,6 @@ package fr.ifremer.tutti.service.bigfin; * #L% */ -import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; @@ -145,50 +144,34 @@ public class BigfinImportContext { } public Multimap<Species, SpeciesBatch> getRootSpeciesBatchBySpecies() { - Multimap<Species, SpeciesBatch> batchesBySpecies = Multimaps.index(rootSpeciesBatch.getChildren(), new Function<SpeciesBatch, Species>() { - @Override - public Species apply(SpeciesBatch input) { - return input.getSpecies(); - } - }); - return batchesBySpecies; + return Multimaps.index(rootSpeciesBatch.getChildren(), SpeciesBatch::getSpecies); } public Multimap<Species, BigfinDataRow> getSpeciesRowsBySpecies() { // separate the imported rows by species - Multimap<Species, BigfinDataRow> rowsBySpecies = Multimaps.index(speciesRows, new Function<BigfinDataRow, Species>() { - @Override - public Species apply(BigfinDataRow bigfinDataRow) { - return bigfinDataRow.getSpeciesOrSpeciesBatch().getSpecies(); - } - }); - return rowsBySpecies; + return Multimaps.index(speciesRows, bigfinDataRow -> { + return bigfinDataRow.getSpeciesOrSpeciesBatch().getSpecies(); + }); } public Multimap<SpeciesBatch, BigfinDataRow> getSpeciesBatchRowsBySpeciesBatch() { - Multimap<SpeciesBatch, BigfinDataRow> rowsBySpeciesBatch = Multimaps.index(speciesBatchRows, new Function<BigfinDataRow, SpeciesBatch>() { - @Override - public SpeciesBatch apply(BigfinDataRow input) { - return input.getSpeciesOrSpeciesBatch().getBatch(); - } + return Multimaps.index(speciesBatchRows, input -> { + return input.getSpeciesOrSpeciesBatch().getBatch(); }); - return rowsBySpeciesBatch; - } public boolean isStationFound(BigfinDataRow bean) { String station = bean.getStation(); Date date = bean.getDate(); - boolean result = station != null + return station != null && station.equals(operation.getStationNumber()) && date != null && DateUtils.isSameDay(date, operation.getGearShootingStartDate()); - return result; } @@ -198,8 +181,7 @@ public class BigfinImportContext { if (StringUtils.isBlank(code)) { code = species.getReferenceTaxonId().toString(); } - SpeciesProtocol speciesProtocol = speciesProtocolBySurveyCode.get(code); - return speciesProtocol; + return speciesProtocolBySurveyCode.get(code); } @@ -385,7 +367,6 @@ public class BigfinImportContext { public Species getSpeciesWithSurveyCode(Species species) { String refTaxCode = species.getRefTaxCode(); - Species speciesWithSurveyCode = speciesBySurveyCode.get(refTaxCode); - return speciesWithSurveyCode; + return speciesBySurveyCode.get(refTaxCode); } } \ No newline at end of file diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java index e7aa422..083af05 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java @@ -27,7 +27,6 @@ package fr.ifremer.tutti.service.bigfin; import com.google.common.base.Charsets; import com.google.common.base.Function; import com.google.common.base.Preconditions; -import com.google.common.base.Predicate; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Collections2; import com.google.common.collect.ListMultimap; @@ -64,6 +63,7 @@ import fr.ifremer.tutti.service.bigfin.signs.Size; import fr.ifremer.tutti.service.bigfin.signs.VracHorsVrac; import fr.ifremer.tutti.util.Weights; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.IterableUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -160,7 +160,7 @@ public class BigfinImportService extends AbstractTuttiService { } } - BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); // make sure we use survey codes if possible in species batches (see https://forge.codelutin.com/issues/6848) if (!rootSpeciesBatch.isEmptyChildren()) { @@ -178,8 +178,7 @@ public class BigfinImportService extends AbstractTuttiService { } - BigfinImportContext bigfinImportContext = new BigfinImportContext(importFile, operation, catchBatch, signsToCaracteristicValue, speciesBySurveyCode, speciesProtocolBySurveyCode, rootSpeciesBatch); - return bigfinImportContext; + return new BigfinImportContext(importFile, operation, catchBatch, signsToCaracteristicValue, speciesBySurveyCode, speciesProtocolBySurveyCode, rootSpeciesBatch); } @@ -239,8 +238,7 @@ public class BigfinImportService extends AbstractTuttiService { } - BigfinImportResult result = importContext.getResult(); - return result; + return importContext.getResult(); } @@ -253,7 +251,7 @@ public class BigfinImportService extends AbstractTuttiService { for (SpeciesBatch batch : speciesBatchRowsBySpeciesBatch.keySet()) { - List<SpeciesBatchFrequency> existingSpeciesFrequencies = persistenceService.getAllSpeciesBatchFrequency(batch.getId()); + List<SpeciesBatchFrequency> existingSpeciesFrequencies = persistenceService.getAllSpeciesBatchFrequency(batch.getIdAsInt()); Integer deletedNb = persistenceService.countFrequenciesNumber(existingSpeciesFrequencies, false); @@ -263,7 +261,7 @@ public class BigfinImportService extends AbstractTuttiService { Caracteristic lengthStepPmfm = importContext.getLengthStepPmfm(species, persistenceService); List<SpeciesBatchFrequency> frequencies = createFrequencies(batch, bigfinDataRows, lengthStepPmfm); - persistenceService.saveSpeciesBatchFrequency(batch.getId(), frequencies); + persistenceService.saveSpeciesBatchFrequency(batch.getIdAsInt(), frequencies); result.incrementNbFrequenciesDeleted(deletedNb != null ? deletedNb : 0); @@ -368,7 +366,7 @@ public class BigfinImportService extends AbstractTuttiService { commonParameter.getOperation(), category.getPmfmId(), caracteristic, - parentBatch != null ? parentBatch.getId() : null); + parentBatch != null ? parentBatch.getIdAsInt() : null); // useful to be able to save the batch later in the frequency creation batch.setParentBatch(parentBatch); } @@ -376,7 +374,7 @@ public class BigfinImportService extends AbstractTuttiService { } else { // useful to be able to save the batch later in the frequency creation batch.setFishingOperation(commonParameter.getOperation()); - List<SpeciesBatchFrequency> frequencies = persistenceService.getAllSpeciesBatchFrequency(batch.getId()); + List<SpeciesBatchFrequency> frequencies = persistenceService.getAllSpeciesBatchFrequency(batch.getIdAsInt()); batchHasFrequencies = CollectionUtils.isNotEmpty(frequencies); } @@ -392,11 +390,11 @@ public class BigfinImportService extends AbstractTuttiService { } else { // create the frequencies Integer deletedNb = persistenceService.countFrequenciesNumber( - persistenceService.getAllSpeciesBatchFrequency(batch.getId()), false); + persistenceService.getAllSpeciesBatchFrequency(batch.getIdAsInt()), false); List<SpeciesBatchFrequency> frequencies = createFrequencies(batch, bigfinDataRows, commonParameter.getLengthStepPmfm()); - persistenceService.saveSpeciesBatchFrequency(batch.getId(), frequencies); + persistenceService.saveSpeciesBatchFrequency(batch.getIdAsInt(), frequencies); commonParameter.getResult().incrementNbFrequenciesDeleted(deletedNb != null ? deletedNb : 0); @@ -465,7 +463,7 @@ public class BigfinImportService extends AbstractTuttiService { FishingOperation operation, Integer categoryId, Sign signs, - String parentBatchId) { + Integer parentBatchId) { Preconditions.checkArgument(signs.getCategory().equals(categoryId)); @@ -513,17 +511,12 @@ public class BigfinImportService extends AbstractTuttiService { int weightValuesSize = weightValues.size(); // poids non nuls du batch - Collection<Float> notNullWeights = Collections2.filter(weightValues, new Predicate<Float>() { - @Override - public boolean apply(Float input) { - return input != null; - } - }); + Collection<Float> notNullWeights = Collections2.filter(weightValues, input -> input != null); int notNullWeightsSize = notNullWeights.size(); // si présence d'une seule valeur, mettre cette valeur dans le champ "Poids sous échantillon" if (notNullWeightsSize == 1) { - float weight = CollectionUtils.get(notNullWeights, 0); + float weight = IterableUtils.get(notNullWeights, 0); weight = Weights.roundKiloGram(weight / 1000); batch.setWeight(weight); persistenceService.saveSpeciesBatch(batch); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/csv/BigfinDataRowModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/csv/BigfinDataRowModel.java index 94ef5d1..9ca6387 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/csv/BigfinDataRowModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/csv/BigfinDataRowModel.java @@ -203,8 +203,7 @@ public class BigfinDataRowModel extends AbstractTuttiImportModel<BigfinDataRow> private static class SizeValueParser implements ValueParser<Size> { @Override public Size parse(String value) throws ParseException { - Size result = Size.getValue(value.toUpperCase()); - return result; + return Size.getValue(value.toUpperCase()); } } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/Sex.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/Sex.java index a354d78..114f685 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/Sex.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/Sex.java @@ -137,13 +137,7 @@ public enum Sex implements Sign { } public static Function<BigfinDataRow, Sign> newExtractValueFunction() { - return new Function<BigfinDataRow, Sign>() { - @Override - public Sign apply(BigfinDataRow bigfinDataRow) { - Sign result = bigfinDataRow.getSex(); - return result; - } - }; + return BigfinDataRow::getSex; } } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/Size.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/Size.java index 0bb3592..87f9647 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/Size.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/Size.java @@ -123,13 +123,7 @@ public enum Size implements Sign { } public static Function<BigfinDataRow, Sign> newExtractValueFunction() { - return new Function<BigfinDataRow, Sign>() { - @Override - public Sign apply(BigfinDataRow bigfinDataRow) { - Sign result = bigfinDataRow.getSize(); - return result; - } - }; + return BigfinDataRow::getSize; } } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/VracHorsVrac.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/VracHorsVrac.java index 468460c..b4cb51d 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/VracHorsVrac.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/VracHorsVrac.java @@ -105,12 +105,6 @@ public enum VracHorsVrac implements Sign { } public static Function<BigfinDataRow, Sign> newExtractValueFunction() { - return new Function<BigfinDataRow, Sign>() { - @Override - public Sign apply(BigfinDataRow bigfinDataRow) { - Sign result = bigfinDataRow.getVracHorsVrac(); - return result; - } - }; + return BigfinDataRow::getVracHorsVrac; } } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java index 91084b8..17a347c 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java @@ -64,6 +64,7 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import static org.nuiton.i18n.I18n.t; @@ -99,7 +100,7 @@ public class ValidateCruiseOperationsService extends AbstractTuttiService { * * @return the validation results */ - public NuitonValidatorResult validateCruise(ProgressionModel progressionModel, String cruiseId) { + public NuitonValidatorResult validateCruise(ProgressionModel progressionModel, Integer cruiseId) { progressionModel.increments(t("tutti.service.validateCruise.cruise.loading", cruiseId)); Cruise cruise = persistenceService.getCruise(cruiseId); @@ -107,9 +108,7 @@ public class ValidateCruiseOperationsService extends AbstractTuttiService { Decorator<Cruise> decorator = decoratorService.getDecoratorByType(Cruise.class); progressionModel.increments(t("tutti.service.validateCruise.cruise.check", cruiseId, decorator.toString(cruise))); - NuitonValidatorResult validator = validationService.validateValidateCruise(cruise); - - return validator; + return validationService.validateValidateCruise(cruise); } @@ -118,12 +117,12 @@ public class ValidateCruiseOperationsService extends AbstractTuttiService { * * @return a map containing the operations and the validation results */ - public LinkedHashMap<FishingOperation, NuitonValidatorResult> validateOperations(ProgressionModel progressionModel, List<String> operationIds) { + public LinkedHashMap<FishingOperation, NuitonValidatorResult> validateOperations(ProgressionModel progressionModel, List<Integer> operationIds) { LinkedHashMap<FishingOperation, NuitonValidatorResult> result = new LinkedHashMap<>(); Decorator<FishingOperation> decorator = decoratorService.getDecoratorByType(FishingOperation.class); - for (String operationId : operationIds) { + for (Integer operationId : operationIds) { progressionModel.increments(t("tutti.service.validateCruise.operations.loading", operationId)); FishingOperation operation = persistenceService.getFishingOperation(operationId); @@ -146,8 +145,7 @@ public class ValidateCruiseOperationsService extends AbstractTuttiService { * @return the validation result */ public NuitonValidatorResult validateCruiseCruise(Cruise cruise) { - NuitonValidatorResult validator = validationService.validateValidateCruise(cruise); - return validator; + return validationService.validateValidateCruise(cruise); } /** @@ -167,7 +165,7 @@ public class ValidateCruiseOperationsService extends AbstractTuttiService { * @return the validation results */ public NuitonValidatorResult validateCruiseOperation(CatchBatch catches) { - FishingOperation operation = persistenceService.getFishingOperation(catches.getFishingOperation().getId()); + FishingOperation operation = persistenceService.getFishingOperation(catches.getFishingOperation().getIdAsInt()); NuitonValidatorResult validator = validationService.validateValidateFishingOperation(operation); checkOperation(operation, catches, validator); @@ -221,7 +219,7 @@ public class ValidateCruiseOperationsService extends AbstractTuttiService { protected void checkOperation(FishingOperation fishingOperation, NuitonValidatorResult validator) { - String fishingOperationId = fishingOperation.getId(); + Integer fishingOperationId = fishingOperation.getIdAsInt(); boolean withCatchBatch = persistenceService.isFishingOperationWithCatchBatch( @@ -279,7 +277,7 @@ public class ValidateCruiseOperationsService extends AbstractTuttiService { } List<String> errors = Lists.newArrayList(); - String fishingOperationId = fishingOperation.getId(); + Integer fishingOperationId = fishingOperation.getIdAsInt(); NuitonValidatorResult fishingOperationValidationResult = validationService.validateValidateFishingOperation(fishingOperation); transfertValidatorResult(fishingOperationValidationResult, errors); @@ -350,7 +348,7 @@ public class ValidateCruiseOperationsService extends AbstractTuttiService { transfertValidatorResult(accidentalBatchValidatorResult, errors); } } - List<IndividualObservationBatch> individualObservationBatchs = persistenceService.getAllIndividualObservationBatch(fishingOperationId); + List<IndividualObservationBatch> individualObservationBatchs = persistenceService.getAllIndividualObservationBatchsForFishingOperation(fishingOperationId); if (individualObservationBatchs != null) { for (IndividualObservationBatch individualObservationBatch : individualObservationBatchs) { NuitonValidatorResult individualObservationBatchValidatorResult = validationService.validateValidateIndividualObservationBatch(individualObservationBatch); @@ -472,7 +470,7 @@ public class ValidateCruiseOperationsService extends AbstractTuttiService { protected boolean isSpeciesBatchInvalid(SpeciesBatch batch) { if (batch.isChildBatchsEmpty()) { List<SpeciesBatchFrequency> frequencies = - persistenceService.getAllSpeciesBatchFrequency(batch.getId()); + persistenceService.getAllSpeciesBatchFrequency(batch.getIdAsInt()); return !isSpeciesBatchValid(batch, frequencies); } @@ -494,7 +492,7 @@ public class ValidateCruiseOperationsService extends AbstractTuttiService { protected boolean isBenthosBatchInvalid(BenthosBatch batch) { if (batch.isChildBatchsEmpty()) { List<BenthosBatchFrequency> frequencies = - persistenceService.getAllBenthosBatchFrequency(batch.getId()); + persistenceService.getAllBenthosBatchFrequency(batch.getIdAsInt()); return !isBenthosBatchValid( batch, frequencies); @@ -520,13 +518,9 @@ public class ValidateCruiseOperationsService extends AbstractTuttiService { decoratorService.getDecoratorByType(FishingOperation.class).toString(operation))); List<String> messages = validationResult.getMessagesForScope(NuitonValidatorScope.ERROR); - for (String message : messages) { - lines.add(t("tutti.validator.export.message.error", t(message))); - } + lines.addAll(messages.stream().map(message -> t("tutti.validator.export.message.error", t(message))).collect(Collectors.toList())); messages = validationResult.getMessagesForScope(NuitonValidatorScope.WARNING); - for (String message : messages) { - lines.add(t("tutti.validator.export.message.warning", t(message))); - } + lines.addAll(messages.stream().map(message -> t("tutti.validator.export.message.warning", t(message))).collect(Collectors.toList())); return lines; } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java index 6645d12..4421a52 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightCleaningService.java @@ -113,20 +113,20 @@ public class WeightCleaningService extends AbstractTuttiService { * @param cruiseId id of the cruise to check. * @return map of warnings, or empty map if no error found. */ - public Map<String, String> checkCruise(String cruiseId) { + public Map<Integer, String> checkCruise(Integer cruiseId) { if (log.isDebugEnabled()) { log.debug("Will check cruise: " + cruiseId); } - Map<String, String> result = Maps.newLinkedHashMap(); + Map<Integer, String> result = Maps.newLinkedHashMap(); List<FishingOperation> allFishingOperation = persistenceService.getAllFishingOperation(cruiseId); for (FishingOperation fishingOperation : allFishingOperation) { - String fishingOperationId = fishingOperation.getId(); + Integer fishingOperationId = fishingOperation.getIdAsInt(); boolean withCatchBatch = persistenceService.isFishingOperationWithCatchBatch( @@ -179,21 +179,16 @@ public class WeightCleaningService extends AbstractTuttiService { * * @param cruiseId id of the cruise to clean. */ - public void cleanCruise(String cruiseId) { + public void cleanCruise(Integer cruiseId) { if (log.isDebugEnabled()) { log.debug("Will clean cruise: " + cruiseId); } - List<FishingOperation> allFishingOperation = - persistenceService.getAllFishingOperation(cruiseId); - - for (FishingOperation fishingOperation : allFishingOperation) { - - String fishingOperationId = fishingOperation.getId(); + List<Integer> allFishingOperation = + persistenceService.getAllFishingOperationIds(cruiseId); - cleanFishingOperation(fishingOperationId); - } + allFishingOperation.forEach(this::cleanFishingOperation); } /** @@ -203,7 +198,7 @@ public class WeightCleaningService extends AbstractTuttiService { * @param fishingOperationId id of the fishing operation to check * @return the list of all species / benthos which contains a redundant weight */ - public Multimap<String, String> checkFishingOperation(String fishingOperationId) { + public Multimap<String, String> checkFishingOperation(Integer fishingOperationId) { if (log.isDebugEnabled()) { log.debug("Will check fishingOperation: " + fishingOperationId); @@ -266,7 +261,7 @@ public class WeightCleaningService extends AbstractTuttiService { * @param fishingOperationId id of the fishing operation to check * @return {@code true} if some weights were deleted, {@code false} otherwise */ - public boolean cleanFishingOperation(String fishingOperationId) { + public boolean cleanFishingOperation(Integer fishingOperationId) { if (log.isDebugEnabled()) { log.debug("Will clean fishingOperation: " + fishingOperationId); @@ -483,23 +478,21 @@ public class WeightCleaningService extends AbstractTuttiService { Preconditions.checkNotNull(parentBatch); String result = null; - if (parentBatch != null) { - // check the sample weight is different than his parent one - Float sampleCategoryWeight = batch.getSampleCategoryWeight(); - Float parentSampleCategoryWeight = parentBatch.getSampleCategoryWeight(); + // check the sample weight is different than his parent one + Float sampleCategoryWeight = batch.getSampleCategoryWeight(); + Float parentSampleCategoryWeight = parentBatch.getSampleCategoryWeight(); - if (sampleCategoryWeight != null && parentSampleCategoryWeight != null && - Weights.isEqualWeight(parentSampleCategoryWeight, sampleCategoryWeight)) { + if (sampleCategoryWeight != null && parentSampleCategoryWeight != null && + Weights.isEqualWeight(parentSampleCategoryWeight, sampleCategoryWeight)) { - result = t("tutti.service.operations.cleanWeights.error.redundant.sampleCategoryWeight", - weightUnit.fromEntity(sampleCategoryWeight), - weightUnit.getShortLabel(), - getCategoryLabel(batch), - getCategoryLabel(parentBatch) - ); + result = t("tutti.service.operations.cleanWeights.error.redundant.sampleCategoryWeight", + weightUnit.fromEntity(sampleCategoryWeight), + weightUnit.getShortLabel(), + getCategoryLabel(batch), + getCategoryLabel(parentBatch) + ); - } } return result; } @@ -579,8 +572,7 @@ public class WeightCleaningService extends AbstractTuttiService { protected String getCategoryLabel(SpeciesAbleBatch batch) { SampleCategoryModelEntry category = sampleCategoryModel.getCategoryById(batch.getSampleCategoryId()); - String result = category.getLabel(); - return result; + return category.getLabel(); } } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java index 90aa50c..a286255 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/WeightComputingService.java @@ -278,7 +278,7 @@ public class WeightComputingService extends AbstractTuttiService { private int currentSpeciesRowIndex; - public BatchContainer<SpeciesBatch> getComputedSpeciesBatches(String operationId) { + public BatchContainer<SpeciesBatch> getComputedSpeciesBatches(Integer operationId) { BatchContainer<SpeciesBatch> rootSpeciesBatch = null; @@ -301,8 +301,7 @@ public class WeightComputingService extends AbstractTuttiService { protected String getCategoryLabel(Integer sampleCategoryId) { SampleCategoryModelEntry category = context.getSampleCategoryModel().getCategoryById(sampleCategoryId); - String result = category.getLabel(); - return result; + return category.getLabel(); } public Float computeSpeciesBatch(SpeciesBatch batch) { @@ -368,7 +367,7 @@ public class WeightComputingService extends AbstractTuttiService { batch.setComputedWeight(null); - List<SpeciesBatchFrequency> frequencies = persistenceService.getAllSpeciesBatchFrequency(batch.getId()); + List<SpeciesBatchFrequency> frequencies = persistenceService.getAllSpeciesBatchFrequency(batch.getIdAsInt()); if (CollectionUtils.isNotEmpty(frequencies)) { // if there are frequencies, then compute their weight @@ -471,7 +470,7 @@ public class WeightComputingService extends AbstractTuttiService { private int currentBenthosRowIndex; - public BatchContainer<BenthosBatch> getComputedBenthosBatches(String operationId) { + public BatchContainer<BenthosBatch> getComputedBenthosBatches(Integer operationId) { BatchContainer<BenthosBatch> rootBenthosBatch = null; @@ -558,7 +557,7 @@ public class WeightComputingService extends AbstractTuttiService { batch.setComputedWeight(null); - List<BenthosBatchFrequency> frequencies = persistenceService.getAllBenthosBatchFrequency(batch.getId()); + List<BenthosBatchFrequency> frequencies = persistenceService.getAllBenthosBatchFrequency(batch.getIdAsInt()); if (CollectionUtils.isNotEmpty(frequencies)) { // if there are frequencies, then compute their weight @@ -661,7 +660,7 @@ public class WeightComputingService extends AbstractTuttiService { return Weights.roundKiloGram(result); } - public BatchContainer<MarineLitterBatch> getComputedMarineLitterBatches(String fishingOperationId, + public BatchContainer<MarineLitterBatch> getComputedMarineLitterBatches(Integer fishingOperationId, Float marineLitterweight) { BatchContainer<MarineLitterBatch> rootMarineLitterBatch = diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AttachmentRowModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AttachmentRowModel.java index 7dbca30..de1ad8d 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AttachmentRowModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/AttachmentRowModel.java @@ -24,10 +24,8 @@ package fr.ifremer.tutti.service.catches.multipost; import fr.ifremer.tutti.service.csv.AbstractTuttiImportExportModel; import org.nuiton.csv.ValueFormatter; -import org.nuiton.csv.ValueParser; import java.io.File; -import java.text.ParseException; /** * @author Kevin Morin - kmorin@codelutin.com @@ -57,11 +55,8 @@ public class AttachmentRowModel extends AbstractTuttiImportExportModel<Attachmen } }); newMandatoryColumn(AttachmentRow.ATTACHMENT_FILE, - new ValueParser<File>() { - @Override - public File parse(String value) throws ParseException { - return new File(directory, value); - } + value -> { + return new File(directory, value); }); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportService.java index abfffb1..32db8b3 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportService.java @@ -106,7 +106,7 @@ public class MultiPostExportService extends AbstractTuttiService implements Mult */ public void exportCatchBatch(File file, FishingOperation operation) { - String operationId = operation.getId(); + Integer operationId = operation.getIdAsInt(); if (persistenceService.isFishingOperationWithCatchBatch(operationId)) { // export catch batch weights @@ -139,7 +139,7 @@ public class MultiPostExportService extends AbstractTuttiService implements Mult */ public void exportSpecies(File file, FishingOperation operation) { - String operationId = operation.getId(); + Integer operationId = operation.getIdAsInt(); if (persistenceService.isFishingOperationWithCatchBatch(operationId)) { // create rows @@ -181,7 +181,7 @@ public class MultiPostExportService extends AbstractTuttiService implements Mult */ public void exportBenthos(File file, FishingOperation operation) { - String operationId = operation.getId(); + Integer operationId = operation.getIdAsInt(); if (persistenceService.isFishingOperationWithCatchBatch(operationId)) { BatchContainer<BenthosBatch> benthosBatchContainer = @@ -223,7 +223,7 @@ public class MultiPostExportService extends AbstractTuttiService implements Mult */ public void exportMarineLitter(File file, FishingOperation operation) { - String operationId = operation.getId(); + Integer operationId = operation.getIdAsInt(); if (persistenceService.isFishingOperationWithCatchBatch(operationId)) { // create rows @@ -301,7 +301,7 @@ public class MultiPostExportService extends AbstractTuttiService implements Mult */ public void exportIndividualObservation(File file, FishingOperation operation) { List<IndividualObservationBatch> individualObservations = - persistenceService.getAllIndividualObservationBatch(operation.getId()); + persistenceService.getAllIndividualObservationBatchsForFishingOperation(operation.getIdAsInt()); // create rows @@ -391,7 +391,7 @@ public class MultiPostExportService extends AbstractTuttiService implements Mult */ public void exportAccidentalCatch(File file, FishingOperation operation) { List<AccidentalBatch> accidentalCatches = - persistenceService.getAllAccidentalBatch(operation.getId()); + persistenceService.getAllAccidentalBatch(operation.getIdAsInt()); List<AccidentalCatchRow> rows = Lists.newArrayList(); List<CaracteristicRow> caracteristicRows = Lists.newArrayList(); @@ -565,7 +565,7 @@ public class MultiPostExportService extends AbstractTuttiService implements Mult rows.add(row); - addFrequencies(id, batch.getId(), frequencyRows); + addFrequencies(id, batch.getIdAsInt(), frequencyRows); addAttachments(id, batch.getIdAsInt(), ObjectTypeCode.BATCH, attachmentRows); for (SpeciesBatch child : batch.getChildBatchs()) { @@ -595,7 +595,7 @@ public class MultiPostExportService extends AbstractTuttiService implements Mult rows.add(row); - addFrequencies(id, batch.getId(), frequencyRows); + addFrequencies(id, batch.getIdAsInt(), frequencyRows); addAttachments(id, batch.getIdAsInt(), ObjectTypeCode.BATCH, attachmentRows); for (BenthosBatch child : batch.getChildBatchs()) { @@ -611,7 +611,7 @@ public class MultiPostExportService extends AbstractTuttiService implements Mult } protected void addFrequencies(String rowId, - String batchId, + Integer batchId, List<CatchFrequencyRow> frequencyRows) { List<SpeciesBatchFrequency> frequencies = persistenceService.getAllSpeciesBatchFrequency(batchId); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java index 439dc73..6c4d0fc 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java @@ -136,40 +136,35 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult public Map<String, Object> importCatchBatch(final File file, final FishingOperation operation) { - Callable<Map<String, Object>> call = new Callable<Map<String, Object>>() { + Callable<Map<String, Object>> call = () -> { - @Override - public Map<String, Object> call() throws Exception { + File tempDir = ApplicationIOUtil.explodeZip( + context.getConfig().getTmpDirectory(), + file, + n("tutti.service.multipost.uncompress.error")); - File tempDir = ApplicationIOUtil.explodeZip( - context.getConfig().getTmpDirectory(), - file, - n("tutti.service.multipost.uncompress.error")); + //check operation + CatchBatchRowModel weightsModel = new CatchBatchRowModel(MultiPostExportService.CSV_SEPARATOR); + checkSameOperation(tempDir, CATCH_BATCH_FILE, weightsModel, operation); - //check operation - CatchBatchRowModel weightsModel = new CatchBatchRowModel(MultiPostExportService.CSV_SEPARATOR); - checkSameOperation(tempDir, CATCH_BATCH_FILE, weightsModel, operation); + final Map<String, Object> notImportedData = Maps.newHashMap(); - final Map<String, Object> notImportedData = Maps.newHashMap(); + // Import weights + CatchBatch catchBatch = importCatchWeights(tempDir, + operation, + weightsModel, + notImportedData); - // Import weights - CatchBatch catchBatch = importCatchWeights(tempDir, - operation, - weightsModel, - notImportedData); + // Import attachments + importAttachments(tempDir, + catchBatch.getIdAsInt(), + ObjectTypeCode.CATCH_BATCH); - // Import attachments - importAttachments(tempDir, - catchBatch.getIdAsInt(), - ObjectTypeCode.CATCH_BATCH); - - return notImportedData; - } + return notImportedData; }; - Map<String, Object> result = persistenceService.invoke(call); - return result; + return persistenceService.invoke(call); } protected CatchBatch importCatchWeights(File file, @@ -187,7 +182,7 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult Iterator<CatchBatchRow> iterator = importer.iterator(); if (iterator.hasNext()) { CatchBatchRow row = iterator.next(); - CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getIdAsInt()); catchBatch.setFishingOperation(operation); if (catchBatch.getCatchTotalWeight() == null) { @@ -293,72 +288,67 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult public Map<String, Object> importSpecies(final File file, final FishingOperation operation) { - Callable<Map<String, Object>> call = new Callable<Map<String, Object>>() { + Callable<Map<String, Object>> call = () -> { - @Override - public Map<String, Object> call() throws Exception { + File tempDir = ApplicationIOUtil.explodeZip( + context.getConfig().getTmpDirectory(), + file, + n("tutti.service.multipost.uncompress.error")); - File tempDir = ApplicationIOUtil.explodeZip( - context.getConfig().getTmpDirectory(), - file, - n("tutti.service.multipost.uncompress.error")); + //check operation + CatchWeightsRowModel weightsModel = new CatchWeightsRowModel(MultiPostExportService.CSV_SEPARATOR); + checkSameOperation(tempDir, WEIGHTS_FILE, weightsModel, operation); - //check operation - CatchWeightsRowModel weightsModel = new CatchWeightsRowModel(MultiPostExportService.CSV_SEPARATOR); - checkSameOperation(tempDir, WEIGHTS_FILE, weightsModel, operation); + final Map<String, Object> notImportedData = Maps.newHashMap(); - final Map<String, Object> notImportedData = Maps.newHashMap(); + final Map<String, SpeciesBatch> notImportedBatches = Maps.newLinkedHashMap(); - final Map<String, SpeciesBatch> notImportedBatches = Maps.newLinkedHashMap(); + BatchContainer<SpeciesBatch> speciesBatches = + persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); - BatchContainer<SpeciesBatch> speciesBatches = - persistenceService.getRootSpeciesBatch(operation.getId(), false); + TuttiDataContext dataContext = context.getDataContext(); + List<Species> speciesList = dataContext.getReferentSpecies(); - TuttiDataContext dataContext = context.getDataContext(); - List<Species> speciesList = dataContext.getReferentSpecies(); + // Import batches + // map containing the batches by their persistence id - // Import batches - // map containing the batches by their persistence id + final Map<String, SpeciesBatch> batches = importSpeciesBatches( + tempDir, + operation, + speciesBatches, + notImportedBatches, + speciesList); - final Map<String, SpeciesBatch> batches = importSpeciesBatches( - tempDir, - operation, - speciesBatches, - notImportedBatches, - speciesList); + List<Caracteristic> caracteristics = dataContext.getCaracteristics(); - List<Caracteristic> caracteristics = dataContext.getCaracteristics(); + // Import frequencies - // Import frequencies + importSpeciesFrequencies( + tempDir, + batches, + notImportedBatches, + caracteristics); - importSpeciesFrequencies( - tempDir, - batches, - notImportedBatches, - caracteristics); + // Import attachments - // Import attachments + importAttachments(tempDir, + batches, + notImportedBatches, + ObjectTypeCode.BATCH); - importAttachments(tempDir, - batches, - notImportedBatches, - ObjectTypeCode.BATCH); + // Import weights - // Import weights + importSpeciesWeights(tempDir, + operation, + weightsModel, + notImportedData); - importSpeciesWeights(tempDir, - operation, - weightsModel, - notImportedData); + notImportedData.put(BATCHES_KEY, notImportedBatches.values()); - notImportedData.put(BATCHES_KEY, notImportedBatches.values()); - - return notImportedData; - } + return notImportedData; }; - Map<String, Object> result = persistenceService.invoke(call); - return result; + return persistenceService.invoke(call); } protected Map<String, SpeciesBatch> importSpeciesBatches(File file, @@ -402,11 +392,11 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult // get parent batch String parentId = row.getParentId(); - String parentPersistedId = null; + Integer parentPersistedId = null; SpeciesBatch parent = null; if (StringUtils.isNotEmpty(parentId)) { parent = batches.get(parentId); - parentPersistedId = parent.getId(); + parentPersistedId = parent.getIdAsInt(); } SpeciesBatch existingBatch = null; @@ -454,7 +444,7 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult Map<String, SpeciesBatch> batches, Map<String, SpeciesBatch> notImportedBatches, List<Caracteristic> caracteristics) { - ListMultimap<String, SpeciesBatchFrequency> frequencyMap = + ListMultimap<Integer, SpeciesBatchFrequency> frequencyMap = ArrayListMultimap.create(); Reader reader = ApplicationIOUtil.newReader( @@ -479,7 +469,7 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult frequency.setNumber(frequencyRow.getNumber()); frequency.setWeight(frequencyRow.getWeight()); frequency.setBatch(batch); - frequencyMap.put(batch.getId(), frequency); + frequencyMap.put(batch.getIdAsInt(), frequency); } } } @@ -492,7 +482,7 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult IOUtils.closeQuietly(reader); } - for (String batchId : frequencyMap.keySet()) { + for (Integer batchId : frequencyMap.keySet()) { List<SpeciesBatchFrequency> frequencies = frequencyMap.get(batchId); persistenceService.saveSpeciesBatchFrequency(batchId, frequencies); } @@ -513,7 +503,7 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult Iterator<CatchWeightsRow> iterator = importer.iterator(); if (iterator.hasNext()) { CatchWeightsRow row = iterator.next(); - CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getIdAsInt()); catchBatch.setFishingOperation(operation); if (catchBatch.getSpeciesTotalSortedWeight() == null) { @@ -563,67 +553,62 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult public Map<String, Object> importBenthos(final File file, final FishingOperation operation) { - Callable<Map<String, Object>> call = new Callable<Map<String, Object>>() { + Callable<Map<String, Object>> call = () -> { - @Override - public Map<String, Object> call() throws Exception { + File tempDir = ApplicationIOUtil.explodeZip( + context.getConfig().getTmpDirectory(), + file, + n("tutti.service.multipost.uncompress.error")); - File tempDir = ApplicationIOUtil.explodeZip( - context.getConfig().getTmpDirectory(), - file, - n("tutti.service.multipost.uncompress.error")); + //check operation + CatchWeightsRowModel weightsModel = new CatchWeightsRowModel(MultiPostExportService.CSV_SEPARATOR); + checkSameOperation(tempDir, WEIGHTS_FILE, weightsModel, operation); - //check operation - CatchWeightsRowModel weightsModel = new CatchWeightsRowModel(MultiPostExportService.CSV_SEPARATOR); - checkSameOperation(tempDir, WEIGHTS_FILE, weightsModel, operation); + Map<String, Object> notImportedData = Maps.newHashMap(); + final Map<String, BenthosBatch> notImportedBatches = Maps.newLinkedHashMap(); - Map<String, Object> notImportedData = Maps.newHashMap(); - final Map<String, BenthosBatch> notImportedBatches = Maps.newLinkedHashMap(); + BatchContainer<BenthosBatch> benthosBatches = + persistenceService.getRootBenthosBatch(operation.getIdAsInt(), false); - BatchContainer<BenthosBatch> benthosBatches = - persistenceService.getRootBenthosBatch(operation.getId(), false); + TuttiDataContext dataContext = context.getDataContext(); + List<Species> speciesList = dataContext.getReferentSpecies(); - TuttiDataContext dataContext = context.getDataContext(); - List<Species> speciesList = dataContext.getReferentSpecies(); + // Import batches + // map containing the batches by their persistence id + final Map<String, BenthosBatch> batches = importBenthosBatches( + tempDir, + operation, + benthosBatches, + notImportedBatches, + speciesList); - // Import batches - // map containing the batches by their persistence id - final Map<String, BenthosBatch> batches = importBenthosBatches( - tempDir, - operation, - benthosBatches, - notImportedBatches, - speciesList); + // Import frequencies - // Import frequencies + importBenthosFrequencies( + tempDir, + batches, + notImportedBatches, + dataContext.getCaracteristics()); - importBenthosFrequencies( - tempDir, - batches, - notImportedBatches, - dataContext.getCaracteristics()); + // Import attachments - // Import attachments + importAttachments(tempDir, + batches, + notImportedBatches, + ObjectTypeCode.BATCH); - importAttachments(tempDir, - batches, - notImportedBatches, - ObjectTypeCode.BATCH); + // Import weights - // Import weights + importBenthosWeights(tempDir, + operation, + weightsModel, + notImportedData); - importBenthosWeights(tempDir, - operation, - weightsModel, - notImportedData); - - notImportedData.put(BATCHES_KEY, notImportedBatches.values()); - return notImportedData; - } + notImportedData.put(BATCHES_KEY, notImportedBatches.values()); + return notImportedData; }; - Map<String, Object> result = persistenceService.invoke(call); - return result; + return persistenceService.invoke(call); } protected Map<String, BenthosBatch> importBenthosBatches(File file, @@ -666,11 +651,11 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult // get parent batch String parentId = row.getParentId(); - String parentPersistedId = null; + Integer parentPersistedId = null; BenthosBatch parent = null; if (StringUtils.isNotEmpty(parentId)) { parent = batches.get(parentId); - parentPersistedId = parent.getId(); + parentPersistedId = parent.getIdAsInt(); } BenthosBatch existingBatch = null; @@ -718,7 +703,7 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult Map<String, BenthosBatch> batches, Map<String, BenthosBatch> notImportedBatches, List<Caracteristic> caracteristics) { - ListMultimap<String, BenthosBatchFrequency> frequencyMap = + ListMultimap<Integer, BenthosBatchFrequency> frequencyMap = ArrayListMultimap.create(); Reader reader = ApplicationIOUtil.newReader( @@ -742,7 +727,7 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult frequency.setNumber(frequencyRow.getNumber()); frequency.setWeight(frequencyRow.getWeight()); frequency.setBatch(batch); - frequencyMap.put(batch.getId(), frequency); + frequencyMap.put(batch.getIdAsInt(), frequency); } } } @@ -755,7 +740,7 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult IOUtils.closeQuietly(reader); } - for (String batchId : frequencyMap.keySet()) { + for (Integer batchId : frequencyMap.keySet()) { List<BenthosBatchFrequency> frequencies = frequencyMap.get(batchId); persistenceService.saveBenthosBatchFrequency(batchId, frequencies); } @@ -776,7 +761,7 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult Iterator<CatchWeightsRow> iterator = importer.iterator(); if (iterator.hasNext()) { CatchWeightsRow row = iterator.next(); - CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getIdAsInt()); catchBatch.setFishingOperation(operation); if (catchBatch.getBenthosTotalSortedWeight() == null) { @@ -827,64 +812,59 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult public Map<String, Object> importMarineLitter(final File file, final FishingOperation operation) { - Callable<Map<String, Object>> call = new Callable<Map<String, Object>>() { + Callable<Map<String, Object>> call = () -> { + File tempDir = ApplicationIOUtil.explodeZip( + context.getConfig().getTmpDirectory(), + file, + n("tutti.service.multipost.uncompress.error")); - @Override - public Map<String, Object> call() throws Exception { - File tempDir = ApplicationIOUtil.explodeZip( - context.getConfig().getTmpDirectory(), - file, - n("tutti.service.multipost.uncompress.error")); + //check operation + MarineLitterWeightRowModel weightModel = new MarineLitterWeightRowModel(MultiPostExportService.CSV_SEPARATOR); + checkSameOperation(tempDir, WEIGHTS_FILE, weightModel, operation); - //check operation - MarineLitterWeightRowModel weightModel = new MarineLitterWeightRowModel(MultiPostExportService.CSV_SEPARATOR); - checkSameOperation(tempDir, WEIGHTS_FILE, weightModel, operation); + Integer operationId = operation.getIdAsInt(); - String operationId = operation.getId(); + Map<String, Object> notImportedData = Maps.newHashMap(); + final Map<String, MarineLitterBatch> notImportedBatches = Maps.newLinkedHashMap(); - Map<String, Object> notImportedData = Maps.newHashMap(); - final Map<String, MarineLitterBatch> notImportedBatches = Maps.newLinkedHashMap(); + BatchContainer<MarineLitterBatch> marineLitterBatches = + persistenceService.getRootMarineLitterBatch(operationId); - BatchContainer<MarineLitterBatch> marineLitterBatches = - persistenceService.getRootMarineLitterBatch(operationId); + Caracteristic marineLitterCategoryCaracteristic = + persistenceService.getMarineLitterCategoryCaracteristic(); + Caracteristic marineLitterSizeCategoryCaracteristic = + persistenceService.getMarineLitterSizeCategoryCaracteristic(); - Caracteristic marineLitterCategoryCaracteristic = - persistenceService.getMarineLitterCategoryCaracteristic(); - Caracteristic marineLitterSizeCategoryCaracteristic = - persistenceService.getMarineLitterSizeCategoryCaracteristic(); + // Import batches + // map containing the batches by their persistence id - // Import batches - // map containing the batches by their persistence id + final Map<String, MarineLitterBatch> batches = importMarineLitterBatches( + tempDir, + operation, + marineLitterCategoryCaracteristic, + marineLitterSizeCategoryCaracteristic, + marineLitterBatches, + notImportedBatches); - final Map<String, MarineLitterBatch> batches = importMarineLitterBatches( - tempDir, - operation, - marineLitterCategoryCaracteristic, - marineLitterSizeCategoryCaracteristic, - marineLitterBatches, - notImportedBatches); + // Import attachments - // Import attachments + importAttachments(tempDir, + batches, + notImportedBatches, + ObjectTypeCode.BATCH); - importAttachments(tempDir, - batches, - notImportedBatches, - ObjectTypeCode.BATCH); + // Import weights - // Import weights + importMarineLitterCatchWeights(tempDir, + operation, + weightModel, + notImportedData); - importMarineLitterCatchWeights(tempDir, - operation, - weightModel, - notImportedData); + notImportedData.put(BATCHES_KEY, notImportedBatches.values()); + return notImportedData; - notImportedData.put(BATCHES_KEY, notImportedBatches.values()); - return notImportedData; - - } }; - Map<String, Object> result = persistenceService.invoke(call); - return result; + return persistenceService.invoke(call); } protected Map<String, MarineLitterBatch> importMarineLitterBatches(File file, FishingOperation operation, @@ -970,7 +950,7 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult Iterator<MarineLitterWeightRow> iterator = weight.iterator(); if (iterator.hasNext()) { MarineLitterWeightRow row = iterator.next(); - CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getIdAsInt()); catchBatch.setFishingOperation(operation); if (catchBatch.getMarineLitterTotalWeight() == null) { @@ -997,49 +977,45 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult public void importIndividualObservation(final File file, final FishingOperation operation) { - Callable<Void> call = new Callable<Void>() { + Callable<Void> call = () -> { + File tempDir = ApplicationIOUtil.explodeZip( + context.getConfig().getTmpDirectory(), + file, + n("tutti.service.multipost.uncompress.error")); - @Override - public Void call() throws Exception { - File tempDir = ApplicationIOUtil.explodeZip( - context.getConfig().getTmpDirectory(), - file, - n("tutti.service.multipost.uncompress.error")); + //check operation + FishingOperationRowModel operationModel = + new FishingOperationRowModel(MultiPostExportService.CSV_SEPARATOR); + checkSameOperation(tempDir, WEIGHTS_FILE, operationModel, operation); - //check operation - FishingOperationRowModel operationModel = - new FishingOperationRowModel(MultiPostExportService.CSV_SEPARATOR); - checkSameOperation(tempDir, WEIGHTS_FILE, operationModel, operation); + TuttiDataContext dataContext = context.getDataContext(); + List<Species> speciesList = dataContext.getReferentSpecies(); + List<Caracteristic> caracteristics = dataContext.getCaracteristicWithProtected(); - TuttiDataContext dataContext = context.getDataContext(); - List<Species> speciesList = dataContext.getReferentSpecies(); - List<Caracteristic> caracteristics = dataContext.getCaracteristicWithProtected(); + // Import batches + // map containing the batches by their persistence id + final Map<String, IndividualObservationBatch> batches = importIndividualObservationBatches( + tempDir, + operation, + speciesList, + caracteristics); - // Import batches - // map containing the batches by their persistence id - final Map<String, IndividualObservationBatch> batches = importIndividualObservationBatches( - tempDir, - operation, - speciesList, - caracteristics); + // Import caracteristics - // Import caracteristics - - importIndividualObservationCaracteristics(tempDir, - batches, - caracteristics); + importIndividualObservationCaracteristics(tempDir, + batches, + caracteristics); - // Persist batches + // Persist batches - for (IndividualObservationBatch batch : batches.values()) { - persistenceService.createIndividualObservationBatch(batch); - } + for (IndividualObservationBatch batch : batches.values()) { + persistenceService.createIndividualObservationBatch(batch); + } - // Import attachments + // Import attachments - importAttachments(tempDir, batches, ObjectTypeCode.SAMPLE); - return null; - } + importAttachments(tempDir, batches, ObjectTypeCode.SAMPLE); + return null; }; persistenceService.invoke(call); } @@ -1154,55 +1130,51 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult */ public void importAccidentalCatches(final File file, final FishingOperation operation) { - Callable<Void> call = new Callable<Void>() { - - @Override - public Void call() throws Exception { - File tempDir = ApplicationIOUtil.explodeZip( - context.getConfig().getTmpDirectory(), - file, - n("tutti.service.multipost.uncompress.error")); - - //check operation - FishingOperationRowModel operationModel = - new FishingOperationRowModel(MultiPostExportService.CSV_SEPARATOR); - checkSameOperation(tempDir, WEIGHTS_FILE, operationModel, operation); - - TuttiDataContext dataContext = context.getDataContext(); - List<Species> speciesList = dataContext.getReferentSpecies(); - List<Caracteristic> caracteristics = dataContext.getCaracteristicWithProtected(); - - Caracteristic sexCaracteristic = persistenceService.getSexCaracteristic(); - Caracteristic deadOrAliveCaracteristic = persistenceService.getDeadOrAliveCaracteristic(); - - // Import batches - // map containing the batches by their persistence id - Map<String, AccidentalBatch> batches = importAccidentalCatchesBatches( - tempDir, - operation, - sexCaracteristic, - deadOrAliveCaracteristic, - speciesList, - caracteristics - ); - - // Import caracteristics - - importAccidentalCatchesCaracteristics(tempDir, - batches, - caracteristics); + Callable<Void> call = () -> { + File tempDir = ApplicationIOUtil.explodeZip( + context.getConfig().getTmpDirectory(), + file, + n("tutti.service.multipost.uncompress.error")); + + //check operation + FishingOperationRowModel operationModel = + new FishingOperationRowModel(MultiPostExportService.CSV_SEPARATOR); + checkSameOperation(tempDir, WEIGHTS_FILE, operationModel, operation); + + TuttiDataContext dataContext = context.getDataContext(); + List<Species> speciesList = dataContext.getReferentSpecies(); + List<Caracteristic> caracteristics = dataContext.getCaracteristicWithProtected(); + + Caracteristic sexCaracteristic = persistenceService.getSexCaracteristic(); + Caracteristic deadOrAliveCaracteristic = persistenceService.getDeadOrAliveCaracteristic(); + + // Import batches + // map containing the batches by their persistence id + Map<String, AccidentalBatch> batches = importAccidentalCatchesBatches( + tempDir, + operation, + sexCaracteristic, + deadOrAliveCaracteristic, + speciesList, + caracteristics + ); - // Persist batches + // Import caracteristics - for (AccidentalBatch batch : batches.values()) { - persistenceService.createAccidentalBatch(batch); - } + importAccidentalCatchesCaracteristics(tempDir, + batches, + caracteristics); - // Import attachments + // Persist batches - importAttachments(tempDir, batches, ObjectTypeCode.SAMPLE); - return null; + for (AccidentalBatch batch : batches.values()) { + persistenceService.createAccidentalBatch(batch); } + + // Import attachments + + importAttachments(tempDir, batches, ObjectTypeCode.SAMPLE); + return null; }; persistenceService.invoke(call); } @@ -1376,18 +1348,15 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult final Map<String, R> notImportedData, ObjectTypeCode objectType) { - Function<AttachmentRow, Integer> getObjetcIdFunction = new Function<AttachmentRow, Integer>() { - @Override - public Integer apply(AttachmentRow input) { - Integer result = null; - if (notImportedData.get(input.getBatchId()) == null) { - R batch = data.get(input.getBatchId()); - if (batch != null) { - result = batch.getIdAsInt(); - } + Function<AttachmentRow, Integer> getObjetcIdFunction = input -> { + Integer result = null; + if (notImportedData.get(input.getBatchId()) == null) { + R batch = data.get(input.getBatchId()); + if (batch != null) { + result = batch.getIdAsInt(); } - return result; } + return result; }; Reader reader = ApplicationIOUtil.newReader( @@ -1440,16 +1409,13 @@ public class MultiPostImportService extends AbstractTuttiService implements Mult final Map<String, R> data, ObjectTypeCode objectType) { - Function<AttachmentRow, Integer> getObjetcIdFunction = new Function<AttachmentRow, Integer>() { - @Override - public Integer apply(AttachmentRow input) { - Integer result = null; - R batch = data.get(input.getBatchId()); - if (batch != null) { - result = batch.getIdAsInt(); - } - return result; + Function<AttachmentRow, Integer> getObjetcIdFunction = input -> { + Integer result = null; + R batch = data.get(input.getBatchId()); + if (batch != null) { + result = batch.getIdAsInt(); } + return result; }; Reader reader = ApplicationIOUtil.newReader( diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/AbstractTuttiImportExportModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/AbstractTuttiImportExportModel.java index 3995c3f..87b300e 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/AbstractTuttiImportExportModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/AbstractTuttiImportExportModel.java @@ -73,7 +73,7 @@ public abstract class AbstractTuttiImportExportModel<M> extends AbstractImportEx } public <T> ExportableColumn<M, T> newNullableColumnForExport(String headerName, String propertyName, ValueFormatter<T> valueFormatter) { - return modelBuilder.newColumnForExport(headerName, new BeanNullableGetter<M, T>(propertyName), valueFormatter); + return modelBuilder.newColumnForExport(headerName, new BeanNullableGetter<>(propertyName), valueFormatter); } public ExportableColumn<M, String> newNullableColumnForExport(String headerName, String propertyName) { @@ -81,7 +81,7 @@ public abstract class AbstractTuttiImportExportModel<M> extends AbstractImportEx } public <T> ExportableColumn<M, T> newIndexNullableColumnForExport(String headerName, String collectionName, int order, String propertyName, ValueFormatter<T> valueFormatter) { - return modelBuilder.newColumnForExport(headerName, new BeanIndexNullableGetter<M, T>(collectionName, order, propertyName), valueFormatter); + return modelBuilder.newColumnForExport(headerName, new BeanIndexNullableGetter<>(collectionName, order, propertyName), valueFormatter); } public ExportableColumn<M, String> newIndexNullableColumnForExport(String headerName, String collectionName, int order, String propertyName) { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/AbstractTuttiImportModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/AbstractTuttiImportModel.java index effed04..55fbaca 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/AbstractTuttiImportModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/AbstractTuttiImportModel.java @@ -42,11 +42,11 @@ public abstract class AbstractTuttiImportModel<M> extends AbstractImportModel<M> } public <E extends TuttiEntity> ForeignKeyParserFormatter<E> newForeignKeyParserFormatter(Class<E> type, String propertyName, Map<String, E> universe) { - return new ForeignKeyParserFormatter<E>(type, propertyName, universe); + return new ForeignKeyParserFormatter<>(type, propertyName, universe); } public <E extends TuttiEntity> ForeignKeyListParserFormatter<E> newForeignKeyListParserFormatter(Class<E> type, String propertyName, Map<String, E> universe) { - return new ForeignKeyListParserFormatter<E>(type, propertyName, universe); + return new ForeignKeyListParserFormatter<>(type, propertyName, universe); } } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CsvComsumer.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CsvComsumer.java index ab4226e..3f4d63e 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CsvComsumer.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CsvComsumer.java @@ -84,8 +84,7 @@ public abstract class CsvComsumer<O, M extends AbstractTuttiImportExportModel<O> @Override public Iterator<ImportRow<O>> iterator() { - Iterator<ImportRow<O>> iterator = this.importer.iterator(); - return iterator; + return this.importer.iterator(); } @Override @@ -118,8 +117,7 @@ public abstract class CsvComsumer<O, M extends AbstractTuttiImportExportModel<O> } - String message = t("tutti.csv.import.error.on.row", bean.getLineNumber(), Joiner.on("\n").join(errors)); - return message; + return t("tutti.csv.import.error.on.row", bean.getLineNumber(), Joiner.on("\n").join(errors)); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/GearParserFormatter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/GearParserFormatter.java index d31ebb5..cc6f178 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/GearParserFormatter.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/GearParserFormatter.java @@ -74,8 +74,7 @@ public class GearParserFormatter extends EntityParserFormatterSupport<Gear> { @Override protected String formatBusiness(Gear value) { - String result = Gears.GET_NAME.apply(value); - return result; + return Gears.GET_NAME.apply(value); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/HarbourParserFormatter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/HarbourParserFormatter.java index d0a6646..7383911 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/HarbourParserFormatter.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/HarbourParserFormatter.java @@ -70,8 +70,7 @@ public class HarbourParserFormatter extends EntityParserFormatterSupport<TuttiLo @Override public String formatBusiness(TuttiLocation value) { - String result = TuttiLocations.GET_NAME.apply(value); - return result; + return TuttiLocations.GET_NAME.apply(value); } } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/IntegerListParserFormatter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/IntegerListParserFormatter.java index 371b9db..959c111 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/IntegerListParserFormatter.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/IntegerListParserFormatter.java @@ -24,7 +24,6 @@ package fr.ifremer.tutti.service.csv; * #L% */ -import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.collect.Lists; import org.apache.commons.lang3.StringUtils; @@ -43,13 +42,7 @@ public class IntegerListParserFormatter implements ValueParserFormatter<List<Int @Override public String format(List<Integer> value) { - List<String> decoratedValues = - Lists.transform(value, new Function<Integer, String>() { - @Override - public String apply(Integer input) { - return input.toString(); - } - }); + List<String> decoratedValues = Lists.transform(value, Object::toString); return Joiner.on('|').join(decoratedValues); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/TuttiCsvUtil.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/TuttiCsvUtil.java index b35c8fd..189a10e 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/TuttiCsvUtil.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/TuttiCsvUtil.java @@ -118,22 +118,16 @@ public class TuttiCsvUtil extends Common { // } // }; - public static final ValueFormatter<Species> SPECIES_SURVEY_CODE_FORMATTER = new ValueFormatter<Species>() { - @Override - public String format(Species s) { - Preconditions.checkNotNull(s, t("tutti.service.error.species.null")); - String surveyCode = s.getSurveyCode(); - return surveyCode == null ? "" : surveyCode; - } + public static final ValueFormatter<Species> SPECIES_SURVEY_CODE_FORMATTER = s -> { + Preconditions.checkNotNull(s, t("tutti.service.error.species.null")); + String surveyCode = s.getSurveyCode(); + return surveyCode == null ? "" : surveyCode; }; - public static final ValueFormatter<Species> SPECIES_REF_TAX_CODE_FORMATTER = new ValueFormatter<Species>() { - @Override - public String format(Species s) { - Preconditions.checkNotNull(s, t("tutti.service.error.species.null")); - String surveyCode = s.getRefTaxCode(); - return surveyCode == null ? "" : surveyCode; - } + public static final ValueFormatter<Species> SPECIES_REF_TAX_CODE_FORMATTER = s -> { + Preconditions.checkNotNull(s, t("tutti.service.error.species.null")); + String surveyCode = s.getRefTaxCode(); + return surveyCode == null ? "" : surveyCode; }; public static ValueParserFormatter<Float> WEIGHT_PARSER_FORMATTER = new FloatParserFormatter(null, true) { @@ -149,14 +143,13 @@ public class TuttiCsvUtil extends Common { @Override protected Float parseNoneEmptyValue(String value) { Float aFloat = super.parseNoneEmptyValue(value); - float result = Weights.roundKiloGram(aFloat); - return result; + return Weights.roundKiloGram(aFloat); } }; public static final CommentParserFormatter COMMENT_PARSER_FORMATTER = new CommentParserFormatter(); - public static final ValueParserFormatter<List<String>> COMMENT_LIST_PARSER_FORMATTER = new CommentListParserFormatter(COMMENT_PARSER_FORMATTER); +// public static final ValueParserFormatter<List<String>> COMMENT_LIST_PARSER_FORMATTER = new CommentListParserFormatter(COMMENT_PARSER_FORMATTER); public static final ValueFormatter<Caracteristic> CARACTERISTIC_FORMATTER = CaracteristicParserFormatter.newFormatter(); @@ -174,7 +167,7 @@ public class TuttiCsvUtil extends Common { public static final ValueFormatter<Gear> GEAR_TECHNICAL_FORMATTER = GearParserFormatter.newTechnicalFormatter(); - public static final ValueFormatter<List<Gear>> GEAR_LIST_FORMATTER = GearListParserFormatter.newFormatter(GearParserFormatter.newFormatter()); +// public static final ValueFormatter<List<Gear>> GEAR_LIST_FORMATTER = GearListParserFormatter.newFormatter(GearParserFormatter.newFormatter()); public static final ValueFormatter<List<Gear>> GEAR_LIST_TECHNICAL_FORMATTER = GearListParserFormatter.newFormatter(GearParserFormatter.newTechnicalFormatter()); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/VesselParserFormatter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/VesselParserFormatter.java index bad8e8a..a66d04e 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/VesselParserFormatter.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/VesselParserFormatter.java @@ -74,8 +74,7 @@ public class VesselParserFormatter extends EntityParserFormatterSupport<Vessel> @Override public String formatBusiness(Vessel value) { - String result = Vessels.GET_REGISTRATION_CODE_OR_INTERNATIONAL_REGISTRATION_CODE.apply(value); - return result; + return Vessels.GET_REGISTRATION_CODE_OR_INTERNATIONAL_REGISTRATION_CODE.apply(value); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportBatchEntry.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportBatchEntry.java index 1429085..dec51ea 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportBatchEntry.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportBatchEntry.java @@ -102,7 +102,6 @@ public class ExportBatchEntry { totSize += (size * number); totNumber += number; } - Float result = totNumber == 0 ? null : totSize / (float) totNumber; - return result; + return totNumber == 0 ? null : totSize / (float) totNumber; } } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportCatchContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportCatchContext.java index 8049013..d85ced5 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportCatchContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/ExportCatchContext.java @@ -74,7 +74,7 @@ public class ExportCatchContext { public static ExportCatchContext newExportContext(PersistenceService persistenceService, WeightComputingService weightComputingService, - String fishingOperationId, + Integer fishingOperationId, boolean loadFrequencies) { FishingOperation fishingOperation = @@ -112,15 +112,14 @@ public class ExportCatchContext { Predicate<SpeciesAbleBatch> vracPredicate = persistenceService.getVracBatchPredicate(); - ExportCatchContext result = new ExportCatchContext(vracPredicate, - fishingOperation, - catchBatch, - rootSpeciesBatch, - speciesFrequencies, - rootBenthosBatch, - benthosFrequencies, - marineLitterBatches); - return result; + return new ExportCatchContext(vracPredicate, + fishingOperation, + catchBatch, + rootSpeciesBatch, + speciesFrequencies, + rootBenthosBatch, + benthosFrequencies, + marineLitterBatches); } @@ -147,10 +146,9 @@ public class ExportCatchContext { } public float getCatchTotalWeight() { - float result = Numbers.getValueOrComputedValue( + return Numbers.getValueOrComputedValue( catchBatch.getCatchTotalWeight(), catchBatch.getCatchTotalComputedWeight()); - return result; } public float getCatchTotalSortedWeight() { @@ -161,17 +159,15 @@ public class ExportCatchContext { } public float getSpeciesTotalSortedWeight() { - float result = Numbers.getValueOrComputedValue( + return Numbers.getValueOrComputedValue( catchBatch.getSpeciesTotalSortedWeight(), catchBatch.getSpeciesTotalSortedComputedWeight()); - return result; } public float getBenthosTotalSortedWeight() { - float result = Numbers.getValueOrComputedValue( + return Numbers.getValueOrComputedValue( catchBatch.getBenthosTotalSortedWeight(), catchBatch.getBenthosTotalSortedComputedWeight()); - return result; } public boolean withSpeciesBatches() { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportService.java index 5801d9b..d542760 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportService.java @@ -79,18 +79,19 @@ public class CatchesPdfExportService extends AbstractTuttiService { * Generate the PDF report for the fiven cruise. * * @param targetFile pdf file to generate + * @param cruiseId cruise id * @param locale generated pdf locale */ public void generateCruisePDFFile(File targetFile, - String cruiseId, + Integer cruiseId, Locale locale) { - List<String> allFishingOperation = + List<Integer> allFishingOperation = persistenceService.getAllFishingOperationIds(cruiseId); List<Map<String, Object>> operations = Lists.newArrayList(); - for (String operationId : allFishingOperation) { + for (Integer operationId : allFishingOperation) { prepareOperation(operationId, operations); @@ -108,7 +109,7 @@ public class CatchesPdfExportService extends AbstractTuttiService { * @since 2.7 */ public void generateFishingOperationPDFFile(File targetFile, - String fishingOperationId, + Integer fishingOperationId, Locale locale) { List<Map<String, Object>> operations = Lists.newArrayList(); @@ -118,7 +119,7 @@ public class CatchesPdfExportService extends AbstractTuttiService { generatePdf(targetFile, locale, operations); } - protected void prepareOperation(String fishingOperationId, List<Map<String, Object>> operations) { + protected void prepareOperation(Integer fishingOperationId, List<Map<String, Object>> operations) { // get operation and catch data boolean withCatchBatch = @@ -128,7 +129,7 @@ public class CatchesPdfExportService extends AbstractTuttiService { if (!withCatchBatch) { if (log.isWarnEnabled()) { log.warn("Skip fishing operation " + fishingOperationId + - " since no catchBatch associated."); + " since no catchBatch associated."); } return; } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportService.java index a39f05b..73ea3df 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportService.java @@ -83,7 +83,7 @@ public class CatchesSumatraExportService extends AbstractTuttiService { * @since 2.0 */ public SumatraExportResult exportCruiseForSumatra(File file, - String cruiseId, + Integer cruiseId, ProgressionModel progressionModel) { Preconditions.checkNotNull(cruiseId, "Cannot export a null cruise"); @@ -100,7 +100,7 @@ public class CatchesSumatraExportService extends AbstractTuttiService { progressionModel.increments(t("tutti.service.sumatra.export.step.load.fishingOperationIds")); - List<String> operations = + List<Integer> operations = persistenceService.getAllFishingOperationIds(cruiseId); if (log.isInfoEnabled()) { @@ -126,8 +126,8 @@ public class CatchesSumatraExportService extends AbstractTuttiService { * @since 2.7 */ public SumatraExportResult exportFishingOperationForSumatra(File file, - String cruiseId, - String fishingOperationId, + Integer cruiseId, + Integer fishingOperationId, ProgressionModel progressionModel) { Preconditions.checkNotNull(file, "Cannot export to a null file"); @@ -144,7 +144,7 @@ public class CatchesSumatraExportService extends AbstractTuttiService { Cruise cruise = persistenceService.getCruise(cruiseId); Preconditions.checkNotNull(cruise, "Cruise [" + cruiseId + "] not found"); - List<String> operations = Lists.newArrayList(fishingOperationId); + List<Integer> operations = Lists.newArrayList(fishingOperationId); SumatraExportResult result = new SumatraExportResult(); @@ -154,7 +154,7 @@ public class CatchesSumatraExportService extends AbstractTuttiService { } protected void prepareOperationsAndExport(File file, - List<String> operations, + List<Integer> operations, ProgressionModel progressionModel, SumatraExportResult result) { @@ -170,7 +170,7 @@ public class CatchesSumatraExportService extends AbstractTuttiService { TaxonCache speciesCache = TaxonCaches.createSpeciesCacheWithoutVernacularCode(persistenceService, protocol); TaxonCache benthosCache = TaxonCaches.createBenthosCacheWithoutVernacularCode(persistenceService, protocol); - for (String operationId : operations) { + for (Integer operationId : operations) { progressionModel.increments(t("tutti.service.sumatra.export.step.load.fishingOperation", operationId)); if (!persistenceService.isFishingOperationWithCatchBatch(operationId)) { @@ -206,7 +206,7 @@ public class CatchesSumatraExportService extends AbstractTuttiService { TaxonCache benthosCache, CatchRowModel csvModel, List<CatchRow> rows, - String operationId, + Integer operationId, SumatraExportResult result) { ExportCatchContext exportContext = ExportCatchContext.newExportContext( diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportFishingOperationData.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportFishingOperationData.java index f9f57ad..5e8c1a2 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportFishingOperationData.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportFishingOperationData.java @@ -49,7 +49,7 @@ public class ToConfirmReportFishingOperationData { private static final Log log = LogFactory.getLog(ToConfirmReportFishingOperationData.class); public static ToConfirmReportFishingOperationData create(PersistenceService persistenceService, - String fishingOperationId) { + Integer fishingOperationId) { boolean withCatchBatch = persistenceService.isFishingOperationWithCatchBatch(fishingOperationId); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportService.java index 02dc8e1..303db0c 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportService.java @@ -84,14 +84,14 @@ public class ToConfirmReportService extends AbstractTuttiService { benthosWeightUnit = context.getConfig().getBenthosWeightUnit(); } - public int getNumberOfSteps(String cruiseId) { + public int getNumberOfSteps(Integer cruiseId) { - List<String> allFishingOperation = persistenceService.getAllFishingOperationIds(cruiseId); + List<Integer> allFishingOperation = persistenceService.getAllFishingOperationIds(cruiseId); return allFishingOperation.size() + 3; } - public void createToConfirmReport(File file, String cruiseId, ProgressionModel progressionModel) { + public void createToConfirmReport(File file, Integer cruiseId, ProgressionModel progressionModel) { progressionModel.increments(t("tutti.toconfirmReport.loading.cruise", cruiseId)); @@ -107,14 +107,14 @@ public class ToConfirmReportService extends AbstractTuttiService { TaxonCache speciesCache = TaxonCaches.createSpeciesCache(persistenceService, protocol); TaxonCache benthosCache = TaxonCaches.createBenthosCache(persistenceService, protocol); - List<String> allFishingOperation = persistenceService.getAllFishingOperationIds(cruiseId); + List<Integer> allFishingOperation = persistenceService.getAllFishingOperationIds(cruiseId); ToConfirmReportBean reportBean = new ToConfirmReportBean(cruise, speciesWeightUnit, benthosWeightUnit); int currentOperation = 1; int nbOperations = allFishingOperation.size(); - for (String operationId : allFishingOperation) { + for (Integer operationId : allFishingOperation) { progressionModel.increments(t("tutti.toconfirmReport.loading.operation", operationId, currentOperation++, nbOperations)); @@ -169,11 +169,9 @@ public class ToConfirmReportService extends AbstractTuttiService { benthosCatchList = null; } - ToConfirmReportFishingOperationBean op = new ToConfirmReportFishingOperationBean(fishingOperationData.getFishingOperation(), - speciesCatchList, - benthosCatchList); - - return op; + return new ToConfirmReportFishingOperationBean(fishingOperationData.getFishingOperation(), + speciesCatchList, + benthosCatchList); } @@ -213,8 +211,7 @@ public class ToConfirmReportService extends AbstractTuttiService { protected String getBatchDecoratedSampleCategoryValue(SpeciesAbleBatch batch) { Serializable sampleCategoryValue = batch.getSampleCategoryValue(); - String decoratedCategory = decoratorService.getDecorator(sampleCategoryValue).toString(sampleCategoryValue); - return decoratedCategory; + return decoratorService.getDecorator(sampleCategoryValue).toString(sampleCategoryValue); } protected void generatePdf(File targetFile, ToConfirmReportBean reportBean) { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatArchive.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatArchive.java index ede41b5..83f13af 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatArchive.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatArchive.java @@ -116,8 +116,7 @@ public class GenericFormatArchive implements Serializable { try { File workingDirectory = Files.createTempDirectory(tempDirectory.toPath(), "genericImport").toFile(); - GenericFormatArchive archive = new GenericFormatArchive(ArchiveMode.IMPORT, archiveFile, workingDirectory); - return archive; + return new GenericFormatArchive(ArchiveMode.IMPORT, archiveFile, workingDirectory); } catch (IOException e) { throw new ApplicationTechnicalException("Could not create generic format import archive", e); @@ -130,8 +129,7 @@ public class GenericFormatArchive implements Serializable { try { File workingDirectory = Files.createTempDirectory(tempDirectory.toPath(), "genericExport").toFile(); - GenericFormatArchive archive = new GenericFormatArchive(ArchiveMode.EXPORT, archiveFile, workingDirectory); - return archive; + return new GenericFormatArchive(ArchiveMode.EXPORT, archiveFile, workingDirectory); } catch (IOException e) { throw new ApplicationTechnicalException("Could not create generic format export archive", e); @@ -141,8 +139,7 @@ public class GenericFormatArchive implements Serializable { public static GenericFormatArchive forExportFromWorkingDirectory(File archiveFile, File workingDirectory) { - GenericFormatArchive archive = new GenericFormatArchive(ArchiveMode.EXPORT, archiveFile, workingDirectory); - return archive; + return new GenericFormatArchive(ArchiveMode.EXPORT, archiveFile, workingDirectory); } @@ -395,9 +392,7 @@ public class GenericFormatArchive implements Serializable { String filename = archiveFilePath.getFilename(); - Path file = workingDirectory.toPath().resolve(filename); - - return file; + return workingDirectory.toPath().resolve(filename); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatCheckDataService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatCheckDataService.java index fdc4217..e0f9152 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatCheckDataService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatCheckDataService.java @@ -84,7 +84,7 @@ public class GenericFormatCheckDataService extends AbstractTuttiService { public String getCruiseErrors(Cruise cruise, Set<FishingOperation> operations, ProgressionModel progressionModel) { - Map<String, String> errors = getFishingOperationsErrors(cruise, operations, progressionModel); + Map<Integer, String> errors = getFishingOperationsErrors(cruise, operations, progressionModel); String result; @@ -109,20 +109,20 @@ public class GenericFormatCheckDataService extends AbstractTuttiService { } - protected Map<String, String> getFishingOperationsErrors(Cruise cruise, - Set<FishingOperation> operations, - ProgressionModel progressionModel) { + protected Map<Integer, String> getFishingOperationsErrors(Cruise cruise, + Set<FishingOperation> operations, + ProgressionModel progressionModel) { Preconditions.checkNotNull(cruise); Preconditions.checkNotNull(progressionModel); progressionModel.increments(t("tutti.service.genericFormat.checkCruise", cruise.getName())); - Map<String, String> errors = new LinkedHashMap<>(); + Map<Integer, String> errors = new LinkedHashMap<>(); for (FishingOperation fishingOperation : operations) { - String fishingOperationId = fishingOperation.getId(); + Integer fishingOperationId = fishingOperation.getIdAsInt(); progressionModel.increments(t("tutti.service.genericFormat.checkCruiseFishingOperation", cruise.getName(), fishingOperationDecorator.toString(fishingOperation))); @@ -146,7 +146,7 @@ public class GenericFormatCheckDataService extends AbstractTuttiService { } - public Set<String> checkFishingOperation(String fishingOperationId) { + public Set<String> checkFishingOperation(Integer fishingOperationId) { if (log.isDebugEnabled()) { log.debug("Will check operation: " + fishingOperationId); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatContextSupport.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatContextSupport.java index 63fb3e8..f6f8f98 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatContextSupport.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatContextSupport.java @@ -343,8 +343,7 @@ public abstract class GenericFormatContextSupport implements Closeable, Iterable Cruise cruise = row.getCruise(); String naturalId = Cruises.getNaturalId(cruise); - boolean skipped = skippedCruisesNaturalId.contains(naturalId); - return skipped; + return skippedCruisesNaturalId.contains(naturalId); } @@ -368,107 +367,92 @@ public abstract class GenericFormatContextSupport implements Closeable, Iterable public GenericFormatImportCruiseContext getCruiseContext(Cruise cruise) { - GenericFormatImportCruiseContext cruiseContext = cruiseContexts.get(cruise.getId()); - return cruiseContext; + return cruiseContexts.get(cruise.getId()); } public CsvConsumerForSampleCategory loadSampleCategories(boolean failFast) { sampleCategoryFileResult.setImported(true); surveyFileResult.setLinesCount(importRequest.getArchive().getSampleCategoryLineCount()); - CsvConsumerForSampleCategory consumer = new CsvConsumerForSampleCategory(importRequest.getArchive().getSampleCategoryModelPath(), importRequest.getCsvSeparator(), importEntityParserFactory, failFast); - return consumer; + return new CsvConsumerForSampleCategory(importRequest.getArchive().getSampleCategoryModelPath(), importRequest.getCsvSeparator(), importEntityParserFactory, failFast); } public CsvConsumerForSurvey loadSurveys(boolean failFast) { surveyFileResult.setImported(true); surveyFileResult.setLinesCount(importRequest.getArchive().getSurveyLineCount()); - CsvConsumerForSurvey consumer = new CsvConsumerForSurvey(importRequest.getArchive().getSurveyPath(), importRequest.getCsvSeparator(), importEntityParserFactory, failFast); - return consumer; + return new CsvConsumerForSurvey(importRequest.getArchive().getSurveyPath(), importRequest.getCsvSeparator(), importEntityParserFactory, failFast); } public CsvConsumerForGearCaracteristic loadGearCaracteristics(boolean failFast) { gearCaracteristicFileResult.setImported(true); gearCaracteristicFileResult.setLinesCount(importRequest.getArchive().getGearCaracteristicsPathLineCount()); - CsvConsumerForGearCaracteristic consumer = new CsvConsumerForGearCaracteristic(importRequest.getArchive().getGearCaracteristicsPath(), importRequest.getCsvSeparator(), importEntityParserFactory, failFast); - return consumer; + return new CsvConsumerForGearCaracteristic(importRequest.getArchive().getGearCaracteristicsPath(), importRequest.getCsvSeparator(), importEntityParserFactory, failFast); } public CsvConsumerForOperation loadOperations(boolean failFast) { operationFileResult.setImported(true); operationFileResult.setLinesCount(importRequest.getArchive().getOperationPathLineCount()); - CsvConsumerForOperation consumer = new CsvConsumerForOperation(importRequest.getArchive().getOperationPath(), importRequest.getCsvSeparator(), importEntityParserFactory, failFast); - return consumer; + return new CsvConsumerForOperation(importRequest.getArchive().getOperationPath(), importRequest.getCsvSeparator(), importEntityParserFactory, failFast); } public CsvConsumerForParameter loadParameters(boolean failFast) { parameterFileResult.setImported(true); parameterFileResult.setLinesCount(importRequest.getArchive().getParameterPathLineCount()); - CsvConsumerForParameter consumer = new CsvConsumerForParameter(importRequest.getArchive().getParameterPath(), importRequest.getCsvSeparator(), importEntityParserFactory, failFast); - return consumer; + return new CsvConsumerForParameter(importRequest.getArchive().getParameterPath(), importRequest.getCsvSeparator(), importEntityParserFactory, failFast); } public CsvConsumerForCatch loadCatches(boolean failFast) { catchFileResult.setImported(true); catchFileResult.setLinesCount(importRequest.getArchive().getCatchPathLineCount()); - CsvConsumerForCatch consumer = new CsvConsumerForCatch(importRequest.getArchive().getCatchPath(), importRequest.getCsvSeparator(), getImportedSampleCategoryModel(), importEntityParserFactory, failFast); - return consumer; + return new CsvConsumerForCatch(importRequest.getArchive().getCatchPath(), importRequest.getCsvSeparator(), getImportedSampleCategoryModel(), importEntityParserFactory, failFast); } public CsvConsumerForMarineLitter loadMarineLitters(boolean failFast) { marineLitterFileResult.setImported(true); marineLitterFileResult.setLinesCount(importRequest.getArchive().getMarineLitterPathLineCount()); - CsvConsumerForMarineLitter consumer = new CsvConsumerForMarineLitter(importRequest.getArchive().getMarineLitterPath(), importRequest.getCsvSeparator(), importEntityParserFactory, failFast); - return consumer; + return new CsvConsumerForMarineLitter(importRequest.getArchive().getMarineLitterPath(), importRequest.getCsvSeparator(), importEntityParserFactory, failFast); } public CsvConsumerForIndividualObservation loadIndividualObservations(boolean failFast) { individualObservationFileResult.setImported(true); individualObservationFileResult.setLinesCount(importRequest.getArchive().getIndividualObservationPathLineCount()); - CsvConsumerForIndividualObservation consumer = new CsvConsumerForIndividualObservation(importRequest.getArchive().getIndividualObservationPath(), importRequest.getCsvSeparator(), importEntityParserFactory, failFast); - return consumer; + return new CsvConsumerForIndividualObservation(importRequest.getArchive().getIndividualObservationPath(), importRequest.getCsvSeparator(), importEntityParserFactory, failFast); } public CsvConsumerForAccidentalCatch loadAccidentalCatches(boolean failFast) { accidentalCatchFileResult.setImported(true); accidentalCatchFileResult.setLinesCount(importRequest.getArchive().getAccidentalCatchPathLineCount()); - CsvConsumerForAccidentalCatch consumer = new CsvConsumerForAccidentalCatch(importRequest.getArchive().getAccidentalCatchPath(), importRequest.getCsvSeparator(), importEntityParserFactory, failFast); - return consumer; + return new CsvConsumerForAccidentalCatch(importRequest.getArchive().getAccidentalCatchPath(), importRequest.getCsvSeparator(), importEntityParserFactory, failFast); } public CsvConsumerForAttachment loadAttachments(boolean failFast) { attachmentFileResult.setImported(true); attachmentFileResult.setLinesCount(importRequest.getArchive().getAttachemntsPathLineCount()); - CsvConsumerForAttachment consumer = new CsvConsumerForAttachment(importRequest.getArchive().getAttachmentFilePath(), importRequest.getCsvSeparator(), importEntityParserFactory, failFast); - return consumer; + return new CsvConsumerForAttachment(importRequest.getArchive().getAttachmentFilePath(), importRequest.getCsvSeparator(), importEntityParserFactory, failFast); } public CsvConsumerForTemporaryGear loadTemporaryGears(boolean failFast) { referentialTemporaryGearFileResult.setImported(true); referentialTemporaryGearFileResult.setLinesCount(importRequest.getArchive().getTemporaryReferentialGearLineCount()); - CsvConsumerForTemporaryGear consumer = new CsvConsumerForTemporaryGear(importRequest.getArchive().getTemporaryReferentialGearsPath(), importRequest.getCsvSeparator(), failFast); - return consumer; + return new CsvConsumerForTemporaryGear(importRequest.getArchive().getTemporaryReferentialGearsPath(), importRequest.getCsvSeparator(), failFast); } public CsvConsumerForTemporaryPerson loadTemporaryPersons(boolean failFast) { referentialTemporaryPersonFileResult.setImported(true); referentialTemporaryPersonFileResult.setLinesCount(importRequest.getArchive().getTemporaryReferentialPersonLineCount()); - CsvConsumerForTemporaryPerson consumer = new CsvConsumerForTemporaryPerson(importRequest.getArchive().getTemporaryReferentialPersonsPath(), importRequest.getCsvSeparator(), failFast); - return consumer; + return new CsvConsumerForTemporaryPerson(importRequest.getArchive().getTemporaryReferentialPersonsPath(), importRequest.getCsvSeparator(), failFast); } public CsvConsumerForTemporarySpecies loadTemporarySpecies(boolean failFast) { referentialTemporarySpeciesFileResult.setImported(true); referentialTemporarySpeciesFileResult.setLinesCount(importRequest.getArchive().getTemporaryReferentialSpeciesLineCount()); - CsvConsumerForTemporarySpecies consumer = new CsvConsumerForTemporarySpecies(importRequest.getArchive().getTemporaryReferentialSpeciesPath(), importRequest.getCsvSeparator(), true, failFast); - return consumer; + return new CsvConsumerForTemporarySpecies(importRequest.getArchive().getTemporaryReferentialSpeciesPath(), importRequest.getCsvSeparator(), true, failFast); } public CsvConsumerForTemporaryVessel loadTemporaryVessels(boolean failFast) { referentialTemporaryVesselFileResult.setImported(true); referentialTemporaryVesselFileResult.setLinesCount(importRequest.getArchive().getTemporaryReferentialVesselLineCount()); - CsvConsumerForTemporaryVessel consumer = new CsvConsumerForTemporaryVessel(importRequest.getArchive().getTemporaryReferentialVesselsPath(), importRequest.getCsvSeparator(), failFast); - return consumer; + return new CsvConsumerForTemporaryVessel(importRequest.getArchive().getTemporaryReferentialVesselsPath(), importRequest.getCsvSeparator(), failFast); } public Serializable parseCaracteristicValue(Caracteristic caracteristic, String value) throws CaracteristicValueParseException { @@ -476,8 +460,7 @@ public abstract class GenericFormatContextSupport implements Closeable, Iterable CaracteristicValueParserFormatter parser = CaracteristicValueParserFormatter.newParser(caracteristic); try { - Serializable caracteristicValue = parser.parse(value); - return caracteristicValue; + return parser.parse(value); } catch (ParseException e) { throw new CaracteristicValueParseException(caracteristic, value, e.getMessage()); @@ -504,14 +487,13 @@ public abstract class GenericFormatContextSupport implements Closeable, Iterable public Iterable<GenericFormatImportCruiseContext> orderedCruiseContexts() { - List<GenericFormatImportCruiseContext> orderedCruiseContexts = Ordering.from(Cruises.CRUISE_COMPARATOR).onResultOf(new Function<GenericFormatImportCruiseContext, Cruise>() { + return Ordering.from(Cruises.CRUISE_COMPARATOR).onResultOf(new Function<GenericFormatImportCruiseContext, Cruise>() { @Override public Cruise apply(GenericFormatImportCruiseContext input) { return input.getCruise(); } }).sortedCopy(cruiseContexts.values()); - return orderedCruiseContexts; } @@ -548,8 +530,7 @@ public abstract class GenericFormatContextSupport implements Closeable, Iterable } public Collection<AttachmentRow> popAttachmentRows(ObjectTypeCode objectTypeCode, Integer objectId) { - Collection<AttachmentRow> result = objectId == null ? null : attachmentRows.removeAll(objectTypeCode + "_" + objectId); - return result; + return objectId == null ? null : attachmentRows.removeAll(objectTypeCode + "_" + objectId); } public interface CruiseContextAction { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportContext.java index c608748..5d87c67 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportContext.java @@ -314,17 +314,16 @@ public class GenericFormatExportContext implements Closeable, Iterable<GenericFo Cruise cruise, FishingOperation operation) { String operationLabel = fishingOperationDecorator.toString(operation); - GenericFormatExportOperationContext operationExportContext = new GenericFormatExportOperationContext(cruise, - operation, - operationLabel, - persistenceService, - weightComputingService, - getSampleCategoryModel(), - weightMeasuredCaracteristic, - pmfmIdCaracteristic, - deadOrAliveCaracteristic, - genderCaracteristic); - return operationExportContext; + return new GenericFormatExportOperationContext(cruise, + operation, + operationLabel, + persistenceService, + weightComputingService, + getSampleCategoryModel(), + weightMeasuredCaracteristic, + pmfmIdCaracteristic, + deadOrAliveCaracteristic, + genderCaracteristic); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportOperationContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportOperationContext.java index d14b120..e08a469 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportOperationContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportOperationContext.java @@ -132,9 +132,9 @@ public class GenericFormatExportOperationContext { this.genderCaracteristic = genderCaracteristic; this.attachmentRows = new ArrayList<>(); - String operationId = operation.getId(); + Integer operationId = operation.getIdAsInt(); - accidentalBatches = persistenceService.getAllAccidentalBatch(operation.getId()); + accidentalBatches = persistenceService.getAllAccidentalBatch(operationId); withCatchBatch = persistenceService.isFishingOperationWithCatchBatch(operationId); @@ -189,7 +189,7 @@ public class GenericFormatExportOperationContext { } } - individualObservations = persistenceService.getAllIndividualObservationBatch(operation.getId()); + individualObservations = persistenceService.getAllIndividualObservationBatchsForFishingOperation(operation.getIdAsInt()); } else { if (log.isWarnEnabled()) { @@ -259,11 +259,11 @@ public class GenericFormatExportOperationContext { return persistenceService.isVracBatch(batch); } - public List<BenthosBatchFrequency> getAllBenthosBatchFrequency(String id) { + public List<BenthosBatchFrequency> getAllBenthosBatchFrequency(Integer id) { return persistenceService.getAllBenthosBatchFrequency(id); } - public List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency(String id) { + public List<SpeciesBatchFrequency> getAllSpeciesBatchFrequency(Integer id) { return persistenceService.getAllSpeciesBatchFrequency(id); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportService.java index cb68603..89a6652 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportService.java @@ -126,8 +126,7 @@ public class GenericFormatExportService extends AbstractTuttiService { actionEngine.executeTechnicalActions(exportContext); - GenericFormatExportResult result = new GenericFormatExportResult(exportRequest, errors); - return result; + return new GenericFormatExportResult(exportRequest, errors); } @@ -174,17 +173,15 @@ public class GenericFormatExportService extends AbstractTuttiService { GenericFormatArchive archive = GenericFormatArchive.forExport(configuration.getExportFile(), context.getConfig().getTmpDirectory()); - GenericFormatExportRequest exportRequest = new GenericFormatExportRequest(configuration, - archive, - ';', - context.getSampleCategoryModel(), - tuttiProtocol, - context.getConfig().getExportCountryId(), - attachmentsSourcePath + return new GenericFormatExportRequest(configuration, + archive, + ';', + context.getSampleCategoryModel(), + tuttiProtocol, + context.getConfig().getExportCountryId(), + attachmentsSourcePath ); - return exportRequest; - } protected GenericFormatExportContext createExportContext(GenericFormatExportRequest exportRequest, ProgressionModel progressionModel) { @@ -213,12 +210,10 @@ public class GenericFormatExportService extends AbstractTuttiService { protected int getCruiseNbStep(int nbFishingOperations) { - int result = 1 + nbFishingOperations // check cruise + operations + return 1 + nbFishingOperations // check cruise + operations + 1 // export cruise + 1 // export gear caracteristics - + nbFishingOperations; // export operation - - return result; + + nbFishingOperations; } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportCruiseContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportCruiseContext.java index dedae0b..e25890a 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportCruiseContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportCruiseContext.java @@ -26,7 +26,6 @@ package fr.ifremer.tutti.service.genericformat; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; import com.google.common.collect.Ordering; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; @@ -45,10 +44,10 @@ import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; +import java.util.stream.Collectors; /** * Created on 2/22/15. @@ -96,23 +95,20 @@ public class GenericFormatImportCruiseContext implements Closeable, Iterable<Gen public Iterable<GenericFormatImportOperationContext> orderedFishingOperationContexts() { - List<GenericFormatImportOperationContext> orderedOperationContexts = Ordering.from(FishingOperations.FISHING_OPERATION_COMPARATOR).onResultOf(new Function<GenericFormatImportOperationContext, FishingOperation>() { + return Ordering.from(FishingOperations.FISHING_OPERATION_COMPARATOR).onResultOf(new Function<GenericFormatImportOperationContext, FishingOperation>() { @Override public FishingOperation apply(GenericFormatImportOperationContext input) { return input.getFishingOperation(); } }).sortedCopy(fishingOperationContexts.values()); - return orderedOperationContexts; } @Override public void close() { - for (GenericFormatImportOperationContext cruiseContext : fishingOperationContexts.values()) { - cruiseContext.close(); - } + fishingOperationContexts.values().forEach(GenericFormatImportOperationContext::close); fishingOperationContexts.clear(); } @@ -187,16 +183,14 @@ public class GenericFormatImportCruiseContext implements Closeable, Iterable<Gen FishingOperation fishingOperation = row.getFishingOperation(); String naturalId = FishingOperations.getNaturalId(fishingOperation); - boolean skipped = skippedFishingOperationsNaturalId.contains(naturalId); - return skipped; + return skippedFishingOperationsNaturalId.contains(naturalId); } public boolean isFishingOperationAlreadyImported(RowWithOperationContextSupport row) { GenericFormatImportOperationContext fishingOperationContext = getFishingOperationContext(row); - boolean found = fishingOperationContext != null; - return found; + return fishingOperationContext != null; } @@ -236,7 +230,7 @@ public class GenericFormatImportCruiseContext implements Closeable, Iterable<Gen } public Iterable<FishingOperation> getFishingOperations() { - return Iterables.transform(fishingOperationContexts.values(), GenericFormatImportOperationContext.TO_FISHING_OPERATION_FUNCTION); + return fishingOperationContexts.values().stream().map(GenericFormatImportOperationContext.TO_FISHING_OPERATION_FUNCTION::apply).collect(Collectors.toList()); } public boolean withGearCaracteristics() { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportOperationContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportOperationContext.java index 9f2223e..7a51135 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportOperationContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportOperationContext.java @@ -63,12 +63,7 @@ import java.util.TreeMap; */ public class GenericFormatImportOperationContext implements Closeable { - public static final Function<GenericFormatImportOperationContext, FishingOperation> TO_FISHING_OPERATION_FUNCTION = new Function<GenericFormatImportOperationContext, FishingOperation>() { - @Override - public FishingOperation apply(GenericFormatImportOperationContext input) { - return input.getFishingOperation(); - } - }; + public static final Function<GenericFormatImportOperationContext, FishingOperation> TO_FISHING_OPERATION_FUNCTION = GenericFormatImportOperationContext::getFishingOperation; private final FishingOperation fishingOperation; @@ -251,16 +246,14 @@ public class GenericFormatImportOperationContext implements Closeable { Set<Species> speciesSet= new HashSet<>(); SpeciesAbleBatchs.grabSpeciesChildBatchs(vracSpeciesBatches.values(), speciesSet); SpeciesAbleBatchs.grabSpeciesChildBatchs(horsVracSpeciesBatches.values(), speciesSet); - int result = speciesSet.size(); - return result; + return speciesSet.size(); } public int getNbBenthosTaxon() { Set<Species> speciesSet= new HashSet<>(); SpeciesAbleBatchs.grabSpeciesChildBatchs(vracBenthosBatches.values(), speciesSet); SpeciesAbleBatchs.grabSpeciesChildBatchs(horsVracBenthosBatches.values(), speciesSet); - int result = speciesSet.size(); - return result; + return speciesSet.size(); } public Collection<SpeciesBatch> getSpeciesBatches(boolean vrac) { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportService.java index b66c3ca..cb4d6fe 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportService.java @@ -72,6 +72,7 @@ import org.nuiton.decorator.Decorator; import java.io.File; import java.util.LinkedHashSet; import java.util.Set; +import java.util.stream.Collectors; import static org.nuiton.i18n.I18n.t; @@ -113,7 +114,7 @@ public class GenericFormatImportService extends AbstractTuttiService { GenericFormatArchive archive = createArchive(importConfiguration); - int result = 6 // check sampleCategoryModel + import ( gear + person + species + vessel + protocol ) + return 6 // check sampleCategoryModel + import ( gear + person + species + vessel + protocol ) + archive.getSurveyLineCount() // load cruises + archive.getGearCaracteristicsPathLineCount()// load gear caracteristics + archive.getOperationPathLineCount() // load operations @@ -121,9 +122,7 @@ public class GenericFormatImportService extends AbstractTuttiService { + archive.getCatchPathLineCount()// load catches + archive.getMarineLitterPathLineCount()// load marine litters + archive.getIndividualObservationPathLineCount()// load individualObservations - + archive.getAccidentalCatchPathLineCount(); // load accidental catches - - return result; + + archive.getAccidentalCatchPathLineCount(); } @@ -162,7 +161,7 @@ public class GenericFormatImportService extends AbstractTuttiService { boolean checkWeights = importConfiguration.isCheckWeights(); boolean cleanWeights = importConfiguration.isCleanWeights(); - int result = 6 // check sampleCategoryModel + import ( gear + person + species + vessel + protocol ) + return 6 // check sampleCategoryModel + import ( gear + person + species + vessel + protocol ) + 1 + nbCruises // load cruises + nbCruise * persist cruise + 1 + nbCruises // load gear caracteristics + nbCruise * persist gear caracteristics + 1 + nbOperations // load operations + nbOperations * persist operation @@ -173,9 +172,7 @@ public class GenericFormatImportService extends AbstractTuttiService { + 1 + nbOperations // load accidental catches + nbOperations * persist accidental catches + (cleanWeights ? nbOperations : 0) // nbOperations * cleanWeights + (checkWeights ? nbOperations : 0) // nbOperations * checkWeights - + 1; // compute report - - return result; + + 1; } @@ -253,16 +250,11 @@ public class GenericFormatImportService extends AbstractTuttiService { Set<ImportActionSupport> actions = createValidateActions(importContext, persitenceHelper); - for (ImportActionSupport action : actions) { - - action.execute(); - - } + actions.forEach(ImportActionSupport::execute); } - GenericFormatValidateFileResult result = new GenericFormatValidateFileResult(importContext); - return result; + return new GenericFormatValidateFileResult(importContext); } @@ -280,16 +272,11 @@ public class GenericFormatImportService extends AbstractTuttiService { Set<ImportActionSupport> actions = createImportActions(importContext, persitenceHelper); - for (ImportActionSupport action : actions) { - - action.execute(); - - } + actions.forEach(ImportActionSupport::execute); } - GenericFormatImportResult result = new GenericFormatImportResult(importContext); - return result; + return new GenericFormatImportResult(importContext); } @@ -311,23 +298,22 @@ public class GenericFormatImportService extends AbstractTuttiService { } // Full load cruise - Set<Cruise> cruises = new LinkedHashSet<>(); - for (String cruiseId : persistenceService.getAllCruiseId(program.getId())) { - cruises.add(persistenceService.getCruise(cruiseId)); - } + Set<Cruise> cruises = persistenceService.getAllCruiseId(program.getId()) + .stream() + .map(cruiseId -> persistenceService.getCruise(cruiseId)) + .collect(Collectors.toCollection(LinkedHashSet::new)); TuttiProtocol protocol = persistenceService.getProtocol(); ProgramDataModel dataModel = persistenceService.loadProgram(programId, true); - GenericFormatImportRequest request = new GenericFormatImportRequest(importConfiguration, - archive, - ';', - program, - context.getSampleCategoryModel(), - ImmutableSet.copyOf(cruises), - dataModel, - protocol); - return request; + return new GenericFormatImportRequest(importConfiguration, + archive, + ';', + program, + context.getSampleCategoryModel(), + ImmutableSet.copyOf(cruises), + dataModel, + protocol); } @@ -337,9 +323,7 @@ public class GenericFormatImportService extends AbstractTuttiService { Preconditions.checkNotNull(importFile); Preconditions.checkState(importFile.exists()); - GenericFormatArchive archive = GenericFormatArchive.forImport(importFile, context.getConfig().getTmpDirectory()); - - return archive; + return GenericFormatArchive.forImport(importFile, context.getConfig().getTmpDirectory()); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportValidationHelper.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportValidationHelper.java index 8edbff0..364522e 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportValidationHelper.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportValidationHelper.java @@ -126,9 +126,9 @@ public class GenericFormatImportValidationHelper implements Closeable { } - public void useFishingOperationInValidation(FishingOperation fishingOperation) { - validationDataContext.setFishingOperation(fishingOperation); - } +// public void useFishingOperationInValidation(FishingOperation fishingOperation) { +// validationDataContext.setFishingOperation(fishingOperation); +// } public NuitonValidatorResult validateCruise(Cruise cruise) { return validationService.validateEditCruise(cruise); @@ -141,8 +141,7 @@ public class GenericFormatImportValidationHelper implements Closeable { Cruise cruise = fishingOperation.getCruise(); validationDataContext.setCruise(cruise); validationDataContext.setFishingOperation(fishingOperation); - NuitonValidatorResult nuitonValidatorResult = validationService.validateEditFishingOperation(fishingOperation); - return nuitonValidatorResult; + return validationService.validateEditFishingOperation(fishingOperation); } finally { validationDataContext.setCruise(previousCruise); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatResultSupport.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatResultSupport.java index 622a108..aef81bd 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatResultSupport.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatResultSupport.java @@ -124,7 +124,7 @@ public abstract class GenericFormatResultSupport implements Serializable { private boolean computeValid() { - boolean result = isArchiveLayoutValid() + return isArchiveLayoutValid() && sampleCategoryFileResult.isValid() && referentialTemporaryGearFileResult.isValid() && referentialTemporaryPersonFileResult.isValid() @@ -140,7 +140,6 @@ public abstract class GenericFormatResultSupport implements Serializable { && accidentalCatchFileResult.isValid() && individualObservationFileResult.isValid() && attachmentsFileResult.isValid(); - return result; } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatValidateFileContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatValidateFileContext.java index 6c26fa4..2b42375 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatValidateFileContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatValidateFileContext.java @@ -72,49 +72,45 @@ public class GenericFormatValidateFileContext extends GenericFormatContextSuppor final Set<CruiseDataModel> importedCruises = new LinkedHashSet<>(); - doActionOnSortedCruiseContexts(new CruiseContextAction() { - @Override - public void onCruise(GenericFormatImportCruiseContext cruiseContext, ProgressionModel progressionModel) { + doActionOnSortedCruiseContexts((cruiseContext, progressionModel) -> { - Cruise cruise = cruiseContext.getCruise(); + Cruise cruise = cruiseContext.getCruise(); - CruiseDataModel existingCruiseData = cruiseContext.getExistingCruiseData(); + CruiseDataModel existingCruiseData = cruiseContext.getExistingCruiseData(); - Set<OperationDataModel> operations = new LinkedHashSet<>(); + Set<OperationDataModel> operations = new LinkedHashSet<>(); - for (GenericFormatImportOperationContext fishingOperationContext : cruiseContext.orderedFishingOperationContexts()) { - FishingOperation fishingOperation = fishingOperationContext.getFishingOperation(); - - // Add a natural Id as id (used in import to find which cruise to import) - String naturalId = FishingOperations.getNaturalId(fishingOperation); - fishingOperation.setId(naturalId); - OperationDataModel operation = new OperationDataModel(fishingOperation); - fishingOperation.setId((String) null); - - OperationDataModel existingFishingOperationData = fishingOperationContext.getExistingFishingOperationData(); - if (existingFishingOperationData != null) { - operation.setOptionalId(existingFishingOperationData.getId()); - } - - operations.add(operation); - } + for (GenericFormatImportOperationContext fishingOperationContext : cruiseContext.orderedFishingOperationContexts()) { + FishingOperation fishingOperation = fishingOperationContext.getFishingOperation(); // Add a natural Id as id (used in import to find which cruise to import) - String naturalId = Cruises.getNaturalId(cruise); - cruise.setId(naturalId); - CruiseDataModel cruiseModel = new CruiseDataModel(cruise, operations); - cruise.setId((String) null); - - if (existingCruiseData != null) { - cruiseModel.setOptionalId(existingCruiseData.getId()); + String naturalId = FishingOperations.getNaturalId(fishingOperation); + fishingOperation.setId(naturalId); + OperationDataModel operation = new OperationDataModel(fishingOperation); + fishingOperation.setId((String) null); + + OperationDataModel existingFishingOperationData = fishingOperationContext.getExistingFishingOperationData(); + if (existingFishingOperationData != null) { + operation.setOptionalId(existingFishingOperationData.getId()); } - importedCruises.add(cruiseModel); + operations.add(operation); + } + + // Add a natural Id as id (used in import to find which cruise to import) + String naturalId = Cruises.getNaturalId(cruise); + cruise.setId(naturalId); + CruiseDataModel cruiseModel = new CruiseDataModel(cruise, operations); + cruise.setId((String) null); + if (existingCruiseData != null) { + cruiseModel.setOptionalId(existingCruiseData.getId()); } + + importedCruises.add(cruiseModel); + }); - ProgramDataModel result = new ProgramDataModel(getImportRequest().getProgram(), importedCruises); - return result; + return new ProgramDataModel(getImportRequest().getProgram(), importedCruises); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersistenceHelper.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersistenceHelper.java index 7dbbc93..bca46bb 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersistenceHelper.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersistenceHelper.java @@ -94,11 +94,10 @@ public class GenericformatImportPersistenceHelper { this.protocolImportExportService = context.getService(ProtocolImportExportService.class); } - public Set<FishingOperation> getFishingOperations(String cruiseId) { + public Set<FishingOperation> getFishingOperations(Integer cruiseId) { List<FishingOperation> allFishingOperation = persistenceService.getAllFishingOperation(cruiseId); - Set<FishingOperation> existingFishingOperations = Sets.newLinkedHashSet(allFishingOperation); - return existingFishingOperations; + return Sets.newLinkedHashSet(allFishingOperation); } @@ -137,17 +136,15 @@ public class GenericformatImportPersistenceHelper { } public FishingOperation createFishingOperation(FishingOperation fishingOperation) { - FishingOperation saveFishingOperation = persistenceService.createFishingOperation(fishingOperation); - return saveFishingOperation; + return persistenceService.createFishingOperation(fishingOperation); } public FishingOperation saveFishingOperation(FishingOperation fishingOperation) { - FishingOperation saveFishingOperation = persistenceService.saveFishingOperation(fishingOperation); - return saveFishingOperation; + return persistenceService.saveFishingOperation(fishingOperation); } - public CatchBatch getExistingCatchBatch(String operationId) { + public CatchBatch getExistingCatchBatch(Integer operationId) { boolean withCatchBatch = isWithCatchBatch(operationId); CatchBatch catchBatch; if (withCatchBatch) { @@ -158,7 +155,7 @@ public class GenericformatImportPersistenceHelper { return catchBatch; } - public boolean isWithCatchBatch(String operationId) { + public boolean isWithCatchBatch(Integer operationId) { return persistenceService.isFishingOperationWithCatchBatch(operationId); } @@ -170,36 +167,36 @@ public class GenericformatImportPersistenceHelper { return persistenceService.saveCatchBatch(catchBatch); } - public SpeciesBatch createSpeciesBatch(SpeciesBatch batch, String parentId) { + public SpeciesBatch createSpeciesBatch(SpeciesBatch batch, Integer parentId) { return persistenceService.createSpeciesBatch(batch, parentId, false); } - public void saveSpeciesBatchFrequency(String batchId, List<SpeciesBatchFrequency> frequencies) { + public void saveSpeciesBatchFrequency(Integer batchId, List<SpeciesBatchFrequency> frequencies) { persistenceService.saveSpeciesBatchFrequency(batchId, frequencies); } - public void deleteSpeciesBatchForFishingOperation(String fishingOperationId) { + public void deleteSpeciesBatchForFishingOperation(Integer fishingOperationId) { BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(fishingOperationId, false); for (SpeciesBatch batch : rootSpeciesBatch.getChildren()) { - persistenceService.deleteSpeciesBatch(batch.getId()); + persistenceService.deleteSpeciesBatch(batch.getIdAsInt()); } } - public BenthosBatch createBenthosBatch(BenthosBatch batch, String parentId) { + public BenthosBatch createBenthosBatch(BenthosBatch batch, Integer parentId) { return persistenceService.createBenthosBatch(batch, parentId, false); } - public void saveBenthosBatchFrequency(String batchId, List<BenthosBatchFrequency> frequencies) { + public void saveBenthosBatchFrequency(Integer batchId, List<BenthosBatchFrequency> frequencies) { persistenceService.saveBenthosBatchFrequency(batchId, frequencies); } - public void deleteBenthosBatchForFishingOperation(String fishingOperationId) { + public void deleteBenthosBatchForFishingOperation(Integer fishingOperationId) { BatchContainer<BenthosBatch> rootBenthosBatch = persistenceService.getRootBenthosBatch(fishingOperationId, false); for (BenthosBatch batch : rootBenthosBatch.getChildren()) { - persistenceService.deleteBenthosBatch(batch.getId()); + persistenceService.deleteBenthosBatch(batch.getIdAsInt()); } } @@ -208,11 +205,11 @@ public class GenericformatImportPersistenceHelper { return persistenceService.createMarineLitterBatch(marineLitterBatch); } - public void deleteMarineLitterForFishingOperation(String fishingOperationId) { + public void deleteMarineLitterForFishingOperation(Integer fishingOperationId) { BatchContainer<MarineLitterBatch> rootMarineLitters = persistenceService.getRootMarineLitterBatch(fishingOperationId); for (MarineLitterBatch batch : rootMarineLitters.getChildren()) { - persistenceService.deleteMarineLitterBatch(batch.getId()); + persistenceService.deleteMarineLitterBatch(batch.getIdAsInt()); } } @@ -220,7 +217,7 @@ public class GenericformatImportPersistenceHelper { return persistenceService.createAccidentalBatch(accidentalBatch); } - public void deleteAccidentalBatchForFishingOperation(String fishingOperationId) { + public void deleteAccidentalBatchForFishingOperation(Integer fishingOperationId) { persistenceService.deleteAccidentalBatchForFishingOperation(fishingOperationId); } @@ -228,7 +225,7 @@ public class GenericformatImportPersistenceHelper { return persistenceService.createIndividualObservationBatch(individualObservationBatch); } - public void deleteIndividualObservationBatchForFishingOperation(String fishingOperationId) { + public void deleteIndividualObservationBatchForFishingOperation(Integer fishingOperationId) { persistenceService.deleteIndividualObservationBatchForFishingOperation(fishingOperationId); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CruiseNotValidException.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CruiseNotValidException.java index 3e842d5..15f4d85 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CruiseNotValidException.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CruiseNotValidException.java @@ -62,8 +62,7 @@ public class CruiseNotValidException extends Exception { public String getMessage() { String errors = GenericFormatImportValidationHelper.getMessage("", errorMessages); - String message = t("tutti.service.genericFormat.import.error.cruiseNotValid", errors); - return message; + return t("tutti.service.genericFormat.import.error.cruiseNotValid", errors); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForCatch.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForCatch.java index f0d7487..6f9ec6b 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForCatch.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForCatch.java @@ -70,13 +70,9 @@ public class CsvConsumerForCatch extends CsvComsumer<CatchRow, CatchModel> { super(file, CatchModel.forImport(separator, sampleCategoryModel, parserFactory), reportError); - this.catchRowVracPredicate = new Predicate<CatchRow>() { - - @Override - public boolean apply(CatchRow input) { - ExportSampleCategory exportSampleCategory = input.getSampleCategory().get(0); - return QualitativeValueId.SORTED_VRAC.getValue().equals(((CaracteristicQualitativeValue) exportSampleCategory.getCategoryValue()).getIdAsInt()); - } + this.catchRowVracPredicate = input -> { + ExportSampleCategory exportSampleCategory = input.getSampleCategory().get(0); + return QualitativeValueId.SORTED_VRAC.getValue().equals(((CaracteristicQualitativeValue) exportSampleCategory.getCategoryValue()).getIdAsInt()); }; } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/FishingOperationNotValidException.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/FishingOperationNotValidException.java index 337869b..180a4bb 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/FishingOperationNotValidException.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/FishingOperationNotValidException.java @@ -62,8 +62,7 @@ public class FishingOperationNotValidException extends Exception { public String getMessage() { String errors = GenericFormatImportValidationHelper.getMessage("", errorMessages); - String message = t("tutti.service.genericFormat.import.error.fishingOperationNotValid", errors); - return message; + return t("tutti.service.genericFormat.import.error.fishingOperationNotValid", errors); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AccidentalCatchModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AccidentalCatchModel.java index bc52145..b087f36 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AccidentalCatchModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AccidentalCatchModel.java @@ -56,8 +56,7 @@ public class AccidentalCatchModel extends AbstractTuttiImportExportModel<Acciden @Override public AccidentalCatchRow newEmptyInstance() { - AccidentalCatchRow row = AccidentalCatchRow.newEmptyInstance(); - return row; + return AccidentalCatchRow.newEmptyInstance(); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AttachmentModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AttachmentModel.java index 09aa8e8..bde8399 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AttachmentModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AttachmentModel.java @@ -57,8 +57,7 @@ public class AttachmentModel extends AbstractTuttiImportExportModel<AttachmentRo @Override public AttachmentRow newEmptyInstance() { - AttachmentRow row = AttachmentRow.newEmptyInstance(); - return row; + return AttachmentRow.newEmptyInstance(); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchModel.java index f92b55c..2e470a3 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchModel.java @@ -158,14 +158,14 @@ public class CatchModel extends AbstractTuttiImportExportModel<CatchRow> { String headerPrefix = entry.getCode(); newIgnoredColumn(headerPrefix); - newMandatoryColumn("Num_Ordre_" + headerPrefix + "_H2", TuttiCsvUtil.PRIMITIVE_INTEGER, new SampleCategoryValueSetter<Integer>(entry, ExportSampleCategory.PROPERTY_RANK_ORDER)); - newMandatoryColumn("Tot_" + headerPrefix, TuttiCsvUtil.FLOAT, new SampleCategoryValueSetter<Float>(entry, ExportSampleCategory.PROPERTY_CATEGORY_WEIGHT)); - newMandatoryColumn("Ech_" + headerPrefix, TuttiCsvUtil.FLOAT, new SampleCategoryValueSetter<Float>(entry, ExportSampleCategory.PROPERTY_SAMPLE_WEIGHT)); + newMandatoryColumn("Num_Ordre_" + headerPrefix + "_H2", TuttiCsvUtil.PRIMITIVE_INTEGER, new SampleCategoryValueSetter<>(entry, ExportSampleCategory.PROPERTY_RANK_ORDER)); + newMandatoryColumn("Tot_" + headerPrefix, TuttiCsvUtil.FLOAT, new SampleCategoryValueSetter<>(entry, ExportSampleCategory.PROPERTY_CATEGORY_WEIGHT)); + newMandatoryColumn("Ech_" + headerPrefix, TuttiCsvUtil.FLOAT, new SampleCategoryValueSetter<>(entry, ExportSampleCategory.PROPERTY_SAMPLE_WEIGHT)); newIgnoredColumn("Type_Volume_Poids_" + headerPrefix); newIgnoredColumn("Unite_Volume_Poids_" + headerPrefix); - newMandatoryColumn("Commentaire_" + headerPrefix, TuttiCsvUtil.COMMENT_PARSER_FORMATTER, new SampleCategoryValueSetter<String>(entry, ExportSampleCategory.PROPERTY_COMMENT)); + newMandatoryColumn("Commentaire_" + headerPrefix, TuttiCsvUtil.COMMENT_PARSER_FORMATTER, new SampleCategoryValueSetter<>(entry, ExportSampleCategory.PROPERTY_COMMENT)); } @@ -189,8 +189,8 @@ public class CatchModel extends AbstractTuttiImportExportModel<CatchRow> { for (SampleCategoryModelEntry entry : sampleCategoryModel.getCategory()) { String headerPrefix = entry.getCode(); - newMandatoryColumn(headerPrefix + "_Id", CaracteristicValueParserFormatter.newParser(entry.getCaracteristic()), new SampleCategoryValueSetter<Serializable>(entry, ExportSampleCategory.PROPERTY_CATEGORY_VALUE)); - newMandatoryColumn(headerPrefix + "_Lot_Id", TuttiCsvUtil.INTEGER, new SampleCategoryValueSetter<Integer>(entry, ExportSampleCategory.PROPERTY_BATCH_ID)); + newMandatoryColumn(headerPrefix + "_Id", CaracteristicValueParserFormatter.newParser(entry.getCaracteristic()), new SampleCategoryValueSetter<>(entry, ExportSampleCategory.PROPERTY_CATEGORY_VALUE)); + newMandatoryColumn(headerPrefix + "_Lot_Id", TuttiCsvUtil.INTEGER, new SampleCategoryValueSetter<>(entry, ExportSampleCategory.PROPERTY_BATCH_ID)); } } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchRow.java index 0cd7aca..e9f4011 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/CatchRow.java @@ -297,8 +297,7 @@ public class CatchRow extends RowWithOperationContextSupport { exportSampleCategory.setCategoryDef(sampleCategoryModelEntry); sampleCategory.add(categoryOrder, exportSampleCategory); } - ExportSampleCategory exportSampleCategory = sampleCategory.get(categoryOrder); - return exportSampleCategory; + return sampleCategory.get(categoryOrder); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/GearCaracteristicModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/GearCaracteristicModel.java index 61fb7dc..77bce77 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/GearCaracteristicModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/GearCaracteristicModel.java @@ -54,8 +54,7 @@ public class GearCaracteristicModel extends AbstractTuttiImportExportModel<GearC @Override public GearCaracteristicRow newEmptyInstance() { - GearCaracteristicRow row = GearCaracteristicRow.newEmptyInstance(); - return row; + return GearCaracteristicRow.newEmptyInstance(); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/IndividualObservationModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/IndividualObservationModel.java index 00acdaa..9bce9a0 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/IndividualObservationModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/IndividualObservationModel.java @@ -56,8 +56,7 @@ public class IndividualObservationModel extends AbstractTuttiImportExportModel<I @Override public IndividualObservationRow newEmptyInstance() { - IndividualObservationRow row = IndividualObservationRow.newEmptyInstance(); - return row; + return IndividualObservationRow.newEmptyInstance(); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/MarineLitterModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/MarineLitterModel.java index 7274c58..99583b9 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/MarineLitterModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/MarineLitterModel.java @@ -56,8 +56,7 @@ public class MarineLitterModel extends AbstractTuttiImportExportModel<MarineLitt @Override public MarineLitterRow newEmptyInstance() { - MarineLitterRow row = MarineLitterRow.newEmptyInstance(); - return row; + return MarineLitterRow.newEmptyInstance(); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationModel.java index 9653fdb..a29087e 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/OperationModel.java @@ -54,8 +54,7 @@ public class OperationModel extends AbstractTuttiImportExportModel<OperationRow> @Override public OperationRow newEmptyInstance() { - OperationRow row = OperationRow.newEmptyInstance(); - return row; + return OperationRow.newEmptyInstance(); } protected OperationModel(char separator) { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/ParameterModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/ParameterModel.java index 33a31bb..ca69ee8 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/ParameterModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/ParameterModel.java @@ -55,8 +55,7 @@ public class ParameterModel extends AbstractTuttiImportExportModel<ParameterRow> @Override public ParameterRow newEmptyInstance() { - ParameterRow row = ParameterRow.newEmptyInstance(); - return row; + return ParameterRow.newEmptyInstance(); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SpeciesExportModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SpeciesExportModel.java index 5e1414f..3bd4a01 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SpeciesExportModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SpeciesExportModel.java @@ -44,8 +44,7 @@ public class SpeciesExportModel extends AbstractTuttiImportExportModel<SpeciesEx @Override public SpeciesExportRow newEmptyInstance() { - SpeciesExportRow row = new SpeciesExportRow(); - return row; + return new SpeciesExportRow(); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SurveyModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SurveyModel.java index e3f7ac8..5d49258 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SurveyModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/SurveyModel.java @@ -55,8 +55,7 @@ public class SurveyModel extends AbstractTuttiImportExportModel<SurveyRow> { @Override public SurveyRow newEmptyInstance() { - SurveyRow row = SurveyRow.newEmptyInstance(); - return row; + return SurveyRow.newEmptyInstance(); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateCatchBatchRowsAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateCatchBatchRowsAction.java index 90e2a42..5dda418 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateCatchBatchRowsAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateCatchBatchRowsAction.java @@ -232,9 +232,8 @@ public class CreateCatchBatchRowsAction extends ExportFishingOperationActionSupp Float totalSortedSortedWeight = catchBatch.getCatchTotalSortedSortedComputedWeight(); // tchemit 2015-04-28 see http://forge.codelutin.com/issues/7021 - float catchRaisingFactor = totalSortedWeight == null || totalSortedSortedWeight == null ? 1 : totalSortedWeight / totalSortedSortedWeight; - return catchRaisingFactor; + return totalSortedWeight == null || totalSortedSortedWeight == null ? 1 : totalSortedWeight / totalSortedSortedWeight; } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportGearCaracteristicAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportGearCaracteristicAction.java index 45be2a8..d4c6edf 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportGearCaracteristicAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportGearCaracteristicAction.java @@ -64,7 +64,7 @@ public class ExportGearCaracteristicAction extends ExportCruiseActionSupport { for (Gear gear : cruise.getGear()) { - CaracteristicMap caracteristics = persistenceService.getGearCaracteristics(cruise.getId(), gear.getId(), gear.getRankOrder()); + CaracteristicMap caracteristics = persistenceService.getGearCaracteristics(cruise.getIdAsInt(), gear.getIdAsInt(), gear.getRankOrder()); Gear gearWithCaracteristics = Gears.newGear(gear); gearWithCaracteristics.setCaracteristics(caracteristics); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/LoadDataAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/LoadDataAction.java index 4ea3c0a..f5ffa26 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/LoadDataAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/LoadDataAction.java @@ -57,14 +57,14 @@ public class LoadDataAction extends ExportTechnicalActionSupport { for (CruiseDataModel cruiseDataModel : dataToExport) { - Cruise cruise = persistenceService.getCruise(cruiseDataModel.getId()); + Cruise cruise = persistenceService.getCruise(cruiseDataModel.getIdAsInt()); Preconditions.checkNotNull(cruise); Set<FishingOperation> operations = new LinkedHashSet<>(); for (OperationDataModel operationDataModel : cruiseDataModel) { - FishingOperation operation = persistenceService.getFishingOperation(operationDataModel.getId()); + FishingOperation operation = persistenceService.getFishingOperation(operationDataModel.getIdAsInt()); operations.add(operation); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/DoCheckWeightAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/DoCheckWeightAction.java index e8b6f81..8d7709b 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/DoCheckWeightAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/DoCheckWeightAction.java @@ -24,10 +24,8 @@ package fr.ifremer.tutti.service.genericformat.importactions; * #L% */ -import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.service.genericformat.GenericFormatCheckDataService; import fr.ifremer.tutti.service.genericformat.GenericFormatImportContext; -import fr.ifremer.tutti.service.genericformat.GenericFormatImportCruiseContext; import fr.ifremer.tutti.service.genericformat.GenericFormatImportOperationContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -70,21 +68,17 @@ public class DoCheckWeightAction extends ImportActionSupport { log.info("Will check weights."); } - importContext.doActionOnCruiseContexts(new GenericFormatImportContext.CruiseContextAction() { + importContext.doActionOnCruiseContexts((cruiseContext, progressionModel) -> { - @Override - public void onCruise(GenericFormatImportCruiseContext cruiseContext, ProgressionModel progressionModel) { + for (GenericFormatImportOperationContext operationContext : cruiseContext) { - for (GenericFormatImportOperationContext operationContext : cruiseContext) { + progressionModel.increments(t("tutti.service.genericFormat.checkWeights.fishingOperation", cruiseContext.getCruiseLabel(), operationContext.getFishingOperationLabel())); - progressionModel.increments(t("tutti.service.genericFormat.checkWeights.fishingOperation", cruiseContext.getCruiseLabel(), operationContext.getFishingOperationLabel())); - - Set<String> errors = checkDataService.checkFishingOperation(operationContext.getFishingOperation().getId()); - operationContext.addCheckErrors(errors); - - } + Set<String> errors = checkDataService.checkFishingOperation(operationContext.getFishingOperation().getIdAsInt()); + operationContext.addCheckErrors(errors); } + }); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/DoCleanWeightAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/DoCleanWeightAction.java index 2cf1514..bfa7651 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/DoCleanWeightAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/DoCleanWeightAction.java @@ -24,10 +24,8 @@ package fr.ifremer.tutti.service.genericformat.importactions; * #L% */ -import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.service.catches.WeightCleaningService; import fr.ifremer.tutti.service.genericformat.GenericFormatImportContext; -import fr.ifremer.tutti.service.genericformat.GenericFormatImportCruiseContext; import fr.ifremer.tutti.service.genericformat.GenericFormatImportOperationContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -68,21 +66,17 @@ public class DoCleanWeightAction extends ImportActionSupport { log.info("Will clean weights."); } - importContext.doActionOnCruiseContexts(new GenericFormatImportContext.CruiseContextAction() { + importContext.doActionOnCruiseContexts((cruiseContext, progressionModel) -> { - @Override - public void onCruise(GenericFormatImportCruiseContext cruiseContext, ProgressionModel progressionModel) { + for (GenericFormatImportOperationContext operationContext : cruiseContext) { - for (GenericFormatImportOperationContext operationContext : cruiseContext) { + progressionModel.increments(t("tutti.service.genericFormat.cleanWeights.fishingOperation", cruiseContext.getCruiseLabel(), operationContext.getFishingOperationLabel())); - progressionModel.increments(t("tutti.service.genericFormat.cleanWeights.fishingOperation", cruiseContext.getCruiseLabel(), operationContext.getFishingOperationLabel())); - - boolean weightsDeleted = weightCleaningService.cleanFishingOperation(operationContext.getFishingOperation().getId()); - operationContext.setWeightsDeleted(weightsDeleted); - - } + boolean weightsDeleted = weightCleaningService.cleanFishingOperation(operationContext.getFishingOperation().getIdAsInt()); + operationContext.setWeightsDeleted(weightsDeleted); } + }); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportAccidentalCatchAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportAccidentalCatchAction.java index c89ccba..490d53c 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportAccidentalCatchAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportAccidentalCatchAction.java @@ -153,7 +153,7 @@ public class ImportAccidentalCatchAction extends ImportActionSupport { private void deleteAccidentalBatches(GenericFormatImportOperationContext fishingOperationContext) { FishingOperation fishingOperation = fishingOperationContext.getFishingOperation(); - persistenceHelper.deleteAccidentalBatchForFishingOperation(fishingOperation.getId()); + persistenceHelper.deleteAccidentalBatchForFishingOperation(fishingOperation.getIdAsInt()); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportCatchAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportCatchAction.java index c13debd..55521a5 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportCatchAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportCatchAction.java @@ -175,7 +175,7 @@ public class ImportCatchAction extends ImportActionSupport { } - private void persistSpeciesBatches(GenericFormatImportOperationContext fishingOperationContext, Collection<SpeciesBatch> batches, String parentId) { + private void persistSpeciesBatches(GenericFormatImportOperationContext fishingOperationContext, Collection<SpeciesBatch> batches, Integer parentId) { int rankOrder = 1; @@ -195,7 +195,7 @@ public class ImportCatchAction extends ImportActionSupport { if (CollectionUtils.isNotEmpty(frequencies)) { - String batchId = batch.getId(); + Integer batchId = batch.getIdAsInt(); if (log.isInfoEnabled()) { log.info("Persist " + frequencies.size() + " frequency(ies) (species batch: " + batchId + ") of " + fishingOperationContext.getFishingOperationLabel() + " for cruise: " + importContext.decorate(fishingOperationContext.getFishingOperation().getCruise())); } @@ -205,7 +205,7 @@ public class ImportCatchAction extends ImportActionSupport { if (!batch.isChildBatchsEmpty()) { - persistSpeciesBatches(fishingOperationContext, batch.getChildBatchs(), createdBatch.getId()); + persistSpeciesBatches(fishingOperationContext, batch.getChildBatchs(), createdBatch.getIdAsInt()); } @@ -216,7 +216,7 @@ public class ImportCatchAction extends ImportActionSupport { private void deleteSpeciesBatches(GenericFormatImportOperationContext fishingOperationContext) { FishingOperation fishingOperation = fishingOperationContext.getFishingOperation(); - persistenceHelper.deleteSpeciesBatchForFishingOperation(fishingOperation.getId()); + persistenceHelper.deleteSpeciesBatchForFishingOperation(fishingOperation.getIdAsInt()); } @@ -272,7 +272,7 @@ public class ImportCatchAction extends ImportActionSupport { } } - private void persistBenthosBatches(GenericFormatImportOperationContext fishingOperationContext, Collection<BenthosBatch> batches, String parentId) { + private void persistBenthosBatches(GenericFormatImportOperationContext fishingOperationContext, Collection<BenthosBatch> batches, Integer parentId) { int rankOrder = 1; @@ -294,7 +294,7 @@ public class ImportCatchAction extends ImportActionSupport { if (CollectionUtils.isNotEmpty(frequencies)) { - String batchId = batch.getId(); + Integer batchId = batch.getIdAsInt(); if (log.isInfoEnabled()) { log.info("Persist " + frequencies.size() + " frequency(ies) (benthos batch: " + batchId + ") of " + fishingOperationContext.getFishingOperationLabel() + " for cruise: " + importContext.decorate(fishingOperationContext.getFishingOperation().getCruise())); } @@ -304,7 +304,7 @@ public class ImportCatchAction extends ImportActionSupport { if (!batch.isChildBatchsEmpty()) { - persistBenthosBatches(fishingOperationContext, batch.getChildBatchs(), createdBatch.getId()); + persistBenthosBatches(fishingOperationContext, batch.getChildBatchs(), createdBatch.getIdAsInt()); } } @@ -314,7 +314,7 @@ public class ImportCatchAction extends ImportActionSupport { private void deleteBenthosBatches(GenericFormatImportOperationContext fishingOperationContext) { FishingOperation fishingOperation = fishingOperationContext.getFishingOperation(); - persistenceHelper.deleteBenthosBatchForFishingOperation(fishingOperation.getId()); + persistenceHelper.deleteBenthosBatchForFishingOperation(fishingOperation.getIdAsInt()); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportGearCaracteristicAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportGearCaracteristicAction.java index e18f143..4c11589 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportGearCaracteristicAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportGearCaracteristicAction.java @@ -24,7 +24,6 @@ package fr.ifremer.tutti.service.genericformat.importactions; * #L% */ -import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.service.genericformat.GenericFormatCsvFileResult; @@ -106,31 +105,27 @@ public class ImportGearCaracteristicAction extends ImportActionSupport { public void persistGearCaracteristics() { - importContext.doActionOnCruiseContexts(new GenericFormatImportContext.CruiseContextAction() { + importContext.doActionOnCruiseContexts((cruiseContext, progressionModel) -> { - @Override - public void onCruise(GenericFormatImportCruiseContext cruiseContext, ProgressionModel progressionModel) { + importContext.increments(t("tutti.service.genericFormat.persist.gearCaracteristics", cruiseContext.getCruiseLabel())); - importContext.increments(t("tutti.service.genericFormat.persist.gearCaracteristics", cruiseContext.getCruiseLabel())); + if (cruiseContext.withGearCaracteristics()) { - if (cruiseContext.withGearCaracteristics()) { + Set<Gear> gears = cruiseContext.getGearsWithcaracteristics(); - Set<Gear> gears = cruiseContext.getGearsWithcaracteristics(); + Cruise cruise = cruiseContext.getCruise(); - Cruise cruise = cruiseContext.getCruise(); - - for (Gear gear : gears) { - - if (log.isInfoEnabled()) { - log.info("Persist " + gear.getCaracteristics().size() + " gear caracteristics for gear: " + gear.getName() + " for cruise: " + cruiseContext.getCruiseLabel()); - } - persistenceHelper.saveGearCaracteristics(gear, cruise); + for (Gear gear : gears) { + if (log.isInfoEnabled()) { + log.info("Persist " + gear.getCaracteristics().size() + " gear caracteristics for gear: " + gear.getName() + " for cruise: " + cruiseContext.getCruiseLabel()); } + persistenceHelper.saveGearCaracteristics(gear, cruise); } } + }); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportIndividualObservationAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportIndividualObservationAction.java index e62813d..5206b12 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportIndividualObservationAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportIndividualObservationAction.java @@ -153,7 +153,7 @@ public class ImportIndividualObservationAction extends ImportActionSupport { private void deleteIndividualObservationBatches(GenericFormatImportOperationContext fishingOperationContext) { FishingOperation fishingOperation = fishingOperationContext.getFishingOperation(); - persistenceHelper.deleteIndividualObservationBatchForFishingOperation(fishingOperation.getId()); + persistenceHelper.deleteIndividualObservationBatchForFishingOperation(fishingOperation.getIdAsInt()); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportMarineLitterAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportMarineLitterAction.java index ca254be..b94a2c7 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportMarineLitterAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportMarineLitterAction.java @@ -170,7 +170,7 @@ public class ImportMarineLitterAction extends ImportActionSupport { private void deleteMarineLitterBatches(GenericFormatImportOperationContext fishingOperationContext) { FishingOperation fishingOperation = fishingOperationContext.getFishingOperation(); - persistenceHelper.deleteMarineLitterForFishingOperation(fishingOperation.getId()); + persistenceHelper.deleteMarineLitterForFishingOperation(fishingOperation.getIdAsInt()); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportOperationAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportOperationAction.java index 11d02fd..f4b0d67 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportOperationAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportOperationAction.java @@ -28,7 +28,6 @@ import com.google.common.base.Preconditions; import fr.ifremer.adagio.core.dao.referential.ObjectTypeCode; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; -import fr.ifremer.tutti.persistence.entities.data.CatchBatchs; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.model.OperationDataModel; import fr.ifremer.tutti.service.genericformat.GenericFormatImportContext; @@ -225,9 +224,9 @@ public class ImportOperationAction extends ImportActionSupport { CatchBatch updatedCatchBatch; - if (persistenceHelper.isWithCatchBatch(updatedFishingOperation.getId())) { + if (persistenceHelper.isWithCatchBatch(updatedFishingOperation.getIdAsInt())) { - CatchBatch existingCatchBatch = persistenceHelper.getExistingCatchBatch(updatedFishingOperation.getId()); + CatchBatch existingCatchBatch = persistenceHelper.getExistingCatchBatch(updatedFishingOperation.getIdAsInt()); catchBatch.setId(existingCatchBatch.getId()); if (!importContext.getImportRequest().isImportSpecies()) { @@ -287,30 +286,30 @@ public class ImportOperationAction extends ImportActionSupport { } - private Pair<FishingOperation, CatchBatch> loadFishingOperation(FishingOperation fishingOperation) { - - String operationStr = importContext.decorate(fishingOperation); - - boolean createFishingOperation = TuttiEntities.isNew(fishingOperation); - Preconditions.checkState(!createFishingOperation, "In loadFishingOperation method, can't create new operation: " + operationStr); - Preconditions.checkState(!importContext.getImportRequest().isUpdateOperations(), "In loadFishingOperation method, must not be allowed to update operation: " + operationStr); - - if (log.isInfoEnabled()) { - log.info("Loading fishing Operation: " + operationStr); - } - - FishingOperation loadedFishingOperation = persistenceHelper.saveFishingOperation(fishingOperation); - - CatchBatch loadedCatchBatch = persistenceHelper.getExistingCatchBatch(loadedFishingOperation.getId()); - - if (loadedCatchBatch == null) { - - loadedCatchBatch = CatchBatchs.newCatchBatch(); - - } - - return Pair.of(loadedFishingOperation, loadedCatchBatch); - - } +// private Pair<FishingOperation, CatchBatch> loadFishingOperation(FishingOperation fishingOperation) { +// +// String operationStr = importContext.decorate(fishingOperation); +// +// boolean createFishingOperation = TuttiEntities.isNew(fishingOperation); +// Preconditions.checkState(!createFishingOperation, "In loadFishingOperation method, can't create new operation: " + operationStr); +// Preconditions.checkState(!importContext.getImportRequest().isUpdateOperations(), "In loadFishingOperation method, must not be allowed to update operation: " + operationStr); +// +// if (log.isInfoEnabled()) { +// log.info("Loading fishing Operation: " + operationStr); +// } +// +// FishingOperation loadedFishingOperation = persistenceHelper.saveFishingOperation(fishingOperation); +// +// CatchBatch loadedCatchBatch = persistenceHelper.getExistingCatchBatch(loadedFishingOperation.getIdAsInt()); +// +// if (loadedCatchBatch == null) { +// +// loadedCatchBatch = CatchBatchs.newCatchBatch(); +// +// } +// +// return Pair.of(loadedFishingOperation, loadedCatchBatch); +// +// } } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportParameterAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportParameterAction.java index 02e1d03..1728160 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportParameterAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportParameterAction.java @@ -24,12 +24,10 @@ package fr.ifremer.tutti.service.genericformat.importactions; * #L% */ -import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.genericformat.GenericFormatCsvFileResult; import fr.ifremer.tutti.service.genericformat.GenericFormatImportContext; -import fr.ifremer.tutti.service.genericformat.GenericFormatImportCruiseContext; import fr.ifremer.tutti.service.genericformat.GenericFormatImportOperationContext; import fr.ifremer.tutti.service.genericformat.GenericformatImportPersistenceHelper; import fr.ifremer.tutti.service.genericformat.consumer.CsvConsumerForParameter; @@ -105,59 +103,55 @@ public class ImportParameterAction extends ImportActionSupport { public void persistFishingOperationParameters() { - importContext.doActionOnCruiseContexts(new GenericFormatImportContext.CruiseContextAction() { + importContext.doActionOnCruiseContexts((cruiseContext, progressionModel) -> { - @Override - public void onCruise(GenericFormatImportCruiseContext cruiseContext, ProgressionModel progressionModel) { + boolean updateOperations = importContext.getImportRequest().isUpdateOperations(); - boolean updateOperations = importContext.getImportRequest().isUpdateOperations(); + for (GenericFormatImportOperationContext fishingOperationContext : cruiseContext) { - for (GenericFormatImportOperationContext fishingOperationContext : cruiseContext) { + String cruiseStr = cruiseContext.getCruiseLabel(); + String operationStr = fishingOperationContext.getFishingOperationLabel(); - String cruiseStr = cruiseContext.getCruiseLabel(); - String operationStr = fishingOperationContext.getFishingOperationLabel(); + importContext.increments(t("tutti.service.genericFormat.persist.operation.parameters", cruiseStr, operationStr)); - importContext.increments(t("tutti.service.genericFormat.persist.operation.parameters", cruiseStr, operationStr)); + if (updateOperations) { - if (updateOperations) { + boolean persist = false; - boolean persist = false; + FishingOperation fishingOperation = fishingOperationContext.getFishingOperation(); - FishingOperation fishingOperation = fishingOperationContext.getFishingOperation(); - - if (fishingOperationContext.withGearFeatures()) { - - CaracteristicMap gearUseFeatures = fishingOperationContext.getGearUseFeatures(); - fishingOperation.setGearUseFeatures(gearUseFeatures); - if (log.isInfoEnabled()) { - log.info("Persist " + gearUseFeatures.size() + " gear use features of " + operationStr + " for cruise: " + cruiseStr); - } - - persist = true; + if (fishingOperationContext.withGearFeatures()) { + CaracteristicMap gearUseFeatures = fishingOperationContext.getGearUseFeatures(); + fishingOperation.setGearUseFeatures(gearUseFeatures); + if (log.isInfoEnabled()) { + log.info("Persist " + gearUseFeatures.size() + " gear use features of " + operationStr + " for cruise: " + cruiseStr); } - if (fishingOperationContext.withVesselFeatures()) { + persist = true; - CaracteristicMap vesselUseFeatures = fishingOperationContext.getVesselUseFeatures(); - fishingOperation.setVesselUseFeatures(vesselUseFeatures); - if (log.isInfoEnabled()) { - log.info("Persist " + vesselUseFeatures.size() + " vessel use features of " + operationStr + " for cruise: " + cruiseStr); - } + } - persist = true; + if (fishingOperationContext.withVesselFeatures()) { + CaracteristicMap vesselUseFeatures = fishingOperationContext.getVesselUseFeatures(); + fishingOperation.setVesselUseFeatures(vesselUseFeatures); + if (log.isInfoEnabled()) { + log.info("Persist " + vesselUseFeatures.size() + " vessel use features of " + operationStr + " for cruise: " + cruiseStr); } - if (persist) { + persist = true; - persistenceHelper.saveFishingOperation(fishingOperation); + } - } + if (persist) { + + persistenceHelper.saveFishingOperation(fishingOperation); } } + } }); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportReferentialPersonAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportReferentialPersonAction.java index cdde930..50ae44b 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportReferentialPersonAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportReferentialPersonAction.java @@ -30,7 +30,6 @@ import fr.ifremer.tutti.service.genericformat.GenericFormatReferentialImportResu import fr.ifremer.tutti.service.genericformat.GenericformatImportPersistenceHelper; import fr.ifremer.tutti.service.referential.ReferentialImportRequest; import fr.ifremer.tutti.service.referential.ReferentialImportResult; -import fr.ifremer.tutti.service.referential.ReferentialTemporaryPersonService; import fr.ifremer.tutti.service.referential.consumer.CsvConsumerForTemporaryPerson; import fr.ifremer.tutti.service.referential.csv.PersonRow; import org.apache.commons.logging.Log; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportReferentialVesselAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportReferentialVesselAction.java index a275391..2f6692c 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportReferentialVesselAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportReferentialVesselAction.java @@ -30,7 +30,6 @@ import fr.ifremer.tutti.service.genericformat.GenericFormatReferentialImportResu import fr.ifremer.tutti.service.genericformat.GenericformatImportPersistenceHelper; import fr.ifremer.tutti.service.referential.ReferentialImportRequest; import fr.ifremer.tutti.service.referential.ReferentialImportResult; -import fr.ifremer.tutti.service.referential.ReferentialTemporaryVesselService; import fr.ifremer.tutti.service.referential.consumer.CsvConsumerForTemporaryVessel; import fr.ifremer.tutti.service.referential.csv.VesselRow; import org.apache.commons.logging.Log; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportSurveyAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportSurveyAction.java index ef6f88b..a209b1d 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportSurveyAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportSurveyAction.java @@ -167,7 +167,7 @@ public class ImportSurveyAction extends ImportActionSupport { } - existingFishingOperations = persistenceHelper.getFishingOperations(existingCruiseData.getId()); + existingFishingOperations = persistenceHelper.getFishingOperations(existingCruiseData.getIdAsInt()); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/RestoreAfterImportAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/RestoreAfterImportAction.java index 8f41ae1..de7eabf 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/RestoreAfterImportAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/RestoreAfterImportAction.java @@ -62,18 +62,8 @@ public class RestoreAfterImportAction extends ImportActionSupport { protected void doExecute() { Set<Runnable> actions = new HashSet<>(); - actions.add(new Runnable() { - @Override - public void run() { - rollbackSampleCategoryModel(importContext.getImportRequest()); - } - }); - actions.add(new Runnable() { - @Override - public void run() { - rollbackProtocol(importContext.getImportRequest()); - } - }); + actions.add(() -> rollbackSampleCategoryModel(importContext.getImportRequest())); + actions.add(() -> rollbackProtocol(importContext.getImportRequest())); for (Runnable action : actions) { try { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/RestoreAfterValidateAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/RestoreAfterValidateAction.java index ff8205c..ea4f6f5 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/RestoreAfterValidateAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/RestoreAfterValidateAction.java @@ -24,7 +24,6 @@ package fr.ifremer.tutti.service.genericformat.importactions; * #L% */ -import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; @@ -43,6 +42,7 @@ import org.apache.commons.logging.LogFactory; import java.util.HashSet; import java.util.Set; +import java.util.stream.Collectors; /** * Created on 3/25/15. @@ -71,50 +71,16 @@ public class RestoreAfterValidateAction extends ImportActionSupport { protected void doExecute() { Set<Runnable> actions = new HashSet<>(); - actions.add(new Runnable() { - @Override - public void run() { - rollbackSampleCategoryModel(importContext.getImportRequest()); - } - }); - actions.add(new Runnable() { - @Override - public void run() { - // clean imported protocol - rollbackProtocol(); - } - }); - actions.add(new Runnable() { - @Override - public void run() { - // push back if any previous protocol - rollbackPreviousProtocol(importContext.getImportRequest()); - } - }); - actions.add(new Runnable() { - @Override - public void run() { - rollbackTemporaryGears(); - } - }); - actions.add(new Runnable() { - @Override - public void run() { - rollbackTemporaryPersons(); - } - }); - actions.add(new Runnable() { - @Override - public void run() { - rollbackTemporarySpecies(); - } - }); - actions.add(new Runnable() { - @Override - public void run() { - rollbackTemporaryVessels(); - } + actions.add(() -> rollbackSampleCategoryModel(importContext.getImportRequest())); + actions.add(this::rollbackProtocol); + actions.add(() -> { + // push back if any previous protocol + rollbackPreviousProtocol(importContext.getImportRequest()); }); + actions.add(this::rollbackTemporaryGears); + actions.add(this::rollbackTemporaryPersons); + actions.add(this::rollbackTemporarySpecies); + actions.add(this::rollbackTemporaryVessels); for (Runnable action : actions) { try { @@ -171,7 +137,7 @@ public class RestoreAfterValidateAction extends ImportActionSupport { protected void rollbackTemporaryGears() { GenericFormatReferentialImportResult<Gear, Integer> fileResult = importContext.getReferentialTemporaryGearFileResult(); - Set<Integer> addedEntriesIds = Sets.newHashSet(Iterables.transform(fileResult.getEntitiesAdded(), TuttiEntities.GET_ID_AS_INT)); + Set<Integer> addedEntriesIds = Sets.newHashSet(fileResult.getEntitiesAdded().stream().map(TuttiEntities.GET_ID_AS_INT::apply).collect(Collectors.toList())); if (!addedEntriesIds.isEmpty()) { if (log.isInfoEnabled()) { log.info("Rollback previous imported temporary gears: " + addedEntriesIds); @@ -184,7 +150,7 @@ public class RestoreAfterValidateAction extends ImportActionSupport { protected void rollbackTemporaryPersons() { GenericFormatReferentialImportResult<Person, Integer> fileResult = importContext.getReferentialTemporaryPersonFileResult(); - Set<Integer> addedEntriesIds = Sets.newHashSet(Iterables.transform(fileResult.getEntitiesAdded(), TuttiEntities.GET_ID_AS_INT)); + Set<Integer> addedEntriesIds = Sets.newHashSet(fileResult.getEntitiesAdded().stream().map(TuttiEntities.GET_ID_AS_INT::apply).collect(Collectors.toList())); if (!addedEntriesIds.isEmpty()) { if (log.isInfoEnabled()) { log.info("Rollback previous imported temporary persons: " + addedEntriesIds); @@ -197,7 +163,7 @@ public class RestoreAfterValidateAction extends ImportActionSupport { protected void rollbackTemporarySpecies() { GenericFormatReferentialImportResult<Species, Integer> fileResult = importContext.getReferentialTemporarySpeciesFileResult(); - Set<Integer> addedEntriesIds = Sets.newHashSet(Iterables.transform(fileResult.getEntitiesAdded(), Speciess.GET_REFERECE_TAXON_ID_AS_INT)); + Set<Integer> addedEntriesIds = Sets.newHashSet(fileResult.getEntitiesAdded().stream().map(Speciess.GET_REFERECE_TAXON_ID_AS_INT::apply).collect(Collectors.toList())); if (!addedEntriesIds.isEmpty()) { if (log.isInfoEnabled()) { log.info("Rollback previous imported temporary species: " + addedEntriesIds); @@ -210,7 +176,7 @@ public class RestoreAfterValidateAction extends ImportActionSupport { protected void rollbackTemporaryVessels() { GenericFormatReferentialImportResult<Vessel, String> fileResult = importContext.getReferentialTemporaryVesselFileResult(); - Set<String> addedEntriesIds = Sets.newHashSet(Iterables.transform(fileResult.getEntitiesAdded(), TuttiEntities.GET_ID)); + Set<String> addedEntriesIds = Sets.newHashSet(fileResult.getEntitiesAdded().stream().map(TuttiEntities.GET_ID::apply).collect(Collectors.toList())); if (!addedEntriesIds.isEmpty()) { if (log.isInfoEnabled()) { log.info("Rollback previous imported temporary vessels: " + addedEntriesIds); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ValidateSurveyAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ValidateSurveyAction.java index b39d014..cce4928 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ValidateSurveyAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ValidateSurveyAction.java @@ -101,7 +101,7 @@ public class ValidateSurveyAction extends ImportActionSupport { } else { - existingFishingOperations = persistenceHelper.getFishingOperations(existingCruiseData.getId()); + existingFishingOperations = persistenceHelper.getFishingOperations(existingCruiseData.getIdAsInt()); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java index 8921793..251b6f1 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForCatch.java @@ -259,7 +259,7 @@ public class CsvProducerForCatch extends CsvProducer<CatchRow, CatchModel> { // on a leaf, get frequencies List<SpeciesBatchFrequency> speciesBatchFrequency = - operationExportContext.getAllSpeciesBatchFrequency(speciesBatch.getId()); + operationExportContext.getAllSpeciesBatchFrequency(speciesBatch.getIdAsInt()); if (CollectionUtils.isEmpty(speciesBatchFrequency)) { @@ -398,7 +398,7 @@ public class CsvProducerForCatch extends CsvProducer<CatchRow, CatchModel> { // on a leaf, get frequencies List<BenthosBatchFrequency> benthosBatchFrequency = - operationExportContext.getAllBenthosBatchFrequency(benthosBatch.getId()); + operationExportContext.getAllBenthosBatchFrequency(benthosBatch.getIdAsInt()); if (CollectionUtils.isEmpty(benthosBatchFrequency)) { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForSpecies.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForSpecies.java index a65336a..b0412fb 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForSpecies.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForSpecies.java @@ -38,7 +38,6 @@ import fr.ifremer.tutti.service.genericformat.csv.SpeciesExportRow; import java.nio.file.Path; import java.util.Collections; -import java.util.Comparator; import java.util.List; import java.util.Map; @@ -95,12 +94,7 @@ public class CsvProducerForSpecies extends CsvProducer<SpeciesExportRow, Species List<SpeciesExportRow> result = Lists.newArrayList(speciesToExport.values()); - Collections.sort(result, new Comparator<SpeciesExportRow>() { - @Override - public int compare(SpeciesExportRow o1, SpeciesExportRow o2) { - return o1.getSpecies().getReferenceTaxonId().compareTo(o2.getSpecies().getReferenceTaxonId()); - } - }); + Collections.sort(result, (o1, o2) -> o1.getSpecies().getReferenceTaxonId().compareTo(o2.getSpecies().getReferenceTaxonId())); return result; } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/FishingOperationImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/FishingOperationImportService.java index f34b85c..2b41bb8 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/FishingOperationImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/FishingOperationImportService.java @@ -24,7 +24,6 @@ package fr.ifremer.tutti.service.operationimport; * #L% */ -import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.Maps; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; @@ -155,12 +154,7 @@ public class FishingOperationImportService extends AbstractTuttiService { this.modelGearShootingStartOnlyDate = null; } - this.mappingRowsByField = Maps.uniqueIndex(protocol.getOperationFieldMapping(), new Function<OperationFieldMappingRow, String>() { - @Override - public String apply(OperationFieldMappingRow operationFieldMappingRow) { - return operationFieldMappingRow.getField(); - } - }); + this.mappingRowsByField = Maps.uniqueIndex(protocol.getOperationFieldMapping(), OperationFieldMappingRow::getField); } @Override diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileModel.java index 42a46e4..83f3f27 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/operationimport/ImportFromColumnFileModel.java @@ -241,49 +241,46 @@ public class ImportFromColumnFileModel extends AbstractTuttiImportModel<FishingO int pmfmId = Integer.parseInt(mappingRow.getPmfmId()); final Caracteristic caracteristic = persistenceService.getCaracteristic(pmfmId); - ValueSetter<FishingOperation, String> setter = new ValueSetter<FishingOperation, String>() { - @Override - public void set(FishingOperation fishingOperation, String value) throws Exception { - - Serializable realValue = null; - if (StringUtils.isNotBlank(value)) { - switch (caracteristic.getCaracteristicType()) { - case QUALITATIVE: - for (CaracteristicQualitativeValue cqv : caracteristic.getQualitativeValue()) { - if (value.equals(cqv.getId())) { - realValue = cqv; - break; - } + ValueSetter<FishingOperation, String> setter = (fishingOperation1, value) -> { + + Serializable realValue = null; + if (StringUtils.isNotBlank(value)) { + switch (caracteristic.getCaracteristicType()) { + case QUALITATIVE: + for (CaracteristicQualitativeValue cqv : caracteristic.getQualitativeValue()) { + if (value.equals(cqv.getId())) { + realValue = cqv; + break; } - break; + } + break; - case NUMBER: - realValue = Float.parseFloat(value); - break; + case NUMBER: + realValue = Float.parseFloat(value); + break; - default: - realValue = value; - } + default: + realValue = value; } + } - CaracteristicMap caracteristicMap; - if (CaracteristicType.GEAR_USE_FEATURE.toString().equals(mappingRow.getTab())) { - caracteristicMap = fishingOperation.getGearUseFeatures(); - if (caracteristicMap == null) { - caracteristicMap = new CaracteristicMap(); - fishingOperation.setGearUseFeatures(caracteristicMap); - } - - } else { - caracteristicMap = fishingOperation.getVesselUseFeatures(); - if (caracteristicMap == null) { - caracteristicMap = new CaracteristicMap(); - fishingOperation.setVesselUseFeatures(caracteristicMap); - } + CaracteristicMap caracteristicMap; + if (CaracteristicType.GEAR_USE_FEATURE.toString().equals(mappingRow.getTab())) { + caracteristicMap = fishingOperation1.getGearUseFeatures(); + if (caracteristicMap == null) { + caracteristicMap = new CaracteristicMap(); + fishingOperation1.setGearUseFeatures(caracteristicMap); } - caracteristicMap.put(caracteristic, realValue); + } else { + caracteristicMap = fishingOperation1.getVesselUseFeatures(); + if (caracteristicMap == null) { + caracteristicMap = new CaracteristicMap(); + fishingOperation1.setVesselUseFeatures(caracteristicMap); + } } + caracteristicMap.put(caracteristic, realValue); + }; newMandatoryColumn(importColumn, setter); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java index c96ebce..fd0b43e 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java @@ -149,14 +149,7 @@ public class ProtocolImportExportService extends AbstractTuttiService { caracteristicMapping = new ArrayList<>(); } Map<String, CaracteristicMappingRow> rowsByCaracteristicId = - new HashMap<>(Maps.uniqueIndex(caracteristicMapping, - new Function<CaracteristicMappingRow, String>() { - - @Override - public String apply(CaracteristicMappingRow caracteristicMappingRow) { - return caracteristicMappingRow.getPmfmId(); - } - })); + new HashMap<>(Maps.uniqueIndex(caracteristicMapping, CaracteristicMappingRow::getPmfmId)); mergeCaracteristicMappingRows(ids, rowsByCaracteristicId, CaracteristicType.GEAR_USE_FEATURE); mergeCaracteristicMappingRows(ids, rowsByCaracteristicId, CaracteristicType.VESSEL_USE_FEATURE); @@ -551,7 +544,7 @@ public class ProtocolImportExportService extends AbstractTuttiService { throw new ImportRuntimeException(t("tutti.service.protocol.import.cps.maturity.error", refTaxId)); } else { - checkCpfDefsValidity(refTaxId, cpsDefs.stream().filter(cpsDef -> cpsDef.getMaturity()).collect(Collectors.toList())); + checkCpfDefsValidity(refTaxId, cpsDefs.stream().filter(CalcifiedPiecesSamplingDefinition::getMaturity).collect(Collectors.toList())); checkCpfDefsValidity(refTaxId, cpsDefs.stream().filter(cpsDef -> !cpsDef.getMaturity()).collect(Collectors.toList())); } @@ -617,17 +610,9 @@ public class ProtocolImportExportService extends AbstractTuttiService { List<String> result = Lists.newArrayList(); if (CollectionUtils.isNotEmpty(fromProtocol)) { - for (String s : fromProtocol) { - if (!result.contains(s)) { - result.add(s); - } - } - } - for (String s : fromImport) { - if (!result.contains(s)) { - result.add(s); - } + fromProtocol.stream().filter(s -> !result.contains(s)).forEach(result::add); } + fromImport.stream().filter(s -> !result.contains(s)).forEach(result::add); return result; } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportModel.java index 4336c91..2c7ae1d 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportModel.java @@ -91,8 +91,7 @@ public class PsionImportModel { } public Set<Species> getSpecies() { - Set<Species> result = ImmutableSet.copyOf(speciesSet); - return result; + return ImmutableSet.copyOf(speciesSet); } public List<PsionImportBatchModel> getUnsortedBatches(Species species) { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java index 9f9103e..5f16b2b 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/psionimport/PsionImportService.java @@ -111,7 +111,7 @@ public class PsionImportService extends AbstractTuttiService { * @author Tony Chemit - chemit@codelutin.com * @since 3.0.1 */ - public static enum PsionImportKeyword { + public enum PsionImportKeyword { ESPE, POID, @@ -234,7 +234,7 @@ public class PsionImportService extends AbstractTuttiService { } BatchContainer<SpeciesBatch> rootSpeciesBatch = - persistenceService.getRootSpeciesBatch(operation.getId(), false); + persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); Set<Species> alreadyUsedSpecies = Sets.newHashSet(); for (SpeciesBatch speciesBatch : rootSpeciesBatch.getChildren()) { @@ -734,7 +734,7 @@ public class PsionImportService extends AbstractTuttiService { if (TuttiEntities.isNew(childBatch)) { // persist it - childBatch = persistenceService.createSpeciesBatch(childBatch, parentBatch.getId(), true); + childBatch = persistenceService.createSpeciesBatch(childBatch, parentBatch.getIdAsInt(), true); parentBatch.addChildBatchs(childBatch); } @@ -799,7 +799,7 @@ public class PsionImportService extends AbstractTuttiService { toSave.add(batchFrequency); } - persistenceService.saveSpeciesBatchFrequency(batch.getId(), toSave); + persistenceService.saveSpeciesBatchFrequency(batch.getIdAsInt(), toSave); } protected SpeciesBatch createSpeciesBatch(FishingOperation operation, diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriExportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriExportService.java index 5ca1d37..6ca559f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriExportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriExportService.java @@ -25,7 +25,6 @@ package fr.ifremer.tutti.service.pupitri; */ import com.google.common.base.Charsets; -import com.google.common.base.Function; import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.AbstractTuttiService; @@ -56,14 +55,7 @@ public class PupitriExportService extends AbstractTuttiService { List<SpeciesRow> rows = Lists.newArrayList(); if (CollectionUtils.isNotEmpty(species)) { - rows = Lists.transform(species, new Function<Species, SpeciesRow>() { - - @Override - public SpeciesRow apply(Species input) { - SpeciesRow row = new SpeciesRow(input); - return row; - } - }); + rows = Lists.transform(species, SpeciesRow::new); } try { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java index 0fd9d1d..bab1c34 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportService.java @@ -502,9 +502,9 @@ public class PupitriImportService extends AbstractTuttiService { // delete all species batches - BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); for (SpeciesBatch batch : rootSpeciesBatch.getChildren()) { - persistenceService.deleteSpeciesBatch(batch.getId()); + persistenceService.deleteSpeciesBatch(batch.getIdAsInt()); } // insert all imported species batches @@ -556,7 +556,7 @@ public class PupitriImportService extends AbstractTuttiService { batch = persistenceService.createSpeciesBatch(batch, null, true); - String parentBatchId = batch.getId(); + Integer parentBatchId = batch.getIdAsInt(); for (Signs signs : pupitriSpeciesContext.getSigns()) { @@ -608,7 +608,7 @@ public class PupitriImportService extends AbstractTuttiService { if (importMissingCategoryBatches) { - String parentBatchId = batch.getId(); + Integer parentBatchId = batch.getIdAsInt(); String speciesId = species.getSurveyCode(); List<Signs> signs2add = null; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriSpeciesContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriSpeciesContext.java index 2c1cc50..3006fd0 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriSpeciesContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriSpeciesContext.java @@ -118,8 +118,7 @@ public class PupitriSpeciesContext implements Serializable { public boolean isMelagMetaSpecies() { - boolean melagMetaSpecies = MELAG_SPECIES.contains(species.getSurveyCode()); - return melagMetaSpecies; + return MELAG_SPECIES.contains(species.getSurveyCode()); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/csv/CarrouselRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/csv/CarrouselRow.java index e7ce1e5..651ee2f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/csv/CarrouselRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/csv/CarrouselRow.java @@ -137,8 +137,7 @@ public class CarrouselRow implements Serializable { public boolean isSorted() { - boolean sorted = Directions.VAT == direction; - return sorted; + return Directions.VAT == direction; } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportModel.java index 5c862aa..eb3d2a0 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportModel.java @@ -94,8 +94,7 @@ public class PupitriImportReportModel { float trunkSortedWeight = Numbers.getValueOrComputedValue(importResult.getSortedWeight(), 0f); float trunkRejectedWeight = Numbers.getValueOrComputedValue(importResult.getRejectedWeight(), 0f); - float totalWeight = Weights.roundKiloGram(trunkSortedWeight + trunkRejectedWeight); - return totalWeight; + return Weights.roundKiloGram(trunkSortedWeight + trunkRejectedWeight); } public Float getCarrouselSortedWeight() { @@ -112,8 +111,7 @@ public class PupitriImportReportModel { float trunkSortedWeight = Numbers.getValueOrComputedValue(importResult.getCarrouselSortedWeight(), 0f); float trunkRejectedWeight = Numbers.getValueOrComputedValue(importResult.getCarrouselUnsortedWeight(), 0f); - float totalWeight = Weights.roundKiloGram(trunkSortedWeight + trunkRejectedWeight); - return totalWeight; + return Weights.roundKiloGram(trunkSortedWeight + trunkRejectedWeight); } public Set<String> getNotImportedSpeciesIds() { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportRequest.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportRequest.java index 7f31441..4480f45 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportRequest.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportRequest.java @@ -25,7 +25,6 @@ package fr.ifremer.tutti.service.referential; */ import com.google.common.base.Function; -import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -35,6 +34,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.stream.Collectors; /** * Created on 11/16/14. @@ -66,7 +66,7 @@ public class ReferentialImportRequest<E extends TuttiReferentialEntity, K> { this.entityToIdFunction = entityToIdFunction; this.existingEntitiesById = Maps.uniqueIndex(existingEntities, entityToIdFunction); - this.existingNaturalIds = Sets.newHashSet(Iterables.transform(existingEntities, naturalIdFunction)); + this.existingNaturalIds = Sets.newHashSet(existingEntities.stream().map(naturalIdFunction::apply).collect(Collectors.toList())); this.newIds = new HashSet<>(); this.newNaturalIds = new HashSet<>(); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java index 68b54af..b573ca9 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java @@ -72,8 +72,7 @@ public class ReferentialTemporaryGearService extends AbstractTuttiService { public ReferentialImportRequest<Gear, Integer> createReferentialImportRequest() { List<Gear> allGears = Lists.newArrayList(persistenceService.getAllGear()); - ReferentialImportRequest<Gear, Integer> requestResult = new ReferentialImportRequest<>(allGears, TuttiEntities.<Gear>newIdAstIntFunction(), Gears.GET_NAME); - return requestResult; + return new ReferentialImportRequest<>(allGears, TuttiEntities.<Gear>newIdAstIntFunction(), Gears.GET_NAME); } @@ -97,8 +96,7 @@ public class ReferentialTemporaryGearService extends AbstractTuttiService { throw new ApplicationTechnicalException(t("tutti.service.referential.import.gears.error", file), e); } - ReferentialImportResult<Gear> result = executeImportRequest(requestResult); - return result; + return executeImportRequest(requestResult); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonService.java index b8ac05f..42ee1bf 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonService.java @@ -72,8 +72,7 @@ public class ReferentialTemporaryPersonService extends AbstractTuttiService { public ReferentialImportRequest<Person, Integer> createReferentialImportRequest() { List<Person> allPersons = persistenceService.getAllPerson(); - ReferentialImportRequest<Person, Integer> requestResult = new ReferentialImportRequest<>(allPersons, TuttiEntities.<Person>newIdAstIntFunction(), Persons.GET_FULL_NAME); - return requestResult; + return new ReferentialImportRequest<>(allPersons, TuttiEntities.<Person>newIdAstIntFunction(), Persons.GET_FULL_NAME); } @@ -97,8 +96,7 @@ public class ReferentialTemporaryPersonService extends AbstractTuttiService { throw new ApplicationTechnicalException(t("tutti.service.referential.import.persons.error", file), e); } - ReferentialImportResult<Person> result = executeImportRequest(requestResult); - return result; + return executeImportRequest(requestResult); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesService.java index 467b769..922bd54 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesService.java @@ -96,8 +96,7 @@ public class ReferentialTemporarySpeciesService extends AbstractTuttiService { throw new ApplicationTechnicalException(t("tutti.service.referential.import.species.error", file), e); } - ReferentialImportResult<Species> result = executeImportRequest(requestResult); - return result; + return executeImportRequest(requestResult); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java index 7a77d9c..5c5127e 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java @@ -96,8 +96,7 @@ public class ReferentialTemporaryVesselService extends AbstractTuttiService { throw new ApplicationTechnicalException(t("tutti.service.referential.import.vessels.error", file), e); } - ReferentialImportResult<Vessel> result = executeImportRequest(requestResult); - return result; + return executeImportRequest(requestResult); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialSynchronizeService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialSynchronizeService.java index 30c7013..b64b309 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialSynchronizeService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TuttiReferentialSynchronizeService.java @@ -157,12 +157,11 @@ public class TuttiReferentialSynchronizeService extends AbstractTuttiService { } public ReferentialSynchroContext createSynchroContext(File dbDirectory) { - ReferentialSynchroContext synchroContext = ReferentialSynchroContext.newContext( + return ReferentialSynchroContext.newContext( TABLE_NAMES, dbDirectory, new ReferentialSynchroResult() ); - return synchroContext; } public void prepare(ReferentialSynchroContext synchroContext) { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/PersonRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/PersonRow.java index 9734f47..9d476de 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/PersonRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/csv/PersonRow.java @@ -89,8 +89,7 @@ public class PersonRow { public String getFullName() { Person person = this.toEntity(); - String fullName = Persons.GET_FULL_NAME.apply(person); - return fullName; + return Persons.GET_FULL_NAME.apply(person); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/producer/CsvProducerForTemporaryGear.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/producer/CsvProducerForTemporaryGear.java index 8d73f7e..e071b52 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/producer/CsvProducerForTemporaryGear.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/producer/CsvProducerForTemporaryGear.java @@ -24,7 +24,6 @@ package fr.ifremer.tutti.service.referential.producer; * #L% */ -import com.google.common.base.Function; import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.service.csv.CsvProducer; @@ -48,14 +47,7 @@ public class CsvProducerForTemporaryGear extends CsvProducer<GearRow, GearModel> public List<GearRow> getDataToExport(List<Gear> toExport) { - List<GearRow> rows = Lists.transform(toExport, new Function<Gear, GearRow>() { - @Override - public GearRow apply(Gear Gear) { - return new GearRow(Gear); - } - }); - - return rows; + return Lists.transform(toExport, GearRow::new); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/producer/CsvProducerForTemporaryPerson.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/producer/CsvProducerForTemporaryPerson.java index 0cad3c2..2b6300a 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/producer/CsvProducerForTemporaryPerson.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/producer/CsvProducerForTemporaryPerson.java @@ -24,7 +24,6 @@ package fr.ifremer.tutti.service.referential.producer; * #L% */ -import com.google.common.base.Function; import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.service.csv.CsvProducer; @@ -48,14 +47,7 @@ public class CsvProducerForTemporaryPerson extends CsvProducer<PersonRow, Person public List<PersonRow> getDataToExport(List<Person> toExport) { - List<PersonRow> rows = Lists.transform(toExport, new Function<Person, PersonRow>() { - @Override - public PersonRow apply(Person Person) { - return new PersonRow(Person); - } - }); - - return rows; + return Lists.transform(toExport, PersonRow::new); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/producer/CsvProducerForTemporarySpecies.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/producer/CsvProducerForTemporarySpecies.java index ef1e262..9a74ac0 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/producer/CsvProducerForTemporarySpecies.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/producer/CsvProducerForTemporarySpecies.java @@ -24,7 +24,6 @@ package fr.ifremer.tutti.service.referential.producer; * #L% */ -import com.google.common.base.Function; import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.csv.CsvProducer; @@ -48,14 +47,7 @@ public class CsvProducerForTemporarySpecies extends CsvProducer<SpeciesRow, Spec public List<SpeciesRow> getDataToExport(List<Species> toExport) { - List<SpeciesRow> rows = Lists.transform(toExport, new Function<Species, SpeciesRow>() { - @Override - public SpeciesRow apply(Species species) { - return new SpeciesRow(species); - } - }); - - return rows; + return Lists.transform(toExport, SpeciesRow::new); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/producer/CsvProducerForTemporaryVessel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/producer/CsvProducerForTemporaryVessel.java index d4a3838..86e12ec 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/producer/CsvProducerForTemporaryVessel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/producer/CsvProducerForTemporaryVessel.java @@ -24,7 +24,6 @@ package fr.ifremer.tutti.service.referential.producer; * #L% */ -import com.google.common.base.Function; import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.service.csv.CsvProducer; @@ -48,14 +47,7 @@ public class CsvProducerForTemporaryVessel extends CsvProducer<VesselRow, Vessel public List<VesselRow> getDataToExport(List<Vessel> toExport) { - List<VesselRow> rows = Lists.transform(toExport, new Function<Vessel, VesselRow>() { - @Override - public VesselRow apply(Vessel Vessel) { - return new VesselRow(Vessel); - } - }); - - return rows; + return Lists.transform(toExport, VesselRow::new); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationRequest.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationRequest.java index 23ba176..232255a 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationRequest.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationRequest.java @@ -50,12 +50,12 @@ public class ReportGenerationRequest implements Serializable { /** * Selected cruise id (of fishing operation). */ - protected String cruiseId; + protected Integer cruiseId; /** * Selected fishing operation to report. */ - protected String fishingOperationId; + protected Integer fishingOperationId; public File getReport() { return report; @@ -73,19 +73,19 @@ public class ReportGenerationRequest implements Serializable { this.programId = programId; } - public String getCruiseId() { + public Integer getCruiseId() { return cruiseId; } - public void setCruiseId(String cruiseId) { + public void setCruiseId(Integer cruiseId) { this.cruiseId = cruiseId; } - public String getFishingOperationId() { + public Integer getFishingOperationId() { return fishingOperationId; } - public void setFishingOperationId(String fishingOperationId) { + public void setFishingOperationId(Integer fishingOperationId) { this.fishingOperationId = fishingOperationId; } } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationResult.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationResult.java index 0da3bee..6836f8f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationResult.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationResult.java @@ -58,11 +58,11 @@ public class ReportGenerationResult implements Serializable{ return request.getReport(); } - public String getCruiseId() { + public Integer getCruiseId() { return request.getCruiseId(); } - public String getFishingOperationId() { + public Integer getFishingOperationId() { return request.getFishingOperationId(); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationService.java index a2de34b..41f344b 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationService.java @@ -58,13 +58,7 @@ public class ReportGenerationService extends AbstractTuttiService { private static final Log log = LogFactory.getLog(ReportGenerationService.class); - private static final FileFilter REPORT_FILTER = new FileFilter() { - @Override - public boolean accept(File pathname) { - return pathname.isFile() && - pathname.getName().endsWith(".rptdesign"); - } - }; + private static final FileFilter REPORT_FILTER = pathname -> pathname.isFile() && pathname.getName().endsWith(".rptdesign"); public List<File> getAvailableReports() { List<File> result = Lists.newArrayList(); @@ -108,12 +102,11 @@ public class ReportGenerationService extends AbstractTuttiService { progressionModel.increments(t("tutti.report.step.generateReport", request.getReport().getName())); - ReportGenerationResult result = generateReport(reportContext); - return result; + return generateReport(reportContext); } - protected GenericFormatExportConfiguration createExportConfigurationForFishingOperation(String programId, String cruiseId, String fishingOperationId, File exportFile) { + protected GenericFormatExportConfiguration createExportConfigurationForFishingOperation(String programId, Integer cruiseId, Integer fishingOperationId, File exportFile) { Preconditions.checkNotNull(programId); Preconditions.checkNotNull(cruiseId); @@ -181,8 +174,7 @@ public class ReportGenerationService extends AbstractTuttiService { log.info("Report generated at: " + reportContext.getOutputFile()); } - ReportGenerationResult result = reportContext.toResult(); - return result; + return reportContext.toResult(); } diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/PersistenceServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/PersistenceServiceTest.java index 098b3d4..051686b 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/PersistenceServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/PersistenceServiceTest.java @@ -77,14 +77,14 @@ public class PersistenceServiceTest { */ { - Cruise cruise = service.getCruise("0"); + Cruise cruise = service.getCruise(0); assertContainsIds(cruise.getGear(), "-3", "-4"); - FishingOperation fishingOperation = service.getFishingOperation("0"); + FishingOperation fishingOperation = service.getFishingOperation(0); assertContainsId(fishingOperation.getGear(), "-4"); - assertContainsCaracteristics(service.getGearCaracteristics("0", "-4", (short) 1)); - assertContainsNoCaracteristics(service.getGearCaracteristics("0", "-3", (short) 2)); + assertContainsCaracteristics(service.getGearCaracteristics(0, -4, (short) 1)); + assertContainsNoCaracteristics(service.getGearCaracteristics(0, -3, (short) 2)); } { // replace -3 by 377 @@ -95,15 +95,15 @@ public class PersistenceServiceTest { } { - Cruise cruise = service.getCruise("0"); + Cruise cruise = service.getCruise(0); assertContainsIds(cruise.getGear(), "377", "-4"); - FishingOperation fishingOperation = service.getFishingOperation("0"); + FishingOperation fishingOperation = service.getFishingOperation(0); assertContainsId(fishingOperation.getGear(), "-4"); - assertContainsCaracteristics(service.getGearCaracteristics("0", "-4", (short) 1)); - assertContainsNoCaracteristics(service.getGearCaracteristics("0", "-3", (short) 2)); - assertContainsNoCaracteristics(service.getGearCaracteristics("0", "377", (short) 2)); + assertContainsCaracteristics(service.getGearCaracteristics(0, -4, (short) 1)); + assertContainsNoCaracteristics(service.getGearCaracteristics(0, -3, (short) 2)); + assertContainsNoCaracteristics(service.getGearCaracteristics(0, 377, (short) 2)); } { // replace -4 by 378 @@ -114,16 +114,16 @@ public class PersistenceServiceTest { } { - Cruise cruise = service.getCruise("0"); + Cruise cruise = service.getCruise(0); assertContainsIds(cruise.getGear(), "377", "378"); - FishingOperation fishingOperation = service.getFishingOperation("0"); + FishingOperation fishingOperation = service.getFishingOperation(0); assertContainsId(fishingOperation.getGear(), "378"); - assertContainsNoCaracteristics(service.getGearCaracteristics("0", "-4", (short) 1)); - assertContainsCaracteristics(service.getGearCaracteristics("0", "378", (short) 1)); - assertContainsNoCaracteristics(service.getGearCaracteristics("0", "-3", (short) 2)); - assertContainsNoCaracteristics(service.getGearCaracteristics("0", "377", (short) 2)); + assertContainsNoCaracteristics(service.getGearCaracteristics(0, -4, (short) 1)); + assertContainsCaracteristics(service.getGearCaracteristics(0, 378, (short) 1)); + assertContainsNoCaracteristics(service.getGearCaracteristics(0, -3, (short) 2)); + assertContainsNoCaracteristics(service.getGearCaracteristics(0, 377, (short) 2)); } } @@ -140,11 +140,11 @@ public class PersistenceServiceTest { */ { - Cruise cruise = service.getCruise("0"); + Cruise cruise = service.getCruise(0); assertContainsIds(cruise.getHeadOfMission(), "-1"); assertContainsIds(cruise.getHeadOfSortRoom(), "-2"); - FishingOperation fishingOperation = service.getFishingOperation("0"); + FishingOperation fishingOperation = service.getFishingOperation(0); assertContainsIds(fishingOperation.getRecorderPerson(), "-2", "-3"); } @@ -157,11 +157,11 @@ public class PersistenceServiceTest { { service = dbResource.getServiceContext().getService(PersistenceService.class); - Cruise cruise = service.getCruise("0"); + Cruise cruise = service.getCruise(0); assertContainsIds(cruise.getHeadOfMission(), "1"); assertContainsIds(cruise.getHeadOfSortRoom(), "-2"); - FishingOperation fishingOperation = service.getFishingOperation("0"); + FishingOperation fishingOperation = service.getFishingOperation(0); assertContainsIds(fishingOperation.getRecorderPerson(), "-2", "-3"); } @@ -172,11 +172,11 @@ public class PersistenceServiceTest { service.replacePerson(source, target, false); } { - Cruise cruise = service.getCruise("0"); + Cruise cruise = service.getCruise(0); assertContainsIds(cruise.getHeadOfMission(), "1"); assertContainsIds(cruise.getHeadOfSortRoom(), "2"); - FishingOperation fishingOperation = service.getFishingOperation("0"); + FishingOperation fishingOperation = service.getFishingOperation(0); assertContainsIds(fishingOperation.getRecorderPerson(), "2", "-3"); } @@ -187,11 +187,11 @@ public class PersistenceServiceTest { service.replacePerson(source, target, false); } { - Cruise cruise = service.getCruise("0"); + Cruise cruise = service.getCruise(0); assertContainsIds(cruise.getHeadOfMission(), "1"); assertContainsIds(cruise.getHeadOfSortRoom(), "2"); - FishingOperation fishingOperation = service.getFishingOperation("0"); + FishingOperation fishingOperation = service.getFishingOperation(0); assertContainsIds(fishingOperation.getRecorderPerson(), "2", "3"); } } @@ -208,15 +208,15 @@ public class PersistenceServiceTest { */ { - BatchContainer<SpeciesBatch> rootSpeciesBatch = service.getRootSpeciesBatch("0", false); + BatchContainer<SpeciesBatch> rootSpeciesBatch = service.getRootSpeciesBatch(0, false); assertSpeciesBatch(rootSpeciesBatch, "-1"); - BatchContainer<BenthosBatch> rootBenthosBatch = service.getRootBenthosBatch("0", false); + BatchContainer<BenthosBatch> rootBenthosBatch = service.getRootBenthosBatch(0, false); assertBenthosBatch(rootBenthosBatch, "-2"); - List<IndividualObservationBatch> allIndividualObservationBatch = service.getAllIndividualObservationBatch("0"); + List<IndividualObservationBatch> allIndividualObservationBatch = service.getAllIndividualObservationBatchsForFishingOperation(0); assertIndividualObservationBatch(allIndividualObservationBatch, "-3"); - List<AccidentalBatch> allAccidentalBatch = service.getAllAccidentalBatch("0"); + List<AccidentalBatch> allAccidentalBatch = service.getAllAccidentalBatch(0); assertAccidentalBatch(allAccidentalBatch, "-2"); } @@ -229,15 +229,15 @@ public class PersistenceServiceTest { } { - BatchContainer<SpeciesBatch> rootSpeciesBatch = service.getRootSpeciesBatch("0", false); + BatchContainer<SpeciesBatch> rootSpeciesBatch = service.getRootSpeciesBatch(0, false); assertSpeciesBatch(rootSpeciesBatch, "15461"); - BatchContainer<BenthosBatch> rootBenthosBatch = service.getRootBenthosBatch("0", false); + BatchContainer<BenthosBatch> rootBenthosBatch = service.getRootBenthosBatch(0, false); assertBenthosBatch(rootBenthosBatch, "-2"); - List<IndividualObservationBatch> allIndividualObservationBatch = service.getAllIndividualObservationBatch("0"); + List<IndividualObservationBatch> allIndividualObservationBatch = service.getAllIndividualObservationBatchsForFishingOperation(0); assertIndividualObservationBatch(allIndividualObservationBatch, "-3"); - List<AccidentalBatch> allAccidentalBatch = service.getAllAccidentalBatch("0"); + List<AccidentalBatch> allAccidentalBatch = service.getAllAccidentalBatch(0); assertAccidentalBatch(allAccidentalBatch, "-2"); } @@ -250,15 +250,15 @@ public class PersistenceServiceTest { } { - BatchContainer<SpeciesBatch> rootSpeciesBatch = service.getRootSpeciesBatch("0", false); + BatchContainer<SpeciesBatch> rootSpeciesBatch = service.getRootSpeciesBatch(0, false); assertSpeciesBatch(rootSpeciesBatch, "15461"); - BatchContainer<BenthosBatch> rootBenthosBatch = service.getRootBenthosBatch("0", false); + BatchContainer<BenthosBatch> rootBenthosBatch = service.getRootBenthosBatch(0, false); assertBenthosBatch(rootBenthosBatch, "15462"); - List<IndividualObservationBatch> allIndividualObservationBatch = service.getAllIndividualObservationBatch("0"); + List<IndividualObservationBatch> allIndividualObservationBatch = service.getAllIndividualObservationBatchsForFishingOperation(0); assertIndividualObservationBatch(allIndividualObservationBatch, "-3"); - List<AccidentalBatch> allAccidentalBatch = service.getAllAccidentalBatch("0"); + List<AccidentalBatch> allAccidentalBatch = service.getAllAccidentalBatch(0); assertAccidentalBatch(allAccidentalBatch, "15462"); } @@ -270,15 +270,15 @@ public class PersistenceServiceTest { } { - BatchContainer<SpeciesBatch> rootSpeciesBatch = service.getRootSpeciesBatch("0", false); + BatchContainer<SpeciesBatch> rootSpeciesBatch = service.getRootSpeciesBatch(0, false); assertSpeciesBatch(rootSpeciesBatch, "15461"); - BatchContainer<BenthosBatch> rootBenthosBatch = service.getRootBenthosBatch("0", false); + BatchContainer<BenthosBatch> rootBenthosBatch = service.getRootBenthosBatch(0, false); assertBenthosBatch(rootBenthosBatch, "15462"); - List<IndividualObservationBatch> allIndividualObservationBatch = service.getAllIndividualObservationBatch("0"); + List<IndividualObservationBatch> allIndividualObservationBatch = service.getAllIndividualObservationBatchsForFishingOperation(0); assertIndividualObservationBatch(allIndividualObservationBatch, "15463"); - List<AccidentalBatch> allAccidentalBatch = service.getAllAccidentalBatch("0"); + List<AccidentalBatch> allAccidentalBatch = service.getAllAccidentalBatch(0); assertAccidentalBatch(allAccidentalBatch, "15462"); } @@ -295,10 +295,10 @@ public class PersistenceServiceTest { */ { - Cruise cruise = service.getCruise("0"); + Cruise cruise = service.getCruise(0); assertContainsId(cruise.getVessel(), "#TEMP¿International registration code S3"); - FishingOperation fishingOperation = service.getFishingOperation("0"); + FishingOperation fishingOperation = service.getFishingOperation(0); assertContainsId(fishingOperation.getVessel(), "#TEMP¿International registration code S3"); assertContainsIds(fishingOperation.getSecondaryVessel(), "#TEMP¿International registration code S4"); } @@ -310,10 +310,10 @@ public class PersistenceServiceTest { service.replaceVessel(source, target, false); } { - Cruise cruise = service.getCruise("0"); + Cruise cruise = service.getCruise(0); assertContainsId(cruise.getVessel(), "267206"); - FishingOperation fishingOperation = service.getFishingOperation("0"); + FishingOperation fishingOperation = service.getFishingOperation(0); assertContainsId(fishingOperation.getVessel(), "267206"); assertContainsIds(fishingOperation.getSecondaryVessel(), "#TEMP¿International registration code S4"); } @@ -325,10 +325,10 @@ public class PersistenceServiceTest { service.replaceVessel(source, target, false); } { - Cruise cruise = service.getCruise("0"); + Cruise cruise = service.getCruise(0); assertContainsId(cruise.getVessel(), "267206"); - FishingOperation fishingOperation = service.getFishingOperation("0"); + FishingOperation fishingOperation = service.getFishingOperation(0); assertContainsId(fishingOperation.getVessel(), "267206"); assertContainsIds(fishingOperation.getSecondaryVessel(), "278970"); } @@ -366,7 +366,7 @@ public class PersistenceServiceTest { for (SpeciesBatch batch : rootSpeciesBatch.getChildren()) { assertContainsId(batch.getSpecies(), expectedId); - List<SpeciesBatchFrequency> frequencies = service.getAllSpeciesBatchFrequency(batch.getId()); + List<SpeciesBatchFrequency> frequencies = service.getAllSpeciesBatchFrequency(batch.getIdAsInt()); for (SpeciesBatchFrequency frequency : frequencies) { assertContainsId(frequency.getBatch().getSpecies(), expectedId); } @@ -379,7 +379,7 @@ public class PersistenceServiceTest { Assert.assertFalse(rootSpeciesBatch.isEmptyChildren()); for (BenthosBatch batch : rootSpeciesBatch.getChildren()) { assertContainsId(batch.getSpecies(), expectedId); - List<BenthosBatchFrequency> frequencies = service.getAllBenthosBatchFrequency(batch.getId()); + List<BenthosBatchFrequency> frequencies = service.getAllBenthosBatchFrequency(batch.getIdAsInt()); for (BenthosBatchFrequency frequency : frequencies) { assertContainsId(frequency.getBatch().getSpecies(), expectedId); } diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java index aff6910..fec703f 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/ServiceDbResource.java @@ -50,8 +50,6 @@ import org.nuiton.util.FileUtil; import java.io.File; import java.io.IOException; -import java.io.InputStream; -import java.net.URL; import java.util.List; import java.util.Locale; import java.util.Map; @@ -100,20 +98,20 @@ public class ServiceDbResource extends DatabaseResource { } } - public static void assertFileContent(String message, - URL actualFile, - String expectedContent) throws IOException { - - Assert.assertNotNull(actualFile); - InputStream inputStream = actualFile.openStream(); - Assert.assertNotNull(inputStream); - String fileContent = IOUtils.toString(inputStream, Charsets.UTF_8).trim(); - Assert.assertEquals(expectedContent, fileContent); - - if (log.isInfoEnabled()) { - log.info(message + fileContent); - } - } +// public static void assertFileContent(String message, +// URL actualFile, +// String expectedContent) throws IOException { +// +// Assert.assertNotNull(actualFile); +// InputStream inputStream = actualFile.openStream(); +// Assert.assertNotNull(inputStream); +// String fileContent = IOUtils.toString(inputStream, Charsets.UTF_8).trim(); +// Assert.assertEquals(expectedContent, fileContent); +// +// if (log.isInfoEnabled()) { +// log.info(message + fileContent); +// } +// } // protected TuttiServiceContext createServiceContext(RessourceClassLoader loader, protected TuttiServiceContext createServiceContext(TuttiConfiguration config) { @@ -182,9 +180,9 @@ public class ServiceDbResource extends DatabaseResource { protected TuttiServiceContext serviceContext; - public static ServiceDbResource readDb() { - return new ServiceDbResource(""); - } +// public static ServiceDbResource readDb() { +// return new ServiceDbResource(""); +// } public static ServiceDbResource writeDb() { return new ServiceDbResource("", true); @@ -252,8 +250,7 @@ public class ServiceDbResource extends DatabaseResource { ProtocolImportExportService protocolImportExportService = getServiceContext().getService(ProtocolImportExportService.class); - TuttiProtocol protocol = protocolImportExportService.importProtocol(protocolFile); - return protocol; + return protocolImportExportService.importProtocol(protocolFile); } @Override @@ -278,7 +275,7 @@ public class ServiceDbResource extends DatabaseResource { } } - public DataContext loadContext(String programId, String cruiseId, int nbExpectedOperations, String... expectedOperationId) { + public DataContext loadContext(String programId, Integer cruiseId, int nbExpectedOperations, Integer... expectedOperationId) { DataContext dataContext = new DataContext(); PersistenceService persistenceService = getServiceContext().getService(PersistenceService.class); @@ -289,14 +286,14 @@ public class ServiceDbResource extends DatabaseResource { Cruise cruise = persistenceService.getCruise(cruiseId); Assert.assertNotNull(cruise); - List<FishingOperation> operations = persistenceService.getAllFishingOperation(cruise.getId()); + List<FishingOperation> operations = persistenceService.getAllFishingOperation(cruise.getIdAsInt()); Assert.assertNotNull(operations); Assert.assertEquals(nbExpectedOperations, operations.size()); if (expectedOperationId != null) { int index = 0; - for (String id : expectedOperationId) { + for (Integer id : expectedOperationId) { FishingOperation fishingOperation = operations.get(index); - Assert.assertEquals("Fishign operation at index " + (index++) + " should have id " + id + " but was " + fishingOperation.getId(), id, fishingOperation.getId()); + Assert.assertEquals("Fishign operation at index " + (index++) + " should have id " + id + " but was " + fishingOperation.getId(), id, fishingOperation.getIdAsInt()); } } @@ -305,7 +302,7 @@ public class ServiceDbResource extends DatabaseResource { Lists.newArrayListWithCapacity(operations.size()); for (FishingOperation operation : operations) { FishingOperation loadedOeration = - persistenceService.getFishingOperation(operation.getId()); + persistenceService.getFishingOperation(operation.getIdAsInt()); loadedOperations.add(loadedOeration); } operations = loadedOperations; diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportService2Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportService2Test.java index a6a3326..60e7631 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportService2Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportService2Test.java @@ -92,9 +92,9 @@ public class BigfinImportService2Test { public static final String PROGRAM_ID = "CAM-CGFS"; - public static final String CRUISE_ID = "0"; + public static final Integer CRUISE_ID = 0; - public static final String OPERATION_1_ID = "1"; + public static final Integer OPERATION_1_ID = 1; @Before public void setUp() throws Exception { @@ -316,7 +316,7 @@ public class BigfinImportService2Test { Assert.assertEquals(0, errors.size()); Assert.assertEquals(0, warnings.size()); - BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(fishingOperation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(fishingOperation.getIdAsInt(), false); Assert.assertNotNull(rootSpeciesBatch); Assert.assertEquals(5, rootSpeciesBatch.sizeChildren()); @@ -333,7 +333,7 @@ public class BigfinImportService2Test { Set<Integer> sampleCategories = new LinkedHashSet<>(); SpeciesAbleBatchs.grabSampleCategorieValuesChildBatchs(speciesBatch, sampleCategories); - List<SpeciesBatchFrequency> allSpeciesBatchFrequency = persistenceService.getAllSpeciesBatchFrequency(speciesBatch.getId()); + List<SpeciesBatchFrequency> allSpeciesBatchFrequency = persistenceService.getAllSpeciesBatchFrequency(speciesBatch.getIdAsInt()); if (rajaClaSpecies.equals(speciesBatch.getSpecies())) { diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportServiceTest.java index 0c38460..ef3624e 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportServiceTest.java @@ -62,9 +62,9 @@ public class BigfinImportServiceTest { public static final String PROGRAM_ID = "CAM-TEST_"; - public static final String CRUISE_ID = "0"; + public static final Integer CRUISE_ID = 0; - public static final String OPERATION_1_ID = "0"; + public static final Integer OPERATION_1_ID = 0; protected BigfinImportService service; @@ -101,7 +101,7 @@ public class BigfinImportServiceTest { File importFile = dbResource.copyClassPathResource("bigfin/importbigfin-valid.csv", "importbigfin-valid.csv"); FishingOperation operation = dataContext.operations.get(0); - CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getIdAsInt()); catchBatch.setFishingOperation(operation); BigfinImportResult importResult = service.importFile(importFile, operation, catchBatch); @@ -122,7 +122,7 @@ public class BigfinImportServiceTest { Assert.assertEquals(0, warnings.size()); // no batch imported - BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); int totalSortedBatchs = 0; int totalUnsortedBatchs = 0; @@ -147,7 +147,7 @@ public class BigfinImportServiceTest { File importFile = dbResource.copyClassPathResource("bigfin/importbigfin-errors.csv", "importbigfin-invalid-errors.csv"); FishingOperation operation = dataContext.operations.get(0); - CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getIdAsInt()); catchBatch.setFishingOperation(operation); BigfinImportResult importResult = service.importFile(importFile, operation, catchBatch); @@ -189,7 +189,7 @@ public class BigfinImportServiceTest { File importFile = dbResource.copyClassPathResource("bigfin/importbigfin-warnings.csv", "importbigfin-invalid-warnings.csv"); FishingOperation operation = dataContext.operations.get(0); - CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getIdAsInt()); catchBatch.setFishingOperation(operation); BigfinImportResult importResult = service.importFile(importFile, operation, catchBatch); diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/WeightComputingServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/WeightComputingServiceTest.java index 94bdffc..7ef3905 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/WeightComputingServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/WeightComputingServiceTest.java @@ -56,28 +56,28 @@ public class WeightComputingServiceTest { public static final String PROGRAM_ID = "CAM-CGFS"; - public static final String CRUISE_ID = "100002"; + public static final Integer CRUISE_ID = 100002; /* the one with the batches to compute */ - public static final String OPERATION_1_ID = "100108"; + public static final Integer OPERATION_1_ID = 100108; /* the one with the total species weight less than the sum of the batches */ - public static final String OPERATION_2_ID = "100109"; + public static final Integer OPERATION_2_ID = 100109; /* the one with the total benthos weight less than the sum of the batches */ - public static final String OPERATION_3_ID = "100110"; + public static final Integer OPERATION_3_ID = 100110; /* the one with the total marine litter weight less than the sum of the batches */ - public static final String OPERATION_4_ID = "100111"; + public static final Integer OPERATION_4_ID = 100111; /* the one with the total catch weight different from the sum of the sorted and unsorted total weight */ - public static final String OPERATION_5_ID = "100112"; + public static final Integer OPERATION_5_ID = 100112; /* the one with the total catch weight different from the rejected weight */ - public static final String OPERATION_6_ID = "100113"; + public static final Integer OPERATION_6_ID = 100113; /* the one working */ - public static final String OPERATION_7_ID = "100114"; + public static final Integer OPERATION_7_ID = 100114; protected WeightComputingService weightComputingService; diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportServiceTest.java index fa71164..7550f97 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/multipost/MultiPostExportServiceTest.java @@ -46,11 +46,11 @@ public class MultiPostExportServiceTest { public static final String PROGRAM_ID = "CAM-CGFS"; - public static final String CRUISE_ID = "100001"; + public static final Integer CRUISE_ID = 100001; - public static final String OPERATION_1_ID = "100106"; + public static final Integer OPERATION_1_ID = 100106; - public static final String OPERATION_2_ID = "100107"; + public static final Integer OPERATION_2_ID = 100107; public static final String SPECIES_CONTENT = "id;parentId;species;categoryId;categoryValue;categoryWeight;weight;number;comment;toConfirm\n" + "CatchRow_1;;11242;1428;311;100.0;;;;N\n" + diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportServiceTest.java index aca0fbb..ffe91f9 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportServiceTest.java @@ -86,7 +86,7 @@ public class MultiPostImportServiceTest { dbResource.openDataContext(); - dataContext = dbResource.loadContext("CAM-MEDITS", "100000", 0); + dataContext = dbResource.loadContext("CAM-MEDITS", 100000, 0); speciesFile = FileUtil.getFileFromPaths(new File("src"), "test", "data", dbResource.getDbName(), "species"); benthosFile = FileUtil.getFileFromPaths(new File("src"), "test", "data", dbResource.getDbName(), "benthos"); diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportServiceTest.java index 724d4ec..b555557 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/export/pdf/CatchesPdfExportServiceTest.java @@ -46,9 +46,9 @@ public class CatchesPdfExportServiceTest { public static final String PROGRAM_ID = "CAM-MEDITS"; - public static final String CRUISE_ID = "100001"; + public static final Integer CRUISE_ID = 100001; - public static final String OPERATION_1_ID = "100106"; + public static final Integer OPERATION_1_ID = 100106; protected CatchesPdfExportService exportService; diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportServiceTest.java index 1f37e9a..15ebe31 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportServiceTest.java @@ -46,17 +46,17 @@ public class CatchesSumatraExportServiceTest { public static final String PROGRAM_ID = "CAM-TEST_ELEVATION"; - public static final String CRUISE_BAD_ID = "100003"; + public static final Integer CRUISE_BAD_ID = 100003; - public static final String CRUISE_ID = "100004"; + public static final Integer CRUISE_ID = 100004; - public static final String OPERATION_1_ID = "100116"; + public static final Integer OPERATION_1_ID = 100116; - public static final String OPERATION_BAD_1_ID = "100112"; + public static final Integer OPERATION_BAD_1_ID = 100112; - public static final String OPERATION_BAD_2_ID = "100113"; + public static final Integer OPERATION_BAD_2_ID = 100113; - public static final String OPERATION_BAD_3_ID = "100115"; + public static final Integer OPERATION_BAD_3_ID = 100115; public static final String EXPORT_CONTENT = "annee;station;poche;especescientifique;espececampagne;signe;tri;total;poidsmoy;longueurmoy;nbindividus;moule;latitudedebut;longitudedebut;latitudefin;longitudefin;datedebutstation;datefinstation\n" + diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceAno5804Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceAno5804Test.java index 93e3a8e..3f84e66 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceAno5804Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceAno5804Test.java @@ -61,13 +61,13 @@ public class GenericFormatExportServiceAno5804Test { public static final String PROGRAM_ID = "CAM-CGFS"; - public static final String CRUISE_ID = "0"; + public static final Integer CRUISE_ID = 0; - public static final String OPERATION_1_ID = "1"; + public static final Integer OPERATION_1_ID = 1; - public static final String OPERATION_2_ID = "2"; + public static final Integer OPERATION_2_ID = 2; - public static final String OPERATION_3_ID = "0"; + public static final Integer OPERATION_3_ID = 0; @Before public void setUp() throws Exception { @@ -101,7 +101,7 @@ public class GenericFormatExportServiceAno5804Test { Assert.assertFalse(exportFile.exists()); String programId = dataContext.program.getId(); - String cruiseId = dataContext.cruise.getId(); + Integer cruiseId = dataContext.cruise.getIdAsInt(); ProgramDataModel dataToExport = persistenceService.loadCruises(programId, true, cruiseId); diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceAno7992Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceAno7992Test.java index ed68ef9..274e136 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceAno7992Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceAno7992Test.java @@ -85,11 +85,11 @@ public class GenericFormatExportServiceAno7992Test { public static final String PROGRAM_ID = "CAM-EVHOE"; - public static final String CRUISE_ID = "100000"; + public static final Integer CRUISE_ID = 100000; - public static final String OPERATION_1_ID = "100000"; - public static final String OPERATION_2_ID = "100001"; - public static final String OPERATION_3_ID = "100002"; + public static final Integer OPERATION_1_ID = 100000; + public static final Integer OPERATION_2_ID = 100001; + public static final Integer OPERATION_3_ID = 100002; @Before public void setUp() throws Exception { @@ -123,7 +123,7 @@ public class GenericFormatExportServiceAno7992Test { Assert.assertFalse(exportFile.exists()); String programId = dataContext.program.getId(); - String cruiseId = dataContext.cruise.getId(); + Integer cruiseId = dataContext.cruise.getIdAsInt(); ProgramDataModel dataToExport = persistenceService.loadCruises(programId, true, cruiseId); diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceTest.java index 194bba2..8547713 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceTest.java @@ -47,13 +47,13 @@ public class GenericFormatExportServiceTest { public static final String PROGRAM_ID = "CAM-CGFS"; - public static final String CRUISE_ID = "100001"; + public static final Integer CRUISE_ID = 100001; - public static final String CRUISE_CGFS_ID = "100000"; +// public static final String CRUISE_CGFS_ID = "100000"; - public static final String OPERATION_1_ID = "100106"; + public static final Integer OPERATION_1_ID = 100106; - public static final String OPERATION_2_ID = "100107"; + public static final Integer OPERATION_2_ID = 100107; public static final String SURVEY_CONTENT = "Annee;Serie;Serie_Partielle;Navire;Nombre_Poches;Pays;Zone_Etude;Campagne;Id_Sismer;Date_Deb_Campagne;Port_Deb_Campagne;Date_Fin_Campagne;Port_Fin_Campagne;Chef_Mission;Resp_Salle_Tri;Commentaire;Serie_Id;Navire_Id;Engin_Id;Port_Deb_Campagne_Id;Port_Fin_Campagne_Id;Chef_Mission_Id;Resp_Salle_Tri_Id\n" + @@ -262,7 +262,7 @@ public class GenericFormatExportServiceTest { Assert.assertFalse(exportFile.exists()); String programId = dataContext.program.getId(); - String cruiseId = dataContext.cruise.getId(); + Integer cruiseId = dataContext.cruise.getIdAsInt(); ProgramDataModel dataToExport = persistenceService.loadCruises(programId, true, cruiseId); diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/psionimport/PsionImportServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/psionimport/PsionImportServiceTest.java index 1a1c917..73d5b9d 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/psionimport/PsionImportServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/psionimport/PsionImportServiceTest.java @@ -64,13 +64,13 @@ public class PsionImportServiceTest { public static final String PROGRAM_ID = "CAM-TEST_ELEVATION"; - public static final String CRUISE_ID = "100003"; + public static final Integer CRUISE_ID = 100003; - public static final String OPERATION_1_ID = "100112"; + public static final Integer OPERATION_1_ID = 100112; - public static final String OPERATION_2_ID = "100113"; + public static final Integer OPERATION_2_ID = 100113; - public static final String OPERATION_3_ID = "100115"; + public static final Integer OPERATION_3_ID = 100115; protected PsionImportService service; @@ -114,12 +114,12 @@ public class PsionImportServiceTest { File importFile = dbResource.copyClassPathResource("psion/CC053.IWA", "CC053.IWA"); FishingOperation operation = dataContext.operations.get(1); - CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getIdAsInt()); catchBatch.setFishingOperation(operation); - BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); for (SpeciesBatch speciesBatch : rootSpeciesBatch.getChildren()) { - persistenceService.deleteSpeciesBatch(speciesBatch.getId()); + persistenceService.deleteSpeciesBatch(speciesBatch.getIdAsInt()); } PsionImportResult importResult = service.importFile(importFile, operation, catchBatch); @@ -141,7 +141,7 @@ public class PsionImportServiceTest { Assert.assertEquals(0, errors.size()); // no batch imported - BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); int totalSortedBatchs = 0; int totalUnsortedBatchs = 0; @@ -166,12 +166,12 @@ public class PsionImportServiceTest { File importFile = dbResource.copyClassPathResource("psion/FM001.IWA", "FM001.IWA"); FishingOperation operation = dataContext.operations.get(1); - CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getIdAsInt()); catchBatch.setFishingOperation(operation); - BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); for (SpeciesBatch speciesBatch : rootSpeciesBatch.getChildren()) { - persistenceService.deleteSpeciesBatch(speciesBatch.getId()); + persistenceService.deleteSpeciesBatch(speciesBatch.getIdAsInt()); } PsionImportResult importResult = service.importFile(importFile, operation, catchBatch); @@ -192,7 +192,7 @@ public class PsionImportServiceTest { Assert.assertEquals(nbNewUnsortedBatchs, nbUnsortedAdded); Assert.assertEquals(0, errors.size()); - BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); int totalSortedBatchs = 0; int totalUnsortedBatchs = 0; @@ -217,12 +217,12 @@ public class PsionImportServiceTest { File importFile = dbResource.copyClassPathResource("psion/CFchephren 110612.IWA", "CFchephren 110612.IWA"); FishingOperation operation = dataContext.operations.get(1); - CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getIdAsInt()); catchBatch.setFishingOperation(operation); - BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); for (SpeciesBatch speciesBatch : rootSpeciesBatch.getChildren()) { - persistenceService.deleteSpeciesBatch(speciesBatch.getId()); + persistenceService.deleteSpeciesBatch(speciesBatch.getIdAsInt()); } PsionImportResult importResult = service.importFile(importFile, operation, catchBatch); @@ -242,7 +242,7 @@ public class PsionImportServiceTest { Assert.assertEquals(1, errors.size()); // no batch imported - BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); Assert.assertEquals(0, rootSpeciesBatchAfter.sizeChildren()); } @@ -252,12 +252,12 @@ public class PsionImportServiceTest { File importFile = dbResource.copyClassPathResource("psion/evo-5077.IWA", "evo-5077.IWA"); FishingOperation operation = dataContext.operations.get(1); - CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getIdAsInt()); catchBatch.setFishingOperation(operation); - BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); for (SpeciesBatch speciesBatch : rootSpeciesBatch.getChildren()) { - persistenceService.deleteSpeciesBatch(speciesBatch.getId()); + persistenceService.deleteSpeciesBatch(speciesBatch.getIdAsInt()); } PsionImportResult importResult = service.importFile(importFile, operation, catchBatch); @@ -279,7 +279,7 @@ public class PsionImportServiceTest { Assert.assertEquals(0, errors.size()); // no batch imported - BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); int totalSortedBatchs = 0; int totalUnsortedBatchs = 0; diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java index 0233b39..831dd43 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno3898Test.java @@ -49,10 +49,10 @@ public class PupitriImportServiceAno3898Test extends PupitryImportServiceTestSup dbResource.loadInternalProtocolFile("pupitri/", "ano-3898"); FishingOperation operation = dataContext.operations.get(1); - CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getIdAsInt()); catchBatch.setFishingOperation(operation); - BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); Assert.assertEquals(0, rootSpeciesBatch.sizeChildren()); PupitriImportResult pupitriImportResult = service.importPupitri(trunk, carroussel, operation, catchBatch); @@ -63,7 +63,7 @@ public class PupitriImportServiceAno3898Test extends PupitryImportServiceTestSup Assert.assertNotNull(notImportedSpeciesIds); Assert.assertTrue(notImportedSpeciesIds.isEmpty()); - BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); Assert.assertEquals(31, rootSpeciesBatchAfter.sizeChildren()); Decorator<Species> speciesDecorator = decoratorService.getDecoratorByType(Species.class); diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java index 33a90dd..e06fd51 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5032Test.java @@ -55,10 +55,10 @@ public class PupitriImportServiceAno5032Test extends PupitryImportServiceTestSup dbResource.loadInternalProtocolFile("pupitri/", "ano-5032"); FishingOperation operation = dataContext.operations.get(1); - CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getIdAsInt()); catchBatch.setFishingOperation(operation); - BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); Assert.assertEquals(0, rootSpeciesBatch.sizeChildren()); PupitriImportResult pupitriImportResult = service.importPupitri(trunk, carroussel, operation, catchBatch); @@ -72,7 +72,7 @@ public class PupitriImportServiceAno5032Test extends PupitryImportServiceTestSup Assert.assertTrue(notImportedSpeciesIds.contains("ACAN-PAL")); Assert.assertTrue(notImportedSpeciesIds.contains("ASRN-ATL")); - BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); Assert.assertEquals(4, rootSpeciesBatchAfter.sizeChildren()); Set<Integer> unexpectedSpecies = Sets.newHashSet( diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5079Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5079Test.java index 68a1588..2cf3b61 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5079Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceAno5079Test.java @@ -65,10 +65,10 @@ public class PupitriImportServiceAno5079Test extends PupitryImportServiceTestSup dbResource.loadInternalProtocolFile("pupitri/", "ano-5079"); FishingOperation operation = dataContext.operations.get(1); - CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getIdAsInt()); catchBatch.setFishingOperation(operation); - BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); Assert.assertEquals(0, rootSpeciesBatch.sizeChildren()); PupitriImportResult pupitriImportResult = service.importPupitri(trunk, carroussel, operation, catchBatch); @@ -79,7 +79,7 @@ public class PupitriImportServiceAno5079Test extends PupitryImportServiceTestSup Assert.assertNotNull(notImportedSpeciesIds); Assert.assertTrue(notImportedSpeciesIds.isEmpty()); - BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); Assert.assertEquals(5, rootSpeciesBatchAfter.sizeChildren()); Set<Integer> unexpectedSpecies = Sets.newHashSet( diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java index 8cd96d5..b282b1b 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5060Test.java @@ -57,10 +57,10 @@ public class PupitriImportServiceEvo5060Test extends PupitryImportServiceTestSup dbResource.loadInternalProtocolFile("pupitri/", "evo-5060"); FishingOperation operation = dataContext.operations.get(1); - CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getIdAsInt()); catchBatch.setFishingOperation(operation); - BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); Assert.assertEquals(0, rootSpeciesBatch.sizeChildren()); PupitriImportResult pupitriImportResult = service.importPupitri(trunk, carroussel, operation, catchBatch); @@ -71,7 +71,7 @@ public class PupitriImportServiceEvo5060Test extends PupitryImportServiceTestSup Assert.assertNotNull(notImportedSpeciesIds); Assert.assertTrue(notImportedSpeciesIds.isEmpty()); - BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); Assert.assertEquals(3, rootSpeciesBatchAfter.sizeChildren()); Set<Integer> unexpectedSpecies = Sets.newHashSet( diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5062Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5062Test.java index 8dc2773..3c0bc29 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5062Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo5062Test.java @@ -58,10 +58,10 @@ public class PupitriImportServiceEvo5062Test extends PupitryImportServiceTestSup dbResource.loadInternalProtocolFile("pupitri/", "evo-5062"); FishingOperation operation = dataContext.operations.get(1); - CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getIdAsInt()); catchBatch.setFishingOperation(operation); - BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); Assert.assertEquals(0, rootSpeciesBatch.sizeChildren()); PupitriImportResult pupitriImportResult = service.importPupitri(trunk, carroussel, operation, catchBatch); @@ -72,7 +72,7 @@ public class PupitriImportServiceEvo5062Test extends PupitryImportServiceTestSup Assert.assertNotNull(notImportedSpeciesIds); Assert.assertTrue(notImportedSpeciesIds.isEmpty()); - BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); Assert.assertEquals(9, rootSpeciesBatchAfter.sizeChildren()); Set<Integer> unexpectedSpecies = Sets.newHashSet( diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6116Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6116Test.java index da80098..08e044d 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6116Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6116Test.java @@ -65,10 +65,10 @@ public class PupitriImportServiceEvo6116Test extends PupitryImportServiceTestSup dbResource.loadInternalProtocolFile("pupitri/", "evo-6116"); FishingOperation operation = dataContext.operations.get(1); - CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getIdAsInt()); catchBatch.setFishingOperation(operation); - BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); Assert.assertEquals(0, rootSpeciesBatch.sizeChildren()); PupitriImportResult pupitriImportResult = service.importPupitri(trunk, carroussel, operation, catchBatch, true); @@ -83,7 +83,7 @@ public class PupitriImportServiceEvo6116Test extends PupitryImportServiceTestSup FileUtils.copyFile(attachmentFile, destFile); log.info("Generated report copied to " + destFile.getPath()); - BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); Assert.assertEquals(7, rootSpeciesBatchAfter.sizeChildren()); /* diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6149Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6149Test.java index c11f7df..466bdd0 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6149Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6149Test.java @@ -65,10 +65,10 @@ public class PupitriImportServiceEvo6149Test extends PupitryImportServiceTestSup dbResource.loadInternalProtocolFile("pupitri/", "evo-6149"); FishingOperation operation = dataContext.operations.get(1); - CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getIdAsInt()); catchBatch.setFishingOperation(operation); - BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); Assert.assertEquals(0, rootSpeciesBatch.sizeChildren()); PupitriImportResult pupitriImportResult = service.importPupitri(trunk, carroussel, operation, catchBatch); @@ -86,7 +86,7 @@ public class PupitriImportServiceEvo6149Test extends PupitryImportServiceTestSup FileUtils.copyFile(attachmentFile, destFile); log.info("Generated report copied to " + destFile.getPath()); - BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); Assert.assertEquals(3, rootSpeciesBatchAfter.sizeChildren()); /* diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6592Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6592Test.java index 31e5aa4..5618b00 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6592Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6592Test.java @@ -65,10 +65,10 @@ public class PupitriImportServiceEvo6592Test extends PupitryImportServiceTestSup dbResource.loadInternalProtocolFile("pupitri/", "evo-6592"); FishingOperation operation = dataContext.operations.get(1); - CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getIdAsInt()); catchBatch.setFishingOperation(operation); - BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); Assert.assertEquals(0, rootSpeciesBatch.sizeChildren()); PupitriImportResult pupitriImportResult = service.readImportPupitri(trunk, carroussel, operation, false); @@ -89,7 +89,7 @@ public class PupitriImportServiceEvo6592Test extends PupitryImportServiceTestSup FileUtils.copyFile(attachmentFile, destFile); log.info("Generated report copied to " + destFile.getPath()); - BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); Assert.assertEquals(3, rootSpeciesBatchAfter.sizeChildren()); /* diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceTest.java index 113f4b8..d816010 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceTest.java @@ -49,10 +49,10 @@ public class PupitriImportServiceTest extends PupitryImportServiceTestSupport { { FishingOperation operation = dataContext.operations.get(1); - CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getIdAsInt()); catchBatch.setFishingOperation(operation); - BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); Assert.assertEquals(0, rootSpeciesBatch.sizeChildren()); PupitriImportResult importResult = service.importPupitri(trunk, carroussel, operation, catchBatch); @@ -62,10 +62,10 @@ public class PupitriImportServiceTest extends PupitryImportServiceTestSupport { } { FishingOperation operation = dataContext.operations.get(0); - CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getId()); + CatchBatch catchBatch = persistenceService.getCatchBatchFromFishingOperation(operation.getIdAsInt()); catchBatch.setFishingOperation(operation); - BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatch = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); Assert.assertEquals(0, rootSpeciesBatch.sizeChildren()); PupitriImportResult importResult = service.importPupitri(trunk, carroussel, operation, catchBatch); @@ -80,7 +80,7 @@ public class PupitriImportServiceTest extends PupitryImportServiceTestSupport { Assert.assertTrue(notImportedSpeciesIds.contains("ECHIVIP")); Assert.assertTrue(notImportedSpeciesIds.contains("PALASER")); - BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getId(), false); + BatchContainer<SpeciesBatch> rootSpeciesBatchAfter = persistenceService.getRootSpeciesBatch(operation.getIdAsInt(), false); Assert.assertEquals(18, rootSpeciesBatchAfter.sizeChildren()); Decorator<Species> speciesDecorator = decoratorService.getDecoratorByType(Species.class); diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitryImportServiceTestSupport.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitryImportServiceTestSupport.java index 3aab8db..4ec7c71 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitryImportServiceTestSupport.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitryImportServiceTestSupport.java @@ -41,11 +41,11 @@ public abstract class PupitryImportServiceTestSupport { public static final String PROGRAM_ID = "CAM-CGFS"; - public static final String CRUISE_ID = "100000"; + public static final Integer CRUISE_ID = 100000; - public static final String OPERATION_1_ID = "100000"; + public static final Integer OPERATION_1_ID = 100000; - public static final String OPERATION_2_ID = "100001"; + public static final Integer OPERATION_2_ID = 100001; @ClassRule public static final ServiceDbResource dbResource = ServiceDbResource.writeDb("dbPupitri"); diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesServiceTest.java index 16b0c43..b0e60df 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesServiceTest.java @@ -76,7 +76,7 @@ public class ReferentialTemporarySpeciesServiceTest { protected PersistenceService persistenceService; - public static final String OPERATION_1_ID = "100108"; + public static final Integer OPERATION_1_ID = 100108; @Before public void setUp() throws Exception { diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportGenerationServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportGenerationServiceTest.java index f5846f5..ba4f9d1 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportGenerationServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportGenerationServiceTest.java @@ -59,9 +59,9 @@ public class ReportGenerationServiceTest { public static final String PROGRAM_ID = "CAM-MEDITS"; - public static final String CRUISE_ID = "100001"; + public static final Integer CRUISE_ID = 100001; - public static final String OPERATION_1_ID = "100106"; + public static final Integer OPERATION_1_ID = 100106; protected ReportGenerationService service; diff --git a/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/UpdateModule.java b/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/UpdateModule.java index 32518e6..01a7127 100644 --- a/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/UpdateModule.java +++ b/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/UpdateModule.java @@ -57,8 +57,7 @@ public enum UpdateModule { } public String getModuleLoggerName() { - String moduleNameStr = String.format("[Module %1$-20s]", name()); - return moduleNameStr; + return String.format("[Module %1$-20s]", name()); } } diff --git a/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/UpdaterFileSystemPathes.java b/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/UpdaterFileSystemPathes.java index 2a5e634..d8d47e7 100644 --- a/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/UpdaterFileSystemPathes.java +++ b/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/UpdaterFileSystemPathes.java @@ -76,57 +76,49 @@ public class UpdaterFileSystemPathes { } public Path getUpdateDirectory() { - Path updateDirectory = baseDir.resolve(UPDATE_DIRECTORY_NAME); - return updateDirectory; + return baseDir.resolve(UPDATE_DIRECTORY_NAME); } public Path getUpdateModulePath(UpdateModule updateModule) { - Path modulePath = getUpdateDirectory().resolve(updateModule.name()); - return modulePath; + return getUpdateDirectory().resolve(updateModule.name()); } public boolean isUpdateModuleExists(UpdateModule updateModule) { Path updateModulePath = getUpdateModulePath(updateModule); - boolean isDirectory = Files.isDirectory(updateModulePath); - return isDirectory; + return Files.isDirectory(updateModulePath); } public String getUpdateModuleVersion(UpdateModule updateModule) throws IOException { Path updateModulePath = getUpdateModulePath(updateModule); - String version = getVersion(updateModulePath); - return version; + return getVersion(updateModulePath); } public Path getModulePath(UpdateModule updateModule) { - Path modulePath = baseDir.resolve(updateModule.name()); - return modulePath; + return baseDir.resolve(updateModule.name()); } public boolean isModuleExists(UpdateModule updateModule) { Path modulePath = getModulePath(updateModule); - boolean isDirectory = Files.isDirectory(modulePath); - return isDirectory; + return Files.isDirectory(modulePath); } public String getModuleVersion(UpdateModule updateModule) throws IOException { Path modulePath = getModulePath(updateModule); - String version = getVersion(modulePath); - return version; + return getVersion(modulePath); } public Path getUpdaterScriptPath() { String scriptFilename = UPDATE_RUNTIME_CMD + (windowsOS ? BATCH_WINDOWS_EXTENSION : BATCH_UNIX_EXTENSION); - Path runtimeUpdater = baseDir.resolve(scriptFilename); - return runtimeUpdater; + return baseDir.resolve(scriptFilename); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java index f80737a..ca908ee 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java @@ -151,12 +151,7 @@ public class RunTutti { final MainUI mainUI = new MainUI(context); context.addMessageNotifier(mainUI.getHandler()); - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - mainUI.setVisible(true); - } - }); + SwingUtilities.invokeLater(() -> mainUI.setVisible(true)); // launch start action (use the tutti-start-action file) StartAction uiAction = context.getActionFactory().createLogicAction( diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiActionFactory.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiActionFactory.java index 894f365..a56a230 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiActionFactory.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiActionFactory.java @@ -56,8 +56,7 @@ public class TuttiActionFactory extends ApplicationActionFactory { try { // create action - A result = ConstructorUtils.invokeConstructor(actionName, (AbstractTuttiUIHandler) handler); - return result; + return ConstructorUtils.invokeConstructor(actionName, (AbstractTuttiUIHandler) handler); } catch (Exception e) { throw new ApplicationTechnicalException(t("application.action.create.error", actionName), e); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java index e469309..ca450fa 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java @@ -93,7 +93,6 @@ import org.nuiton.jaxx.application.swing.util.ApplicationErrorHelper; import javax.swing.JOptionPane; import java.awt.Color; import java.awt.Component; -import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.Closeable; import java.io.File; @@ -130,11 +129,11 @@ public class TuttiUIContext extends AbstractBean implements Closeable, UIMessage public static final String PROPERTY_SCREEN = "screen"; - public static final String PROPERTY_PROGRAM_FILLED = "programFilled"; - - public static final String PROPERTY_CRUISE__FILLED = "cruiseFilled"; - - public static final String PROPERTY_PROTOCOL_FILLED = "protocolFilled"; +// public static final String PROPERTY_PROGRAM_FILLED = "programFilled"; +// +// public static final String PROPERTY_CRUISE__FILLED = "cruiseFilled"; +// +// public static final String PROPERTY_PROTOCOL_FILLED = "protocolFilled"; public static final String PROPERTY_VALIDATION_CONTEXT = "validationContext"; @@ -423,13 +422,9 @@ public class TuttiUIContext extends AbstractBean implements Closeable, UIMessage ConverterUtil.initConverters(); // Use shutdownHook to close context on System.exit - Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() { - - @Override - public void run() { - if (!closed) { - close(); - } + Runtime.getRuntime().addShutdownHook(new Thread(() -> { + if (!closed) { + close(); } })); @@ -581,14 +576,10 @@ public class TuttiUIContext extends AbstractBean implements Closeable, UIMessage saveContextToConfig(); // list when programId or campaingId change to save the configuration - addPropertyChangeListener(new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { + addPropertyChangeListener(evt -> { - if (PROPERTIES_TO_SAVE.contains(evt.getPropertyName())) { - saveContextToConfig(); - } + if (PROPERTIES_TO_SAVE.contains(evt.getPropertyName())) { + saveContextToConfig(); } }); @@ -816,7 +807,7 @@ public class TuttiUIContext extends AbstractBean implements Closeable, UIMessage return dataContext.getProtocolId(); } - public String getCruiseId() { + public Integer getCruiseId() { return dataContext.getCruiseId(); } @@ -828,7 +819,7 @@ public class TuttiUIContext extends AbstractBean implements Closeable, UIMessage dataContext.setProgramId(programId); } - public void setCruiseId(String cruiseId) { + public void setCruiseId(Integer cruiseId) { dataContext.setCruiseId(cruiseId); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ConnectIchtyometerAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ConnectIchtyometerAction.java index 8b29612..9729a67 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ConnectIchtyometerAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ConnectIchtyometerAction.java @@ -32,7 +32,6 @@ import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import org.nuiton.jaxx.application.ApplicationBusinessException; import javax.swing.JOptionPane; -import java.util.Set; import static org.nuiton.i18n.I18n.t; @@ -55,26 +54,22 @@ public class ConnectIchtyometerAction extends AbstractMainUITuttiAction { IchtyometerClient client = new IchtyometerClient(getConfig().getIchtyometerMaximumNumberOfAttemptToConnect()); - RemoteDeviceChooser remoteDeviceChooser = new RemoteDeviceChooser() { - @Override - public String chooseRemoteDevice(Set<String> remoteDeviceNames) { + RemoteDeviceChooser remoteDeviceChooser = remoteDeviceNames -> { - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - // Don't care - } - String selectedDevice = (String) JOptionPane.showInputDialog( - getContext().getActionUI(), - t("tutti.ichtyometer.choose.remote.device.found"), - t("tutti.ichtyometer.title.choose.remote.device"), - JOptionPane.QUESTION_MESSAGE, - null, - remoteDeviceNames.toArray(new String[remoteDeviceNames.size()]), - null - ); - return selectedDevice; + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + // Don't care } + return (String) JOptionPane.showInputDialog( + getContext().getActionUI(), + t("tutti.ichtyometer.choose.remote.device.found"), + t("tutti.ichtyometer.title.choose.remote.device"), + JOptionPane.QUESTION_MESSAGE, + null, + remoteDeviceNames.toArray(new String[remoteDeviceNames.size()]), + null + ); }; try { client.open(remoteDeviceChooser, getConfig().isFullBluetoothScan()); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/EditCatchesForSelectedCruiseAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/EditCatchesForSelectedCruiseAction.java index a559569..f19860c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/EditCatchesForSelectedCruiseAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/EditCatchesForSelectedCruiseAction.java @@ -67,24 +67,21 @@ public class EditCatchesForSelectedCruiseAction extends AbstractChangeScreenActi super.postSuccessAction(); SwingUtilities.invokeLater( - new Runnable() { - @Override - public void run() { + () -> { - FishingOperationsUI currentBody = (FishingOperationsUI) getHandler().getCurrentBody(); + FishingOperationsUI currentBody = (FishingOperationsUI) getHandler().getCurrentBody(); - BeanFilterableComboBox<FishingOperation> comboBox = currentBody.getFishingOperationComboBox(); - if (!comboBox.isEmpty()) { - FishingOperation selectedOperation = comboBox.getData().get(0); - currentBody.getModel().setSelectedFishingOperation(selectedOperation); - } + BeanFilterableComboBox<FishingOperation> comboBox = currentBody.getFishingOperationComboBox(); + if (!comboBox.isEmpty()) { + FishingOperation selectedOperation = comboBox.getData().get(0); + currentBody.getModel().setSelectedFishingOperation(selectedOperation); + } - EditFishingOperationUI fishingOperationTabContent = currentBody.getFishingOperationTabContent(); + EditFishingOperationUI fishingOperationTabContent = currentBody.getFishingOperationTabContent(); - JComponent componentToFocus = fishingOperationTabContent.getHandler().getComponentToFocus(); - componentToFocus.requestFocusInWindow(); + JComponent componentToFocus = fishingOperationTabContent.getHandler().getComponentToFocus(); + componentToFocus.requestFocusInWindow(); - } } ); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenTemporaryReferentialScreenAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenTemporaryReferentialScreenAction.java index eb4d0fb..a6de477 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenTemporaryReferentialScreenAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenTemporaryReferentialScreenAction.java @@ -59,12 +59,7 @@ public class OpenTemporaryReferentialScreenAction extends AbstractChangeScreenAc public void doAction() throws Exception { super.doAction(); loadReferantials(true); - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - getContext().getMainUI().getBody().revalidate(); - } - }); + SwingUtilities.invokeLater(() -> getContext().getMainUI().getBody().revalidate()); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ShowAboutAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ShowAboutAction.java index e520522..b06d22f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ShowAboutAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/ShowAboutAction.java @@ -27,13 +27,13 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.ui.swing.TuttiUIContext; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; -import fr.ifremer.tutti.ui.swing.update.actions.UpdateApplicationAction; import fr.ifremer.tutti.ui.swing.content.db.actions.UpdateDbAction; +import fr.ifremer.tutti.ui.swing.update.actions.UpdateApplicationAction; import fr.ifremer.tutti.ui.swing.update.actions.UpdateReportAction; import fr.ifremer.tutti.ui.swing.updater.UpdateModule; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import jaxx.runtime.swing.AboutPanel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -43,7 +43,6 @@ import org.nuiton.updater.ApplicationUpdater; import javax.swing.JEditorPane; import javax.swing.JScrollPane; import javax.swing.event.HyperlinkEvent; -import javax.swing.event.HyperlinkListener; import java.io.File; import java.net.MalformedURLException; import java.net.URL; @@ -166,16 +165,13 @@ public class ShowAboutAction extends AbstractMainUITuttiAction { String translateText = t("tutti.about.translate.content", csvFile.toURI().toURL()); translateArea.setText(translateText); translatePane.getViewport().add(translateArea); - translateArea.addHyperlinkListener(new HyperlinkListener() { - @Override - public void hyperlinkUpdate(HyperlinkEvent e) { - if (HyperlinkEvent.EventType.ACTIVATED == e.getEventType()) { - URL url = e.getURL(); - if (log.isInfoEnabled()) { - log.info("edit url: " + url); - } - TuttiUIUtil.openLink(url); + translateArea.addHyperlinkListener(e -> { + if (HyperlinkEvent.EventType.ACTIVATED == e.getEventType()) { + URL url = e.getURL(); + if (log.isInfoEnabled()) { + log.info("edit url: " + url); } + TuttiUIUtil.openLink(url); } }); @@ -246,20 +242,17 @@ public class ShowAboutAction extends AbstractMainUITuttiAction { String updateText = t("tutti.about.update.content", urlApplication, urlData, Joiner.on("\n").join(params)); updateArea.setText(updateText); updatePane.getViewport().add(updateArea); - updateArea.addHyperlinkListener(new HyperlinkListener() { - @Override - public void hyperlinkUpdate(HyperlinkEvent e) { - if (HyperlinkEvent.EventType.ACTIVATED == e.getEventType()) { - URL url = e.getURL(); + updateArea.addHyperlinkListener(e -> { + if (HyperlinkEvent.EventType.ACTIVATED == e.getEventType()) { + URL url = e.getURL(); - if (url != null) { + if (url != null) { - TuttiUIUtil.openLink(url); - } else { - String appType = e.getDescription(); + TuttiUIUtil.openLink(url); + } else { + String appType = e.getDescription(); - onUpdateLinkClicked(appType); - } + onUpdateLinkClicked(appType); } } }); @@ -317,8 +310,7 @@ public class ShowAboutAction extends AbstractMainUITuttiAction { switch (updateModuleToUpdate) { case db: { - UpdateDbAction logicAction = getContext().getActionFactory().createLogicAction(getHandler(), UpdateDbAction.class); - action = logicAction; + action = getContext().getActionFactory().createLogicAction(getHandler(), UpdateDbAction.class); if (!getContext().isDbExist()) { // install db @@ -328,8 +320,7 @@ public class ShowAboutAction extends AbstractMainUITuttiAction { break; case report: { - UpdateReportAction logicAction = getContext().getActionFactory().createLogicAction(getHandler(), UpdateReportAction.class); - action = logicAction; + action = getContext().getActionFactory().createLogicAction(getHandler(), UpdateReportAction.class); } break; @@ -354,8 +345,7 @@ public class ShowAboutAction extends AbstractMainUITuttiAction { protected String getModuleLabel(UpdateModule moduleName) { String i18nKey = "tutti.update." + moduleName.name().toLowerCase(); - String appLabel = t(i18nKey); - return appLabel; + return t(i18nKey); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java index 69f4953..6f57675 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java @@ -40,8 +40,6 @@ import org.nuiton.jaxx.application.swing.util.CloseableUI; import javax.swing.JComponent; import javax.swing.SwingUtilities; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.util.List; import java.util.Set; @@ -230,14 +228,13 @@ public class EditSampleCategoryModelUIHandler extends AbstractTuttiTableUIHandle @Override public boolean quitUI() { - boolean result = quitScreen( + return quitScreen( getModel().isValid(), getModel().isModify(), t("tutti.editProtocol.askCancelEditBeforeLeaving.cancelSaveSampleCategoryModel"), t("tutti.editProtocol.askSaveBeforeLeaving.saveSampleCategoryModel"), ui.getSaveButton().getAction() ); - return result; } //------------------------------------------------------------------------// @@ -274,16 +271,13 @@ public class EditSampleCategoryModelUIHandler extends AbstractTuttiTableUIHandle initBeanFilterableComboBox(ui.getAvailableCaracteristicsComboBox(), model.getCaracteristicList(), null); - model.addPropertyChangeListener(EditSampleCategoryModelUIModel.PROPERTY_CARACTERISTIC_LIST, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (log.isDebugEnabled()) { - log.debug("propertyChange " + EditSampleCategoryModelUIModel.PROPERTY_CARACTERISTIC_LIST); - } - EditSampleCategoryModelUIHandler.this.ui.getAvailableCaracteristicsComboBox().setData(null); - EditSampleCategoryModelUIHandler.this.ui.getAvailableCaracteristicsComboBox().setData((List<Caracteristic>) evt.getNewValue()); - EditSampleCategoryModelUIHandler.this.ui.getAvailableCaracteristicsComboBox().setSelectedItem(null); + model.addPropertyChangeListener(EditSampleCategoryModelUIModel.PROPERTY_CARACTERISTIC_LIST, evt -> { + if (log.isDebugEnabled()) { + log.debug("propertyChange " + EditSampleCategoryModelUIModel.PROPERTY_CARACTERISTIC_LIST); } + EditSampleCategoryModelUIHandler.this.ui.getAvailableCaracteristicsComboBox().setData(null); + EditSampleCategoryModelUIHandler.this.ui.getAvailableCaracteristicsComboBox().setData((List<Caracteristic>) evt.getNewValue()); + EditSampleCategoryModelUIHandler.this.ui.getAvailableCaracteristicsComboBox().setSelectedItem(null); }); JXTable table = getTable(); @@ -334,12 +328,7 @@ public class EditSampleCategoryModelUIHandler extends AbstractTuttiTableUIHandle recomputePopupActions(); model.setModify(true); - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - getModel().setModify(false); - } - }); + SwingUtilities.invokeLater(() -> getModel().setModify(false)); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/actions/AddSampleCategoryRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/actions/AddSampleCategoryRowAction.java index 4251478..15c271c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/actions/AddSampleCategoryRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/actions/AddSampleCategoryRowAction.java @@ -71,15 +71,12 @@ public class AddSampleCategoryRowAction extends SimpleActionSupport<EditSampleCa model.addRowInError(row); model.setModify(true); - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - ui.getTable().requestFocus(); + SwingUtilities.invokeLater(() -> { + ui.getTable().requestFocus(); - int rowIndex = ui.getTable().getRowCount() - 1; + int rowIndex = ui.getTable().getRowCount() - 1; - SwingUtil.editCell(ui.getTable(), rowIndex, 1); - } + SwingUtil.editCell(ui.getTable(), rowIndex, 1); }); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java index 28d20d4..2fc9b59 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java @@ -88,33 +88,15 @@ public class TuttiConfigUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, helper.registerCallBack( CALLBACK_UI, n("tutti.config.action.reload.ui"), SwingUtil.createActionIcon("reload-ui"), - new Runnable() { - - @Override - public void run() { - reloadUI(); - } - } + this::reloadUI ).registerCallBack( CALLBACK_APPLICATION, n("tutti.config.action.reload.application"), SwingUtil.createActionIcon("reload-application"), - new Runnable() { - - @Override - public void run() { - reloadApplication(); - } - } + this::reloadApplication ).registerCallBack( CALLBACK_SHORTCUT, n("tutti.config.action.reload.actions"), SwingUtil.createActionIcon("reload-shortcut"), - new Runnable() { - - @Override - public void run() { - reloadShortcuts(); - } - } + this::reloadShortcuts ); // Application category @@ -356,16 +338,9 @@ public class TuttiConfigUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, helper.setFinalizer(new MainCallBackFinalizer(CALLBACK_APPLICATION)); - helper.setCloseAction(new Runnable() { - @Override - public void run() { - - getContext().getActionEngine().runInternalAction( - TuttiConfigUIHandler.this, - GoToPreviousScreenAction.class); - - } - }); + helper.setCloseAction(() -> getContext().getActionEngine().runInternalAction( + TuttiConfigUIHandler.this, + GoToPreviousScreenAction.class)); ConfigUI configUI = helper.buildUI( getUI(), n("tutti.config.category.applications")); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java index 4a50ced..cb57c36 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java @@ -55,8 +55,6 @@ import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.util.List; import java.util.Set; @@ -176,43 +174,40 @@ public class EditCruiseUIHandler extends AbstractTuttiUIHandler<EditCruiseUIMode allGearList.addAll(fishingGearList); // Change vessel list and gear list when vessel type changes - model.addPropertyChangeListener(EditCruiseUIModel.PROPERTY_VESSEL_TYPE, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { + model.addPropertyChangeListener(EditCruiseUIModel.PROPERTY_VESSEL_TYPE, evt -> { - VesselTypeEnum vesselType = (VesselTypeEnum) evt.getNewValue(); + VesselTypeEnum vesselType = (VesselTypeEnum) evt.getNewValue(); - Predicate<Gear> gearPredicate = null; + Predicate<Gear> gearPredicate = null; - List<Vessel> allVesselList = Lists.newArrayList(); + List<Vessel> allVesselList1 = Lists.newArrayList(); - switch (vesselType) { - case FISHING: - gearPredicate = Gears.IS_FISHING_GEAR; - allVesselList.addAll(getDataContext().getFishingVessels()); - break; + switch (vesselType) { + case FISHING: + gearPredicate = Gears.IS_FISHING_GEAR; + allVesselList1.addAll(getDataContext().getFishingVessels()); + break; - case SCIENTIFIC: - gearPredicate = Gears.IS_SCIENTIFIC_GEAR; + case SCIENTIFIC: + gearPredicate = Gears.IS_SCIENTIFIC_GEAR; - allVesselList.addAll(getDataContext().getScientificVessels()); - break; - default: { - allVesselList.addAll(getDataContext().getScientificVessels()); - allVesselList.addAll(getDataContext().getFishingVessels()); - } + allVesselList1.addAll(getDataContext().getScientificVessels()); + break; + default: { + allVesselList1.addAll(getDataContext().getScientificVessels()); + allVesselList1.addAll(getDataContext().getFishingVessels()); } + } - EditCruiseUIHandler.this.ui.getGearList().getHandler().clearFilters(); - EditCruiseUIHandler.this.ui.getVesselComboBox().setData(null); - EditCruiseUIHandler.this.ui.getVesselComboBox().setData(allVesselList); - - if (gearPredicate != null) { - EditCruiseUIHandler.this.ui.getGearList().getHandler().addFilter(gearPredicate); - } + EditCruiseUIHandler.this.ui.getGearList().getHandler().clearFilters(); + EditCruiseUIHandler.this.ui.getVesselComboBox().setData(null); + EditCruiseUIHandler.this.ui.getVesselComboBox().setData(allVesselList1); + if (gearPredicate != null) { + EditCruiseUIHandler.this.ui.getGearList().getHandler().addFilter(gearPredicate); } + }); initBeanFilterableComboBox(this.ui.getProgramComboBox(), @@ -438,14 +433,13 @@ public class EditCruiseUIHandler extends AbstractTuttiUIHandler<EditCruiseUIMode @Override public boolean quitUI() { - boolean result = quitScreen( + return quitScreen( getModel().isValid(), getModel().isModify(), t("tutti.editCruise.askCancelEditBeforeLeaving.cancelSaveCruise"), t("tutti.editCruise.askSaveBeforeLeaving.saveCruise"), ui.getSaveButton().getAction() ); - return result; } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorTableModel.java index 278a9b8..cfc2b04 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorTableModel.java @@ -53,7 +53,6 @@ public class GearCaracteristicsEditorTableModel extends AbstractApplicationTable @Override public GearCaracteristicsEditorRowModel createNewRow() { - GearCaracteristicsEditorRowModel result = new GearCaracteristicsEditorRowModel(); - return result; + return new GearCaracteristicsEditorRowModel(); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java index fcb5c05..52dbe98 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUIHandler.java @@ -40,17 +40,15 @@ import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import javax.swing.JComponent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.util.List; +import java.util.stream.Collectors; /** * @author Kevin Morin - kmorin@codelutin.com * @since 2.1 */ public class GearCaracteristicsEditorUIHandler - extends AbstractTuttiTableUIHandler<GearCaracteristicsEditorRowModel, GearCaracteristicsEditorUIModel, GearCaracteristicsEditorUI> - { + extends AbstractTuttiTableUIHandler<GearCaracteristicsEditorRowModel, GearCaracteristicsEditorUIModel, GearCaracteristicsEditorUI> { private final static Log log = LogFactory.getLog(GearCaracteristicsEditorUIHandler.class); @@ -124,12 +122,7 @@ public class GearCaracteristicsEditorUIHandler new GearCaracteristicsEditorUIModel(); ui.setContextValue(model); - model.addPropertyChangeListener(GearCaracteristicsEditorUIModel.PROPERTY_GEAR, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - editGear((Gear) evt.getNewValue()); - } - }); + model.addPropertyChangeListener(GearCaracteristicsEditorUIModel.PROPERTY_GEAR, evt -> editGear((Gear) evt.getNewValue())); } @@ -287,7 +280,6 @@ public class GearCaracteristicsEditorUIHandler // // closeUI(ui); // } - protected void editGear(Gear gear) { if (gear != null) { @@ -318,11 +310,10 @@ public class GearCaracteristicsEditorUIHandler List<Caracteristic> caracteristicList = Lists.newArrayList(); - for (Caracteristic caracteristic : availableCaracteristics) { - if (!caracteristics.contains(caracteristic)) { - caracteristicList.add(caracteristic); - } - } + caracteristicList.addAll(availableCaracteristics + .stream() + .filter(caracteristic -> !caracteristics.contains(caracteristic)) + .collect(Collectors.toList())); BeanFilterableComboBox<Caracteristic> keyCombo = getKeyCombo(); keyCombo.setData(caracteristicList); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/EditGearCaracteristicsAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/EditGearCaracteristicsAction.java index 150a0ef..3bfa93a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/EditGearCaracteristicsAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/EditGearCaracteristicsAction.java @@ -61,8 +61,8 @@ public class EditGearCaracteristicsAction extends LongActionSupport<EditCruiseUI CaracteristicMap caracteristics = persistenceService.getGearCaracteristics( - getDataContext().getCruise().getId(), - gear.getId(), + getDataContext().getCruise().getIdAsInt(), + gear.getIdAsInt(), gear.getOriginalRankOrder()); GearWithOriginalRankOrder gearToView = diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/SaveCruiseAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/SaveCruiseAction.java index 96aab10..0a38c73 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/SaveCruiseAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/SaveCruiseAction.java @@ -70,7 +70,7 @@ public class SaveCruiseAction extends LongActionSupport<EditCruiseUIModel, EditC Cruise bean = getModel().toEntity(); if (!TuttiEntities.isNew(bean)) { - Cruise oldCruise = persistenceService.getCruise(bean.getId()); + Cruise oldCruise = persistenceService.getCruise(bean.getIdAsInt()); // check vessel has not changed if (ObjectUtils.notEqual(oldCruise.getVessel(), bean.getVessel())) { @@ -165,7 +165,7 @@ public class SaveCruiseAction extends LongActionSupport<EditCruiseUIModel, EditC } context.setProgramId(saved.getProgram().getId()); - context.setCruiseId(saved.getId()); + context.setCruiseId(saved.getIdAsInt()); if (!createCruise) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/ViewGearCaracteristicsAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/ViewGearCaracteristicsAction.java index ec5c952..3611a20 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/ViewGearCaracteristicsAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/actions/ViewGearCaracteristicsAction.java @@ -61,8 +61,8 @@ public class ViewGearCaracteristicsAction extends LongActionSupport<EditCruiseUI CaracteristicMap caracteristics = persistenceService.getGearCaracteristics( - getDataContext().getCruise().getId(), - gear.getId(), + getDataContext().getCruise().getIdAsInt(), + gear.getIdAsInt(), gear.getOriginalRankOrder()); GearWithOriginalRankOrder gearToEdit = diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java index ac1a762..0c05f9e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUIHandler.java @@ -36,8 +36,6 @@ import org.nuiton.version.Version; import javax.swing.JComponent; import javax.swing.SwingUtilities; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.util.Map; import static org.nuiton.i18n.I18n.n; @@ -138,33 +136,25 @@ public class DbManagerUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, D initUI(ui); - getModel().addPropertyChangeListener(TuttiUIContext.PROPERTY_DB_EXIST, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - - Boolean dbExist = (Boolean) evt.getNewValue(); - String mnemonic; - if (dbExist) { - mnemonic = t("tutti.dbManager.action.reinstallDb.mnemonic"); - } else { - mnemonic = t("tutti.dbManager.action.installDb.mnemonic"); - } - if (StringUtils.isNotBlank(mnemonic)) { - DbManagerUIHandler.this.ui.getInstallOrReinstallDbButton().setMnemonic(mnemonic.charAt(0)); - } + getModel().addPropertyChangeListener(TuttiUIContext.PROPERTY_DB_EXIST, evt -> { + Boolean dbExist = (Boolean) evt.getNewValue(); + String mnemonic; + if (dbExist) { + mnemonic = t("tutti.dbManager.action.reinstallDb.mnemonic"); + } else { + mnemonic = t("tutti.dbManager.action.installDb.mnemonic"); } + if (StringUtils.isNotBlank(mnemonic)) { + DbManagerUIHandler.this.ui.getInstallOrReinstallDbButton().setMnemonic(mnemonic.charAt(0)); + } + }); updateMessage(); SwingUtilities.invokeLater( - new Runnable() { - @Override - public void run() { - getContext().getMainUI().getBody().repaint(); - } - } + () -> getContext().getMainUI().getBody().repaint() ); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ProgramSelectTreeNode.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ProgramSelectTreeNode.java index 0bf12e5..4a6e054 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ProgramSelectTreeNode.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ProgramSelectTreeNode.java @@ -67,7 +67,7 @@ public class ProgramSelectTreeNode extends DataSelectTreeNodeSupport<ProgramData @Override public ProgramDataModel getSelectedDataModel() { - Set<CruiseDataModel> cruises = new HashSet<CruiseDataModel>(); + Set<CruiseDataModel> cruises = new HashSet<>(); for (CruiseSelectTreeNode o : this) { CruiseDataModel cruise = o.getSelectedDataModel(); @@ -76,8 +76,7 @@ public class ProgramSelectTreeNode extends DataSelectTreeNodeSupport<ProgramData } } - ProgramDataModel result = new ProgramDataModel(getId(), getLabel(), cruises); - return result; + return new ProgramDataModel(getId(), getLabel(), cruises); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java index 1c858c5..5ef7074 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java @@ -36,7 +36,6 @@ import org.apache.commons.logging.LogFactory; import javax.swing.JComponent; import java.awt.Font; -import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; @@ -140,91 +139,73 @@ public class SelectCruiseUIHandler extends AbstractTuttiUIHandler<SelectCruiseUI initBeanFilterableComboBox(ui.getProtocolCombobox(), model.getProtocols(), model.getProtocol()); - model.addPropertyChangeListener(SelectCruiseUIModel.PROPERTY_PROTOCOLS, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - // reload combo box - BeanFilterableComboBox<TuttiProtocol> combobox = SelectCruiseUIHandler.this.ui.getProtocolCombobox(); - List<TuttiProtocol> protocols = (List<TuttiProtocol>) evt.getNewValue(); + model.addPropertyChangeListener(SelectCruiseUIModel.PROPERTY_PROTOCOLS, evt -> { + // reload combo box + BeanFilterableComboBox<TuttiProtocol> combobox = SelectCruiseUIHandler.this.ui.getProtocolCombobox(); + List<TuttiProtocol> protocols = (List<TuttiProtocol>) evt.getNewValue(); - combobox.setData(null); - if (protocols != null) { - combobox.setData(protocols); - } - - SelectCruiseUIHandler.this.ui.applyDataBinding(SelectCruiseUI.BINDING_PROTOCOL_COMBOBOX_ENABLED); + combobox.setData(null); + if (protocols != null) { + combobox.setData(protocols); } + + SelectCruiseUIHandler.this.ui.applyDataBinding(SelectCruiseUI.BINDING_PROTOCOL_COMBOBOX_ENABLED); }); - model.addPropertyChangeListener(SelectCruiseUIModel.PROPERTY_PROGRAM, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - Program newValue = (Program) evt.getNewValue(); - boolean noProgram = newValue == null; - getContext().setProgramId(noProgram ? null : newValue.getId()); - if (log.isInfoEnabled()) { - log.info("Selected program: " + newValue); - } - List<Cruise> cruises; - List<TuttiProtocol> protocols; - if (noProgram) { - cruises = Lists.newArrayList(); - protocols = Lists.newArrayList(getPersistenceService().getAllProtocol(null)); - - } else { - cruises = Lists.newArrayList(getPersistenceService().getAllCruise(newValue.getId())); - protocols = Lists.newArrayList(getPersistenceService().getAllProtocol(newValue.getId())); - } - SelectCruiseUIModel source = (SelectCruiseUIModel) evt.getSource(); - source.setCruises(cruises); - source.setCruise(null); - source.setProtocols(protocols); - source.setProtocol(null); + model.addPropertyChangeListener(SelectCruiseUIModel.PROPERTY_PROGRAM, evt -> { + Program newValue = (Program) evt.getNewValue(); + boolean noProgram = newValue == null; + getContext().setProgramId(noProgram ? null : newValue.getId()); + if (log.isInfoEnabled()) { + log.info("Selected program: " + newValue); } - }); + List<Cruise> cruises; + List<TuttiProtocol> protocols; + if (noProgram) { + cruises = Lists.newArrayList(); + protocols = Lists.newArrayList(getPersistenceService().getAllProtocol(null)); - model.addPropertyChangeListener(SelectCruiseUIModel.PROPERTY_CRUISES, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - // reload combo box - BeanFilterableComboBox<Cruise> combobox = SelectCruiseUIHandler.this.ui.getCruiseCombobox(); - List<Cruise> campaigns = (List<Cruise>) evt.getNewValue(); - combobox.setData(null); - if (campaigns != null) { - combobox.setData(campaigns); - } + } else { + cruises = Lists.newArrayList(getPersistenceService().getAllCruise(newValue.getId())); + protocols = Lists.newArrayList(getPersistenceService().getAllProtocol(newValue.getId())); } + SelectCruiseUIModel source = (SelectCruiseUIModel) evt.getSource(); + source.setCruises(cruises); + source.setCruise(null); + source.setProtocols(protocols); + source.setProtocol(null); }); - model.addPropertyChangeListener(SelectCruiseUIModel.PROPERTY_CRUISE, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - Cruise newValue = (Cruise) evt.getNewValue(); - getContext().setCruiseId(newValue == null ? null : newValue.getId()); + model.addPropertyChangeListener(SelectCruiseUIModel.PROPERTY_CRUISES, evt -> { + // reload combo box + BeanFilterableComboBox<Cruise> combobox = SelectCruiseUIHandler.this.ui.getCruiseCombobox(); + List<Cruise> campaigns = (List<Cruise>) evt.getNewValue(); + combobox.setData(null); + if (campaigns != null) { + combobox.setData(campaigns); } }); - model.addPropertyChangeListener(SelectCruiseUIModel.PROPERTY_PROTOCOLS, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - // reload combo box - BeanFilterableComboBox<TuttiProtocol> combobox = SelectCruiseUIHandler.this.ui.getProtocolCombobox(); - List<TuttiProtocol> protocols = (List<TuttiProtocol>) evt.getNewValue(); - combobox.setData(null); - if (protocols != null) { - combobox.setData(protocols); - } - } + model.addPropertyChangeListener(SelectCruiseUIModel.PROPERTY_CRUISE, evt -> { + Cruise newValue = (Cruise) evt.getNewValue(); + getContext().setCruiseId(newValue == null ? null : newValue.getIdAsInt()); }); - model.addPropertyChangeListener(SelectCruiseUIModel.PROPERTY_PROTOCOL, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - TuttiProtocol newValue = (TuttiProtocol) evt.getNewValue(); - getContext().setProtocolId(newValue == null ? null : newValue.getId()); + model.addPropertyChangeListener(SelectCruiseUIModel.PROPERTY_PROTOCOLS, evt -> { + // reload combo box + BeanFilterableComboBox<TuttiProtocol> combobox = SelectCruiseUIHandler.this.ui.getProtocolCombobox(); + List<TuttiProtocol> protocols = (List<TuttiProtocol>) evt.getNewValue(); + combobox.setData(null); + if (protocols != null) { + combobox.setData(protocols); } }); + model.addPropertyChangeListener(SelectCruiseUIModel.PROPERTY_PROTOCOL, evt -> { + TuttiProtocol newValue = (TuttiProtocol) evt.getNewValue(); + getContext().setProtocolId(newValue == null ? null : newValue.getId()); + }); + registerValidators(getValidator()); listenValidatorValid(getValidator(), model); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/CloneProtocolAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/CloneProtocolAction.java index 87779bd..b8d4a34 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/CloneProtocolAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/CloneProtocolAction.java @@ -53,7 +53,7 @@ public class CloneProtocolAction extends AbstractChangeScreenAction { /** Logger. */ private static final Log log = LogFactory.getLog(CloneProtocolAction.class); - public static final JAXXContextEntryDef<TuttiProtocol> CLONE_PROTOCOL_ENTRY = new JAXXContextEntryDef<TuttiProtocol>("cloneProtocol", TuttiProtocol.class); + public static final JAXXContextEntryDef<TuttiProtocol> CLONE_PROTOCOL_ENTRY = new JAXXContextEntryDef<>("cloneProtocol", TuttiProtocol.class); protected TuttiProtocol protocol; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/EditCatchesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/EditCatchesAction.java index a825155..a814c02 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/EditCatchesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/EditCatchesAction.java @@ -68,24 +68,21 @@ public class EditCatchesAction extends AbstractChangeScreenAction { super.postSuccessAction(); SwingUtilities.invokeLater( - new Runnable() { - @Override - public void run() { + () -> { - FishingOperationsUI currentBody = (FishingOperationsUI) getHandler().getCurrentBody(); + FishingOperationsUI currentBody = (FishingOperationsUI) getHandler().getCurrentBody(); - BeanFilterableComboBox<FishingOperation> comboBox = currentBody.getFishingOperationComboBox(); - if (!comboBox.isEmpty()) { - FishingOperation selectedOperation = comboBox.getData().get(0); - currentBody.getModel().setSelectedFishingOperation(selectedOperation); - } + BeanFilterableComboBox<FishingOperation> comboBox = currentBody.getFishingOperationComboBox(); + if (!comboBox.isEmpty()) { + FishingOperation selectedOperation = comboBox.getData().get(0); + currentBody.getModel().setSelectedFishingOperation(selectedOperation); + } - EditFishingOperationUI fishingOperationTabContent = currentBody.getFishingOperationTabContent(); + EditFishingOperationUI fishingOperationTabContent = currentBody.getFishingOperationTabContent(); - JComponent componentToFocus = fishingOperationTabContent.getHandler().getComponentToFocus(); - componentToFocus.requestFocusInWindow(); + JComponent componentToFocus = fishingOperationTabContent.getHandler().getComponentToFocus(); + componentToFocus.requestFocusInWindow(); - } } ); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/EditProtocolAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/EditProtocolAction.java index d500617..372c10f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/EditProtocolAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/EditProtocolAction.java @@ -53,7 +53,7 @@ public class EditProtocolAction extends AbstractChangeScreenAction { /** Logger. */ private static final Log log = LogFactory.getLog(EditProtocolAction.class); - public static final JAXXContextEntryDef<TuttiProtocol> CLEAN_PROTOCOL_ENTRY = new JAXXContextEntryDef<TuttiProtocol>("cleanProtocol", TuttiProtocol.class); + public static final JAXXContextEntryDef<TuttiProtocol> CLEAN_PROTOCOL_ENTRY = new JAXXContextEntryDef<>("cleanProtocol", TuttiProtocol.class); public EditProtocolAction(MainUIHandler handler) { super(handler, true, TuttiScreen.EDIT_PROTOCOL); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/ExportCruiseForSumatraAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/ExportCruiseForSumatraAction.java index 94daf67..ac4f570 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/ExportCruiseForSumatraAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/ExportCruiseForSumatraAction.java @@ -117,7 +117,7 @@ public class ExportCruiseForSumatraAction extends AbstractMainUITuttiAction { // export catches CatchesSumatraExportService service = getContext().getCatchesSumatraExportService(); - sumatraExportResult = service.exportCruiseForSumatra(file, cruise.getId(), pm); + sumatraExportResult = service.exportCruiseForSumatra(file, cruise.getIdAsInt(), pm); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/SendCruiseReportAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/SendCruiseReportAction.java index 7cb8014..b1d19c9 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/SendCruiseReportAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/SendCruiseReportAction.java @@ -93,7 +93,7 @@ public class SendCruiseReportAction extends AbstractMainUITuttiAction { // export catches CatchesPdfExportService service = getContext().getGeneratePDFService(); - service.generateCruisePDFFile(file, cruise.getId(), getConfig().getI18nLocale()); + service.generateCruisePDFFile(file, cruise.getIdAsInt(), getConfig().getI18nLocale()); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/SpeciesToConfirmReportForCruiseAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/SpeciesToConfirmReportForCruiseAction.java index 8e54be0..acb99c0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/SpeciesToConfirmReportForCruiseAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/SpeciesToConfirmReportForCruiseAction.java @@ -105,7 +105,7 @@ public class SpeciesToConfirmReportForCruiseAction extends AbstractMainUITuttiAc ProgressionModel progressionModel = getProgressionModel(); progressionModel.adaptTotal(nbSteps); - toConfirmReportService.createToConfirmReport(file, cruise.getId(), progressionModel); + toConfirmReportService.createToConfirmReport(file, cruise.getIdAsInt(), progressionModel); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java index 12cc4d3..49f5b73 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java @@ -24,7 +24,6 @@ package fr.ifremer.tutti.ui.swing.content.operation; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.Program; @@ -38,10 +37,10 @@ import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.type.CoordinateEditorType; import fr.ifremer.tutti.ui.swing.TuttiUIContext; -import fr.ifremer.tutti.ui.swing.content.operation.fishing.actions.CancelEditFishingOperationAction; import fr.ifremer.tutti.ui.swing.content.operation.fishing.AbstractCaracteristicTabUIModel; import fr.ifremer.tutti.ui.swing.content.operation.fishing.GearUseFeatureTabUIModel; import fr.ifremer.tutti.ui.swing.content.operation.fishing.VesselUseFeatureTabUIModel; +import fr.ifremer.tutti.ui.swing.content.operation.fishing.actions.CancelEditFishingOperationAction; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.caracteristics.GearCaracteristicListCellRenderer; @@ -75,7 +74,6 @@ import java.util.Calendar; import java.util.Collection; import java.util.Date; import java.util.List; -import java.util.Map; import java.util.Set; import static org.nuiton.i18n.I18n.t; @@ -105,7 +103,7 @@ public class EditFishingOperationUIHandler extends AbstractTuttiTabContainerUIHa Date oldDate = (Date) evt.getOldValue(); Date newDate = (Date) evt.getNewValue(); if (newDate != null && getModel().getGearShootingEndDate() == null && - (oldDate == null || !DateUtils.isSameDay(oldDate, newDate))) { + (oldDate == null || !DateUtils.isSameDay(oldDate, newDate))) { getModel().setGearShootingEndDate(newDate); } } @@ -201,7 +199,7 @@ public class EditFishingOperationUIHandler extends AbstractTuttiTabContainerUIHa public void beforeInit(EditFishingOperationUI ui) { super.beforeInit(ui); - this.fishingOperationMonitor = new TuttiBeanMonitor<EditFishingOperationUIModel>( + this.fishingOperationMonitor = new TuttiBeanMonitor<>( EditFishingOperationUIModel.PROPERTY_STATION_NUMBER, EditFishingOperationUIModel.PROPERTY_FISHING_OPERATION_NUMBER, EditFishingOperationUIModel.PROPERTY_STRATA, @@ -265,50 +263,34 @@ public class EditFishingOperationUIHandler extends AbstractTuttiTabContainerUIHa model.setCoordinateEditorType(getConfig().getCoordinateEditorType()); model.setValidationContext(getContext().getValidationContext()); - model.addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_STRATA, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - EditFishingOperationUIModel source = (EditFishingOperationUIModel) evt.getSource(); - TuttiLocation newStrata = (TuttiLocation) evt.getNewValue(); - onSelectedStrata(source, newStrata); - } - }); - - model.addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_SUB_STRATA, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - EditFishingOperationUIModel source = (EditFishingOperationUIModel) evt.getSource(); - TuttiLocation newStrata = (TuttiLocation) evt.getNewValue(); - onSelectedSubStrata(source, newStrata); - } + model.addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_STRATA, evt -> { + EditFishingOperationUIModel source = (EditFishingOperationUIModel) evt.getSource(); + TuttiLocation newStrata = (TuttiLocation) evt.getNewValue(); + onSelectedStrata(source, newStrata); }); - getContext().addPropertyChangeListener(TuttiUIContext.PROPERTY_VALIDATION_CONTEXT, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - getModel().setValidationContext((String) evt.getNewValue()); - } + model.addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_SUB_STRATA, evt -> { + EditFishingOperationUIModel source = (EditFishingOperationUIModel) evt.getSource(); + TuttiLocation newStrata = (TuttiLocation) evt.getNewValue(); + onSelectedSubStrata(source, newStrata); }); - model.addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_FISHING_OPERATION_VALID, new PropertyChangeListener() { + getContext().addPropertyChangeListener(TuttiUIContext.PROPERTY_VALIDATION_CONTEXT, evt -> getModel().setValidationContext((String) evt.getNewValue())); - @Override - public void propertyChange(PropertyChangeEvent evt) { - Boolean valid = (Boolean) evt.getNewValue(); - Color color = null; - Color fontColor = Color.BLACK; - if (valid == Boolean.TRUE) { - color = Color.GREEN; + model.addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_FISHING_OPERATION_VALID, evt -> { + Boolean valid = (Boolean) evt.getNewValue(); + Color color = null; + Color fontColor = Color.BLACK; + if (valid == Boolean.TRUE) { + color = Color.GREEN; - } else if (valid == Boolean.FALSE) { - color = Color.RED; - fontColor = Color.WHITE; - } - Component tab = getTabPanel().getTabComponentAt(0); - tab.setForeground(fontColor); - tab.setBackground(color); + } else if (valid == Boolean.FALSE) { + color = Color.RED; + fontColor = Color.WHITE; } + Component tab = getTabPanel().getTabComponentAt(0); + tab.setForeground(fontColor); + tab.setBackground(color); }); // enable or not the import from column file @@ -367,7 +349,7 @@ public class EditFishingOperationUIHandler extends AbstractTuttiTabContainerUIHa true)); combobox.addItemListener(new ItemListener() { - Map<Gear, String> tips = Maps.newHashMap(); +// Map<Gear, String> tips = Maps.newHashMap(); public void itemStateChanged(ItemEvent e) { Object item = e.getItem(); @@ -432,71 +414,64 @@ public class EditFishingOperationUIHandler extends AbstractTuttiTabContainerUIHa // reset TrawlDistance when fishingOperationRectiligne pass to false // see https://forge.codelutin.com/issues/5807 model.addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_FISHING_OPERATION_RECTILIGNE, - new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - - EditFishingOperationUIModel source = (EditFishingOperationUIModel) evt.getSource(); - Boolean newValue = (Boolean) evt.getNewValue(); - if (BooleanUtils.isFalse(newValue)) { - source.setTrawlDistance(null); - } + evt -> { + + EditFishingOperationUIModel source = (EditFishingOperationUIModel) evt.getSource(); + Boolean newValue = (Boolean) evt.getNewValue(); + if (BooleanUtils.isFalse(newValue)) { + source.setTrawlDistance(null); } }); // Change vessel list and gear list when vessel type changes - model.addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_SECONDARY_VESSEL_TYPE, new PropertyChangeListener() { + model.addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_SECONDARY_VESSEL_TYPE, evt -> { - @Override - public void propertyChange(PropertyChangeEvent evt) { + EditFishingOperationUIModel model1 = + (EditFishingOperationUIModel) evt.getSource(); - EditFishingOperationUIModel model = - (EditFishingOperationUIModel) evt.getSource(); + boolean modify = model1.isModify(); - boolean modify = model.isModify(); + SecondaryVesselTypeEnum vesselType = + (SecondaryVesselTypeEnum) evt.getNewValue(); - SecondaryVesselTypeEnum vesselType = - (SecondaryVesselTypeEnum) evt.getNewValue(); + List<Vessel> vessels = Lists.newArrayList(); - List<Vessel> vessels = Lists.newArrayList(); + if (vesselType != null) { + switch (vesselType) { - if (vesselType != null) { - switch (vesselType) { + case SCIENTIFIC: - case SCIENTIFIC: - - vessels = model.getScientificSecondaryVessel(); - break; - case FISHING: + vessels = model1.getScientificSecondaryVessel(); + break; + case FISHING: - vessels = model.getFishingSecondaryVessel(); - break; - case ONLY_CRUISE: + vessels = model1.getFishingSecondaryVessel(); + break; + case ONLY_CRUISE: - vessels = model.getOnlyCruisSecondaryVessel(); - break; - case ALL: - default: + vessels = model1.getOnlyCruisSecondaryVessel(); + break; + case ALL: + default: - vessels = model.getAllSecondaryVessel(); - } + vessels = model1.getAllSecondaryVessel(); } + } - // clean vessel filter - EditFishingOperationUIHandler.this.ui.getSecondaryVesselList().getHandler().clearFilters(); + // clean vessel filter + EditFishingOperationUIHandler.this.ui.getSecondaryVesselList().getHandler().clearFilters(); - // get selected vessel - List<Vessel> selected = Lists.newArrayList(EditFishingOperationUIHandler.this.ui.getSecondaryVesselList().getModel().getSelected()); + // get selected vessel + List<Vessel> selected = Lists.newArrayList(EditFishingOperationUIHandler.this.ui.getSecondaryVesselList().getModel().getSelected()); - // set new universe of vessel - EditFishingOperationUIHandler.this.ui.getSecondaryVesselList().getModel().setUniverse(vessels); + // set new universe of vessel + EditFishingOperationUIHandler.this.ui.getSecondaryVesselList().getModel().setUniverse(vessels); - // push back selected vessel - EditFishingOperationUIHandler.this.ui.getSecondaryVesselList().getModel().setSelected(selected); + // push back selected vessel + EditFishingOperationUIHandler.this.ui.getSecondaryVesselList().getModel().setSelected(selected); - // push back modify state - model.setModify(modify); - } + // push back modify state + model1.setModify(modify); }); model.setSecondaryVesselType(null); @@ -525,24 +500,21 @@ public class EditFishingOperationUIHandler extends AbstractTuttiTabContainerUIHa // listen when id becomes empty or not to update cancel action and button getModel().addPropertyChangeListener( EditFishingOperationUIModel.PROPERTY_ID, - new PropertyChangeListener() { - - public void propertyChange(PropertyChangeEvent evt) { - JButton button = EditFishingOperationUIHandler.this.ui.getCancelButton(); - CancelEditFishingOperationAction action = - getContext().getActionFactory().getLogicAction(button); - if (evt.getNewValue() == null) { - button.setText(t("tutti.editFishingOperation.action.cancelEditFishingOperation")); - button.setToolTipText(t("tutti.editFishingOperation.action.cancelEditFishingOperation.tip")); - button.setMnemonic(t("tutti.editFishingOperation.action.cancelEditFishingOperation.mnemonic").charAt(0)); - action.setActionDescription(t("tutti.editFishingOperation.action.cancelEditFishingOperation.tip")); - - } else { - button.setText(t("tutti.editFishingOperation.action.resetEditFishingOperation")); - button.setToolTipText(t("tutti.editFishingOperation.action.resetEditFishingOperation.tip")); - button.setMnemonic(t("tutti.editFishingOperation.action.resetEditFishingOperation.mnemonic").charAt(0)); - action.setActionDescription(t("tutti.editFishingOperation.action.resetEditFishingOperation.tip")); - } + evt -> { + JButton button = EditFishingOperationUIHandler.this.ui.getCancelButton(); + CancelEditFishingOperationAction action = + getContext().getActionFactory().getLogicAction(button); + if (evt.getNewValue() == null) { + button.setText(t("tutti.editFishingOperation.action.cancelEditFishingOperation")); + button.setToolTipText(t("tutti.editFishingOperation.action.cancelEditFishingOperation.tip")); + button.setMnemonic(t("tutti.editFishingOperation.action.cancelEditFishingOperation.mnemonic").charAt(0)); + action.setActionDescription(t("tutti.editFishingOperation.action.cancelEditFishingOperation.tip")); + + } else { + button.setText(t("tutti.editFishingOperation.action.resetEditFishingOperation")); + button.setToolTipText(t("tutti.editFishingOperation.action.resetEditFishingOperation.tip")); + button.setMnemonic(t("tutti.editFishingOperation.action.resetEditFishingOperation.mnemonic").charAt(0)); + action.setActionDescription(t("tutti.editFishingOperation.action.resetEditFishingOperation.tip")); } }); } @@ -736,29 +708,25 @@ public class EditFishingOperationUIHandler extends AbstractTuttiTabContainerUIHa } public String getGearLatitudeLabelText(CoordinateEditorType coordinateEditorType) { - String result = t("tutti.editFishingOperation.field.gearLatitude", coordinateEditorType.toString()); - return result; + return t("tutti.editFishingOperation.field.gearLatitude", coordinateEditorType.toString()); } public String getGearLongitudeLabelText(CoordinateEditorType coordinateEditorType) { - String result = t("tutti.editFishingOperation.field.gearLongitude", coordinateEditorType.toString()); - return result; + return t("tutti.editFishingOperation.field.gearLongitude", coordinateEditorType.toString()); } public String getTrawlDistanceTooltipText(Integer trawlDistance) { - String result = trawlDistance == null ? - null : - t("tutti.editFishingOperation.field.trawlDistance.inMilles.tip", Distances.getDistanceInMilles(Float.valueOf(trawlDistance))); - return result; + return trawlDistance == null ? + null : + t("tutti.editFishingOperation.field.trawlDistance.inMilles.tip", Distances.getDistanceInMilles(Float.valueOf(trawlDistance))); } public String getDuration(Date startDate, Date endDate) { - String duration = DateTimes.getDuration( + return DateTimes.getDuration( startDate, endDate, t("tutti.editFishingOperation.duration.format") ); - return duration; } public String decorateVessel(Vessel vessel) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java index b649bc1..9a018c4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIModel.java @@ -730,8 +730,7 @@ public class EditFishingOperationUIModel extends AbstractTuttiBeanUIModel<Fishin } public Integer getGearShootingEndLongitudeDmsDegree() { - Integer result = gearShootingEndLongitudeDms.getDegree(); - return result; + return gearShootingEndLongitudeDms.getDegree(); } public void setGearShootingEndLongitudeDmsDegree(Integer degree) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java index cb068e3..b674111 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java @@ -41,8 +41,6 @@ import org.nuiton.jaxx.application.swing.util.CloseableUI; import javax.swing.JComponent; import javax.swing.JTabbedPane; import javax.swing.SwingUtilities; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.util.List; import static org.nuiton.i18n.I18n.t; @@ -100,7 +98,7 @@ public class FishingOperationsUIHandler extends AbstractTuttiTabContainerUIHandl } List<FishingOperation> fishingOperations = - Lists.newArrayList(persistenceService.getAllFishingOperation(cruise.getId())); + Lists.newArrayList(persistenceService.getAllFishingOperation(cruise.getIdAsInt())); for (FishingOperation fishingOperation : fishingOperations) { fishingOperation.setCruise(cruise); @@ -132,66 +130,60 @@ public class FishingOperationsUIHandler extends AbstractTuttiTabContainerUIHandl fishingOperations, model.getSelectedFishingOperation()); - model.addPropertyChangeListener(FishingOperationsUIModel.PROPERTY_SELECTED_FISHING_OPERATION, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (log.isDebugEnabled()) { - log.debug("propertyChange " + FishingOperationsUIModel.PROPERTY_SELECTED_FISHING_OPERATION); - } + model.addPropertyChangeListener(FishingOperationsUIModel.PROPERTY_SELECTED_FISHING_OPERATION, evt -> { + if (log.isDebugEnabled()) { + log.debug("propertyChange " + FishingOperationsUIModel.PROPERTY_SELECTED_FISHING_OPERATION); + } + + // selected fishing operation is now the editing one + FishingOperation newValue = (FishingOperation) evt.getNewValue(); + + if (!getModel().isEditionAdjusting()) { - // selected fishing operation is now the editing one - FishingOperation newValue = (FishingOperation) evt.getNewValue(); - - if (!getModel().isEditionAdjusting()) { - - FishingOperation operation; - if (newValue == null) { - operation = null; - } else { - operation = getPersistenceService().getFishingOperation(newValue.getId()); - Cruise cruise = getDataContext().getCruise(); - operation.setCruise(cruise); - } - editFishingOperationAction.setFishingOperation(operation); - if (SwingUtilities.isEventDispatchThread()) { - - // launch a long action - getContext().getActionEngine().runAction(editFishingOperationAction); - } else { - - // run as an internal action (of embedded action) - getContext().getActionEngine().runInternalAction(editFishingOperationAction); - } + FishingOperation operation; + if (newValue == null) { + operation = null; + } else { + operation = getPersistenceService().getFishingOperation(newValue.getIdAsInt()); + Cruise cruise = getDataContext().getCruise(); + operation.setCruise(cruise); } + editFishingOperationAction.setFishingOperation(operation); + if (SwingUtilities.isEventDispatchThread()) { - // done here instead of in the action in order to update the headers - // when the operation is saved - String fishingOperationText = getFishingOperationTitle(newValue); - - EditFishingOperationUI efoUI = getUI().getFishingOperationTabContent(); - efoUI.getTraitGeneralTabPane().setTitle(fishingOperationText); - efoUI.getVesselUseFeatureTabPane().setTitle(fishingOperationText); - efoUI.getGearUseFeatureTabPane().setTitle(fishingOperationText); - - EditCatchesUI ecUI = getUI().getCatchesTabContent(); - ecUI.getCatchesCaracteristicsTabPane().setTitle(fishingOperationText); - ecUI.getSpeciesTabFishingOperationReminderLabel().setTitle(fishingOperationText); - ecUI.getBenthosTabFishingOperationReminderLabel().setTitle(fishingOperationText); - ecUI.getMarineLitterTabFishingOperationReminderLabel().setTitle(fishingOperationText); - ecUI.getAccidentalTabFishingOperationReminderLabel().setTitle(fishingOperationText); - ecUI.getIndividualObservationTabFishingOperationReminderLabel().setTitle(fishingOperationText); + // launch a long action + getContext().getActionEngine().runAction(editFishingOperationAction); + } else { + + // run as an internal action (of embedded action) + getContext().getActionEngine().runInternalAction(editFishingOperationAction); + } } + + // done here instead of in the action in order to update the headers + // when the operation is saved + String fishingOperationText = getFishingOperationTitle(newValue); + + EditFishingOperationUI efoUI = getUI().getFishingOperationTabContent(); + efoUI.getTraitGeneralTabPane().setTitle(fishingOperationText); + efoUI.getVesselUseFeatureTabPane().setTitle(fishingOperationText); + efoUI.getGearUseFeatureTabPane().setTitle(fishingOperationText); + + EditCatchesUI ecUI = getUI().getCatchesTabContent(); + ecUI.getCatchesCaracteristicsTabPane().setTitle(fishingOperationText); + ecUI.getSpeciesTabFishingOperationReminderLabel().setTitle(fishingOperationText); + ecUI.getBenthosTabFishingOperationReminderLabel().setTitle(fishingOperationText); + ecUI.getMarineLitterTabFishingOperationReminderLabel().setTitle(fishingOperationText); + ecUI.getAccidentalTabFishingOperationReminderLabel().setTitle(fishingOperationText); + ecUI.getIndividualObservationTabFishingOperationReminderLabel().setTitle(fishingOperationText); }); - model.addPropertyChangeListener(FishingOperationsUIModel.PROPERTY_FISHING_OPERATION, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (log.isDebugEnabled()) { - log.debug("propertyChange " + FishingOperationsUIModel.PROPERTY_FISHING_OPERATION); - } - FishingOperationsUIHandler.this.ui.getFishingOperationComboBox().setData(null); - FishingOperationsUIHandler.this.ui.getFishingOperationComboBox().setData((List<FishingOperation>) evt.getNewValue()); + model.addPropertyChangeListener(FishingOperationsUIModel.PROPERTY_FISHING_OPERATION, evt -> { + if (log.isDebugEnabled()) { + log.debug("propertyChange " + FishingOperationsUIModel.PROPERTY_FISHING_OPERATION); } + FishingOperationsUIHandler.this.ui.getFishingOperationComboBox().setData(null); + FishingOperationsUIHandler.this.ui.getFishingOperationComboBox().setData((List<FishingOperation>) evt.getNewValue()); }); // FishingOperation selectedOperation = null; @@ -206,14 +198,11 @@ public class FishingOperationsUIHandler extends AbstractTuttiTabContainerUIHandl // } // } - getContext().addPropertyChangeListener(TuttiUIContext.PROPERTY_HIDE_BODY, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - Boolean hideBody = (Boolean) evt.getNewValue(); - if (hideBody != null && hideBody) { - if (getModel().getSelectedFishingOperation() == null) { - getUI().getFishingOperationComboBox().requestFocus(); - } + getContext().addPropertyChangeListener(TuttiUIContext.PROPERTY_HIDE_BODY, evt -> { + Boolean hideBody = (Boolean) evt.getNewValue(); + if (hideBody != null && hideBody) { + if (getModel().getSelectedFishingOperation() == null) { + getUI().getFishingOperationComboBox().requestFocus(); } } }); @@ -244,8 +233,7 @@ public class FishingOperationsUIHandler extends AbstractTuttiTabContainerUIHandl editFishingOperationAction.setCheckPreviousEdit(true); try { - boolean result = editFishingOperationAction.prepareAction(); - return result; + return editFishingOperationAction.prepareAction(); } finally { editFishingOperationAction.releaseAction(); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java index cb073be..4d9b780 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java @@ -54,9 +54,9 @@ public class FishingOperationsUIModel extends AbstractSerializableBean { public static final String PROPERTY_CATCH_ENABLED = "catchEnabled"; - public static final String PROPERTY_CATCH_NOT_FOUND = "catchNotFound"; - - public static final String PROPERTY_SAMPLE_CATCH_MODEL_VALID = "sampleCatchModelValid"; +// public static final String PROPERTY_CATCH_NOT_FOUND = "catchNotFound"; +// +// public static final String PROPERTY_SAMPLE_CATCH_MODEL_VALID = "sampleCatchModelValid"; public static final String PROPERTY_VALIDATION_ERROR_MESSAGE = "validationErrorMessage"; @@ -212,9 +212,7 @@ public class FishingOperationsUIModel extends AbstractSerializableBean { } public FishingOperation getFishingOperation(String id) { - FishingOperation result = - TuttiEntities.findById(fishingOperation, id); - return result; + return TuttiEntities.findById(fishingOperation, id); } public boolean isCatchEnabled() { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchTableUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchTableUIHandler.java index bda1683..d564255 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchTableUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/AbstractTuttiBatchTableUIHandler.java @@ -31,7 +31,6 @@ import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.jdesktop.swingx.JXTable; -import org.jdesktop.swingx.decorator.ComponentAdapter; import org.jdesktop.swingx.decorator.HighlightPredicate; import org.jdesktop.swingx.decorator.Highlighter; import org.jdesktop.swingx.sort.TableSortController; @@ -124,7 +123,7 @@ public abstract class AbstractTuttiBatchTableUIHandler<R extends AbstractTuttiBe installTableKeyListener(columnModel, table); - TableSortController<TableModel> sorter = new TableSortController<TableModel>(tableModel); + TableSortController<TableModel> sorter = new TableSortController<>(tableModel); sorter.setSortable(false); table.setRowSorter(sorter); @@ -145,12 +144,9 @@ public abstract class AbstractTuttiBatchTableUIHandler<R extends AbstractTuttiBe new HighlightPredicate.AndHighlightPredicate( new HighlightPredicate.IdentifierHighlightPredicate(identifier), // for not null value - new HighlightPredicate() { - @Override - public boolean isHighlighted(Component renderer, ComponentAdapter adapter) { - String value = (String) adapter.getValue(); - return StringUtils.isNotBlank(value); - } + (renderer, adapter) -> { + String value = (String) adapter.getValue(); + return StringUtils.isNotBlank(value); }), cellWithValueColor); table.addHighlighter(commentHighlighter); } @@ -162,12 +158,9 @@ public abstract class AbstractTuttiBatchTableUIHandler<R extends AbstractTuttiBe new HighlightPredicate.AndHighlightPredicate( new HighlightPredicate.IdentifierHighlightPredicate(identifier), // for not null value - new HighlightPredicate() { - @Override - public boolean isHighlighted(Component renderer, ComponentAdapter adapter) { - Collection attachments = (Collection) adapter.getValue(); - return CollectionUtils.isNotEmpty(attachments); - } + (renderer, adapter) -> { + Collection attachments = (Collection) adapter.getValue(); + return CollectionUtils.isNotEmpty(attachments); } ), cellWithValueColor); table.addHighlighter(attachmentHighlighter); @@ -180,23 +173,20 @@ public abstract class AbstractTuttiBatchTableUIHandler<R extends AbstractTuttiBe final TableCellRenderer defaultRenderer = table.getDefaultRenderer(Number.class); final Decorator<String> idDecorator = getDecorator(String.class, DecoratorService.SPACE_EVERY_3_DIGIT); - TableCellRenderer idTableCellRenderer = new TableCellRenderer() { - @Override - public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { + TableCellRenderer idTableCellRenderer = (table1, value, isSelected, hasFocus, row, column) -> { - String text = null; - if (value != null) { - text = idDecorator.toString(value); - } + String text = null; + if (value != null) { + text = idDecorator.toString(value); + } - Component result = defaultRenderer.getTableCellRendererComponent(table, text, isSelected, hasFocus, row, column); - if (result instanceof JLabel) { - JLabel jLabel = (JLabel) result; - jLabel.setHorizontalTextPosition(SwingConstants.RIGHT); + Component result = defaultRenderer.getTableCellRendererComponent(table1, text, isSelected, hasFocus, row, column); + if (result instanceof JLabel) { + JLabel jLabel = (JLabel) result; + jLabel.setHorizontalTextPosition(SwingConstants.RIGHT); - } - return result; } + return result; }; addColumnToModel(model, null, idTableCellRenderer, identifier); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CatchCustomTab.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CatchCustomTab.java index cf9e459..e58a89d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CatchCustomTab.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CatchCustomTab.java @@ -34,8 +34,6 @@ import org.nuiton.util.beans.BeanUtil; import javax.swing.UIManager; import java.awt.Font; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.util.Set; import static org.nuiton.i18n.I18n.t; @@ -81,16 +79,7 @@ public class CatchCustomTab extends CustomTab { // listen to the model try { - BeanUtil.addPropertyChangeListener( - new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - - onPropertyChanged(evt.getPropertyName(), evt.getNewValue()); - - } - }, this.model); + BeanUtil.addPropertyChangeListener(evt -> onPropertyChanged(evt.getPropertyName(), evt.getNewValue()), this.model); } catch (Exception e) { throw new ApplicationTechnicalException("Could not init listener", e); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java index e272d46..a07b64f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java @@ -237,12 +237,9 @@ public class EditCatchesSvgHandler { CatchBatch.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT, CatchBatch.PROPERTY_SPECIES_TOTAL_SORTED_COMPUTED_WEIGHT, CatchBatch.PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT), - new Function<EditCatchesUIModel, Color>() { - @Override - public Color apply(EditCatchesUIModel model) { - boolean warning = model.isSpeciesTotalUnsortedComputedWeightInWarning(); - return warning ? speciesOrBenthosUnsortedComputedWeightInWarningColor : speciesColor; - } + model1 -> { + boolean warning = model1.isSpeciesTotalUnsortedComputedWeightInWarning(); + return warning ? speciesOrBenthosUnsortedComputedWeightInWarningColor : speciesColor; })); addSvgRelatedPropertyChangeListener(null, new ChangeElementBackgroundColorPropertyChangeListener( @@ -252,12 +249,9 @@ public class EditCatchesSvgHandler { CatchBatch.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT, CatchBatch.PROPERTY_BENTHOS_TOTAL_SORTED_COMPUTED_WEIGHT, CatchBatch.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT), - new Function<EditCatchesUIModel, Color>() { - @Override - public Color apply(EditCatchesUIModel model) { - boolean warning = model.isBenthosTotalUnsortedComputedWeightInWarning(); - return warning ? speciesOrBenthosUnsortedComputedWeightInWarningColor : benthosColor; - } + model1 -> { + boolean warning = model1.isBenthosTotalUnsortedComputedWeightInWarning(); + return warning ? speciesOrBenthosUnsortedComputedWeightInWarningColor : benthosColor; })); initSvgField(n("tutti.editCatchBatch.field.speciesTotalComputedWeight"), @@ -388,68 +382,65 @@ public class EditCatchesSvgHandler { target.addEventListener("click", new OnValueClickListener(computableData, property, weightUnit), false); } - updateOnCanvas(new Runnable() { - @Override - public void run() { + updateOnCanvas(() -> { - SVGOMRectElement rectElement = (SVGOMRectElement) svgDocument.getElementById(notNullProperty + "Rect"); - SVGRect bbox = rectElement.getBBox(); - Float x = bbox.getX(); + SVGOMRectElement rectElement = (SVGOMRectElement) svgDocument.getElementById(notNullProperty + "Rect"); + SVGRect bbox = rectElement.getBBox(); + Float x = bbox.getX(); - SVGOMTextElement labelElement = (SVGOMTextElement) svgDocument.getElementById(notNullProperty + "Label"); - CSSStyleDeclaration style = labelElement.getStyle(); - if (computableData == null) { - style.setProperty("font-style", "italic", null); - } + SVGOMTextElement labelElement = (SVGOMTextElement) svgDocument.getElementById(notNullProperty + "Label"); + CSSStyleDeclaration style = labelElement.getStyle(); + if (computableData == null) { + style.setProperty("font-style", "italic", null); + } - if (bgColor != null) { - int colorBrightness = TuttiUIUtil.getColorBrightness(bgColor); - String textColor = colorBrightness > 150 ? "#000000" : "#FFFFFF"; - style.setProperty("fill", textColor, null); - } + if (bgColor != null) { + int colorBrightness = TuttiUIUtil.getColorBrightness(bgColor); + String textColor = colorBrightness > 150 ? "#000000" : "#FFFFFF"; + style.setProperty("fill", textColor, null); + } - labelElement.setTextContent(weightUnit.decorateLabel(t(label))); - bbox = labelElement.getBBox(); - float labelX = bbox.getX(); - float width = Math.abs(x - labelX) + 10; + labelElement.setTextContent(weightUnit.decorateLabel(t(label))); + bbox = labelElement.getBBox(); + float labelX = bbox.getX(); + float width = Math.abs(x - labelX) + 10; - SVGOMRectElement labelRectElement = (SVGOMRectElement) svgDocument.getElementById(notNullProperty + "LabelRect"); - if (labelRectElement != null) { - float actualWidth = Math.abs(labelRectElement.getBBox().getX() - labelX) + 10; + SVGOMRectElement labelRectElement = (SVGOMRectElement) svgDocument.getElementById(notNullProperty + "LabelRect"); + if (labelRectElement != null) { + float actualWidth = Math.abs(labelRectElement.getBBox().getX() - labelX) + 10; - if (actualWidth < width) { - labelRectElement.setAttribute("width", Float.toString(width)); - labelRectElement.setAttribute("x", String.valueOf(labelX - 10)); + if (actualWidth < width) { + labelRectElement.setAttribute("width", Float.toString(width)); + labelRectElement.setAttribute("x", String.valueOf(labelX - 10)); - for (String id : idsInGroup) { - Element el = svgDocument.getElementById(id + "LabelRect"); - el.setAttribute("width", Float.toString(width)); - el.setAttribute("x", String.valueOf(labelX - 10)); - } + for (String id : idsInGroup) { + Element el = svgDocument.getElementById(id + "LabelRect"); + el.setAttribute("width", Float.toString(width)); + el.setAttribute("x", String.valueOf(labelX - 10)); } - - style = labelRectElement.getStyle(); - String hexaColor = "#" + Integer.toHexString(bgColor.getRGB()).substring(2); - style.setProperty("fill", hexaColor, null); } - Float value; - boolean computed; - if (computableData == null) { - computed = true; - value = getModelPropertyValue(notNullProperty); + style = labelRectElement.getStyle(); + String hexaColor = "#" + Integer.toHexString(bgColor.getRGB()).substring(2); + style.setProperty("fill", hexaColor, null); + } - } else if (computableData.getData() == null) { - computed = true; - value = computableData.getComputedData(); + Float value; + boolean computed; + if (computableData == null) { + computed = true; + value = getModelPropertyValue(notNullProperty); - } else { - computed = false; - value = computableData.getData(); - } + } else if (computableData.getData() == null) { + computed = true; + value = computableData.getComputedData(); - updateValue(notNullProperty, value, weightUnit, computed, idsInGroup); + } else { + computed = false; + value = computableData.getData(); } + + updateValue(notNullProperty, value, weightUnit, computed, idsInGroup); }); } @@ -481,44 +472,42 @@ public class EditCatchesSvgHandler { final boolean computed, final String... idsInGroup) { - updateOnCanvas(new Runnable() { - public void run() { - if (log.isDebugEnabled()) { - log.debug("update " + property + " field"); - } + updateOnCanvas(() -> { + if (log.isDebugEnabled()) { + log.debug("update " + property + " field"); + } - SVGOMTextElement valueElement = (SVGOMTextElement) svgDocument.getElementById(property + "Value"); - if (valueElement == null) { - return; - } + SVGOMTextElement valueElement = (SVGOMTextElement) svgDocument.getElementById(property + "Value"); + if (valueElement == null) { + return; + } - //TODO i18n ? - String textContent; - if (value != null) { - textContent = Weights.getWeightStringValue(value) + " " + weightUnit.getShortLabel(); - } else { - textContent = null; - } - valueElement.setTextContent(textContent); - - CSSStyleDeclaration style = valueElement.getStyle(); - - Color colorComputedWeights = context.getConfig().getColorComputedWeights(); - String computedColor = "#" + Integer.toHexString(colorComputedWeights.getRGB()).substring(2); - style.setProperty("fill", computed ? computedColor : "#000000", null); - style.setProperty("font-style", computed ? "italic" : "normal", null); - - SVGRect bbox = valueElement.getBBox(); - SVGOMRectElement rectElement = (SVGOMRectElement) svgDocument.getElementById(property + "Rect"); - if (bbox != null && rectElement != null) { - float width = bbox.getWidth() + 15; - float actualWidth = rectElement.getBBox().getWidth(); - if (actualWidth < width) { - rectElement.setAttribute("width", Float.toString(width)); - for (String id : idsInGroup) { - Element el = svgDocument.getElementById(id + "Rect"); - el.setAttribute("width", Float.toString(width)); - } + //TODO i18n ? + String textContent; + if (value != null) { + textContent = Weights.getWeightStringValue(value) + " " + weightUnit.getShortLabel(); + } else { + textContent = null; + } + valueElement.setTextContent(textContent); + + CSSStyleDeclaration style = valueElement.getStyle(); + + Color colorComputedWeights = context.getConfig().getColorComputedWeights(); + String computedColor = "#" + Integer.toHexString(colorComputedWeights.getRGB()).substring(2); + style.setProperty("fill", computed ? computedColor : "#000000", null); + style.setProperty("font-style", computed ? "italic" : "normal", null); + + SVGRect bbox = valueElement.getBBox(); + SVGOMRectElement rectElement = (SVGOMRectElement) svgDocument.getElementById(property + "Rect"); + if (bbox != null && rectElement != null) { + float width = bbox.getWidth() + 15; + float actualWidth = rectElement.getBBox().getWidth(); + if (actualWidth < width) { + rectElement.setAttribute("width", Float.toString(width)); + for (String id : idsInGroup) { + Element el = svgDocument.getElementById(id + "Rect"); + el.setAttribute("width", Float.toString(width)); } } } @@ -551,44 +540,35 @@ public class EditCatchesSvgHandler { log.debug("init " + property + " field"); } - updateOnCanvas(new Runnable() { - @Override - public void run() { - Element labelElement = svgDocument.getElementById(property + "Label"); - labelElement.setTextContent(t(label)); + updateOnCanvas(() -> { + Element labelElement = svgDocument.getElementById(property + "Label"); + labelElement.setTextContent(t(label)); - Element valueElement = svgDocument.getElementById(property + "Value"); - Integer value; - try { - String sValue = BeanUtils.getProperty(model, property); - if (sValue != null) { - value = Integer.parseInt(sValue); - } else { - value = null; - } - - } catch (ReflectiveOperationException e) { - if (log.isErrorEnabled()) { - log.error("error on reading model's property " + property, e); - } + Element valueElement = svgDocument.getElementById(property + "Value"); + Integer value; + try { + String sValue = BeanUtils.getProperty(model, property); + if (sValue != null) { + value = Integer.parseInt(sValue); + } else { value = null; } - valueElement.setTextContent(JAXXUtil.getStringValue(value)); + + } catch (ReflectiveOperationException e) { + if (log.isErrorEnabled()) { + log.error("error on reading model's property " + property, e); + } + value = null; } + valueElement.setTextContent(JAXXUtil.getStringValue(value)); }); - addSvgRelatedPropertyChangeListener(property, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - final Integer value = (Integer) evt.getNewValue(); - updateOnCanvas(new Runnable() { - @Override - public void run() { - Element labelElement = svgDocument.getElementById(property + "Value"); - labelElement.setTextContent(JAXXUtil.getStringValue(value)); - } - }); - } + addSvgRelatedPropertyChangeListener(property, evt -> { + final Integer value = (Integer) evt.getNewValue(); + updateOnCanvas(() -> { + Element labelElement = svgDocument.getElementById(property + "Value"); + labelElement.setTextContent(JAXXUtil.getStringValue(value)); + }); }); } @@ -597,31 +577,20 @@ public class EditCatchesSvgHandler { log.debug("init " + property + " field"); } - updateOnCanvas(new Runnable() { - @Override - public void run() { - Element labelElement = svgDocument.getElementById(property + "Label"); - labelElement.setTextContent(weightUnit.decorateLabel(t(label))); - } + updateOnCanvas(() -> { + Element labelElement = svgDocument.getElementById(property + "Label"); + labelElement.setTextContent(weightUnit.decorateLabel(t(label))); }); - addSvgRelatedPropertyChangeListener(property, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - Float value = (Float) evt.getNewValue(); - updateValue(property, value, weightUnit, true); - } + addSvgRelatedPropertyChangeListener(property, evt -> { + Float value = (Float) evt.getNewValue(); + updateValue(property, value, weightUnit, true); }); Float value = getModelPropertyValue(property); updateValue(property, value, weightUnit, true); - addSvgRelatedPropertyChangeListener(EditCatchesUIModel.PROPERTY_FISHING_OPERATION, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - updateTremieCarrouselVisibility(property); - } - }); + addSvgRelatedPropertyChangeListener(EditCatchesUIModel.PROPERTY_FISHING_OPERATION, evt -> updateTremieCarrouselVisibility(property)); updateTremieCarrouselVisibility(property); } @@ -632,15 +601,12 @@ public class EditCatchesSvgHandler { final boolean tremieCarrouselFieldsVisisble = fishingOperation.getVessel() != null && fishingOperation.getVessel().getId().equals(context.getConfig().getTremieCarousselVesselId()); - updateOnCanvas(new Runnable() { - @Override - public void run() { - Element labelElement = svgDocument.getElementById(property + "Label"); - labelElement.setAttribute("visibility", tremieCarrouselFieldsVisisble ? "visible" : "hidden"); + updateOnCanvas(() -> { + Element labelElement = svgDocument.getElementById(property + "Label"); + labelElement.setAttribute("visibility", tremieCarrouselFieldsVisisble ? "visible" : "hidden"); - Element valueElement = svgDocument.getElementById(property + "Value"); - valueElement.setAttribute("visibility", tremieCarrouselFieldsVisisble ? "visible" : "hidden"); - } + Element valueElement = svgDocument.getElementById(property + "Value"); + valueElement.setAttribute("visibility", tremieCarrouselFieldsVisisble ? "visible" : "hidden"); }); } } @@ -744,27 +710,25 @@ public class EditCatchesSvgHandler { } protected void updateColor() { - updateOnCanvas(new Runnable() { - public void run() { - if (log.isDebugEnabled()) { - log.debug("update " + elementId + " field"); - } + updateOnCanvas(() -> { + if (log.isDebugEnabled()) { + log.debug("update " + elementId + " field"); + } - Element rectElement = svgDocument.getElementById(elementId + "LabelRect"); - SVGStylable field = (SVGStylable) rectElement; - CSSStyleDeclaration style = field.getStyle(); + Element rectElement = svgDocument.getElementById(elementId + "LabelRect"); + SVGStylable field = (SVGStylable) rectElement; + CSSStyleDeclaration style = field.getStyle(); - Color background = colorFunction.apply(model); - String color = "#" + Integer.toHexString(background.getRGB()).substring(2); - style.setProperty("fill", color, null); + Color background = colorFunction.apply(model); + String color = "#" + Integer.toHexString(background.getRGB()).substring(2); + style.setProperty("fill", color, null); - SVGOMTextElement labelElement = (SVGOMTextElement) svgDocument.getElementById(elementId + "Label"); - CSSStyleDeclaration labelStyle = labelElement.getStyle(); + SVGOMTextElement labelElement = (SVGOMTextElement) svgDocument.getElementById(elementId + "Label"); + CSSStyleDeclaration labelStyle = labelElement.getStyle(); - int colorBrightness = TuttiUIUtil.getColorBrightness(background); - String textColor = colorBrightness > 150 ? "#000000" : "#FFFFFF"; - labelStyle.setProperty("fill", textColor, null); - } + int colorBrightness = TuttiUIUtil.getColorBrightness(background); + String textColor = colorBrightness > 150 ? "#000000" : "#FFFFFF"; + labelStyle.setProperty("fill", textColor, null); }); } } @@ -840,21 +804,19 @@ public class EditCatchesSvgHandler { ratio = Numbers.roundToInt(100f * numerator / denominator); } - updateOnCanvas(new Runnable() { - public void run() { - if (log.isDebugEnabled()) { - log.debug("update " + elementId + " field"); - } + updateOnCanvas(() -> { + if (log.isDebugEnabled()) { + log.debug("update " + elementId + " field"); + } - Element ratioElement = svgDocument.getElementById(elementId); - String textContent; - if (ratio != null) { - textContent = ratio + "%"; - } else { - textContent = null; - } - ratioElement.setTextContent(textContent); + Element ratioElement = svgDocument.getElementById(elementId); + String textContent; + if (ratio != null) { + textContent = ratio + "%"; + } else { + textContent = null; } + ratioElement.setTextContent(textContent); }); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java index 5242a0b..d4392bc 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java @@ -45,9 +45,10 @@ import org.jdesktop.swingx.JXTitledPanel; import org.nuiton.jaxx.application.swing.tab.TabContentModel; import org.nuiton.jaxx.application.swing.tab.TabHandler; -import javax.swing.*; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; +import javax.swing.JComponent; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JTabbedPane; import javax.swing.table.TableColumn; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -75,9 +76,9 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi public static final String EDIT_CARACTERISTICS_CARD = "caracteristicsCard"; - public static final String CAROUSSEL_TREMIE_VESSEL = "carousselTremieVessel"; +// public static final String CAROUSSEL_TREMIE_VESSEL = "carousselTremieVessel"; - public static final String CLASSIC_VESSEL = "classicVessel"; +// public static final String CLASSIC_VESSEL = "classicVessel"; /** Logger. */ private static final Log log = LogFactory.getLog(EditCatchesUIHandler.class); @@ -126,7 +127,7 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi public void beforeInit(EditCatchesUI ui) { super.beforeInit(ui); - this.catchBatchMonitor = new TuttiBeanMonitor<EditCatchesUIModel>( + this.catchBatchMonitor = new TuttiBeanMonitor<>( EditCatchesUIModel.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT, EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT, EditCatchesUIModel.PROPERTY_SPECIES_TOTAL_INERT_WEIGHT, @@ -196,12 +197,7 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi getTabPanel().setSelectedIndex(1); // when internal tab change, close any attachments popup - getTabPanel().addChangeListener(new ChangeListener() { - @Override - public void stateChanged(ChangeEvent e) { - closeAttachments(); - } - }); + getTabPanel().addChangeListener(e -> closeAttachments()); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java index 09bbef0..be9b8a2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java @@ -66,31 +66,31 @@ public class EditCatchesUIModel extends AbstractTuttiBeanUIModel<CatchBatch, Edi protected Float speciesTotalComputedWeight; - protected ComputableData<Float> speciesTotalSortedComputedOrNotWeight = new ComputableData<Float>(); + protected ComputableData<Float> speciesTotalSortedComputedOrNotWeight = new ComputableData<>(); protected Float speciesTotalUnsortedComputedWeight; protected Float speciesTotalSampleSortedComputedWeight; - protected ComputableData<Float> speciesTotalInertComputedOrNotWeight = new ComputableData<Float>(); + protected ComputableData<Float> speciesTotalInertComputedOrNotWeight = new ComputableData<>(); - protected ComputableData<Float> speciesTotalLivingNotItemizedComputedOrNotWeight = new ComputableData<Float>(); + protected ComputableData<Float> speciesTotalLivingNotItemizedComputedOrNotWeight = new ComputableData<>(); protected Float benthosTotalComputedWeight; - protected ComputableData<Float> benthosTotalSortedComputedOrNotWeight = new ComputableData<Float>(); + protected ComputableData<Float> benthosTotalSortedComputedOrNotWeight = new ComputableData<>(); protected Float benthosTotalUnsortedComputedWeight; protected Float benthosTotalSampleSortedComputedWeight; - protected ComputableData<Float> benthosTotalInertComputedOrNotWeight = new ComputableData<Float>(); + protected ComputableData<Float> benthosTotalInertComputedOrNotWeight = new ComputableData<>(); - protected ComputableData<Float> benthosTotalLivingNotItemizedComputedOrNotWeight = new ComputableData<Float>(); + protected ComputableData<Float> benthosTotalLivingNotItemizedComputedOrNotWeight = new ComputableData<>(); - protected ComputableData<Float> marineLitterTotalComputedOrNotWeight = new ComputableData<Float>(); + protected ComputableData<Float> marineLitterTotalComputedOrNotWeight = new ComputableData<>(); - protected ComputableData<Float> catchTotalComputedOrNotWeight = new ComputableData<Float>(); + protected ComputableData<Float> catchTotalComputedOrNotWeight = new ComputableData<>(); protected Float catchTotalSortedComputedWeight; @@ -102,7 +102,7 @@ public class EditCatchesUIModel extends AbstractTuttiBeanUIModel<CatchBatch, Edi protected Float catchTotalSortedCarousselWeight; - protected ComputableData<Float> catchTotalRejectedComputedOrNotWeight = new ComputableData<Float>(); + protected ComputableData<Float> catchTotalRejectedComputedOrNotWeight = new ComputableData<>(); protected FishingOperation fishingOperation; @@ -642,8 +642,7 @@ public class EditCatchesUIModel extends AbstractTuttiBeanUIModel<CatchBatch, Edi boolean speciesWeightEquals = speciesTotalSortedWeight != null && speciesTotalSampleSortedComputedWeight !=null && Weights.isEqualWeight(speciesTotalSortedWeight, speciesTotalSampleSortedComputedWeight); - boolean warning = noTotalUnsortedWeight && noCatchTotalRejected && speciesWeightEquals; - return warning; + return noTotalUnsortedWeight && noCatchTotalRejected && speciesWeightEquals; } //------------------------------------------------------------------------// @@ -788,8 +787,7 @@ public class EditCatchesUIModel extends AbstractTuttiBeanUIModel<CatchBatch, Edi boolean benthosWeightEquals = benthosTotalSortedWeight != null && benthosTotalSampleSortedComputedWeight !=null && Weights.isEqualWeight(benthosTotalSortedWeight, benthosTotalSampleSortedComputedWeight); - boolean warning = noTotalUnsortedWeight && noCatchTotalRejected && benthosWeightEquals; - return warning; + return noTotalUnsortedWeight && noCatchTotalRejected && benthosWeightEquals; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialogHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialogHandler.java index 01447f1..c720569 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialogHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/MultiPostImportLogDialogHandler.java @@ -27,8 +27,6 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import jaxx.runtime.spi.UIHandler; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * Created on 6/8/15. @@ -38,9 +36,6 @@ import org.apache.commons.logging.LogFactory; */ public class MultiPostImportLogDialogHandler implements UIHandler<MultiPostImportLogDialog> { - /** Logger. */ - private static final Log log = LogFactory.getLog(MultiPostImportLogDialogHandler.class); - protected MultiPostImportLogDialog ui; @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryColumnIdentifier.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryColumnIdentifier.java index cf1b607..112777e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryColumnIdentifier.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryColumnIdentifier.java @@ -22,7 +22,6 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches; * #L% */ -import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import java.io.Serializable; @@ -39,10 +38,10 @@ public class SampleCategoryColumnIdentifier<R extends SampleCategoryAble> extend Integer sampleCategoryId, String headerI18nKey, String headerTipI18nKey) { - return new SampleCategoryColumnIdentifier<R>(propertyName, - sampleCategoryId, - headerI18nKey, - headerTipI18nKey); + return new SampleCategoryColumnIdentifier<>(propertyName, + sampleCategoryId, + headerI18nKey, + headerTipI18nKey); } private final Integer sampleCategoryId; @@ -57,8 +56,7 @@ public class SampleCategoryColumnIdentifier<R extends SampleCategoryAble> extend @Override public Object getValue(R entry) { - SampleCategory sampleCategory = entry.getSampleCategoryById(getSampleCategoryId()); - return sampleCategory; + return entry.getSampleCategoryById(getSampleCategoryId()); } public void setWeightValue(R entry, Object value) { @@ -68,8 +66,7 @@ public class SampleCategoryColumnIdentifier<R extends SampleCategoryAble> extend public Serializable getCategoryValue(R entry) { - Serializable value = entry.getSampleCategoryValue(getSampleCategoryId()); - return value; + return entry.getSampleCategoryValue(getSampleCategoryId()); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java index 1fd55f1..c42a4a6 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java @@ -60,15 +60,15 @@ public class SampleCategoryComponent { Decorator<C> decorator, Color computedDataColor, WeightUnit weightUnit) { - return new SampleCategoryRenderer<C>(renderer, - decorator, - computedDataColor, - weightUnit); + return new SampleCategoryRenderer<>(renderer, + decorator, + computedDataColor, + weightUnit); } public static <C extends Serializable> TableCellEditor newEditor(Decorator<C> decorator, WeightUnit weightUnit) { - return new SampleCategoryEditor<C>(decorator, weightUnit); + return new SampleCategoryEditor<>(decorator, weightUnit); } /** @@ -160,11 +160,9 @@ public class SampleCategoryComponent { @Override public void focusGained(FocusEvent e) { - SwingUtilities.invokeLater(new Runnable() { - public void run() { - numberEditor.getTextField().requestFocus(); - numberEditor.getTextField().selectAll(); - } + SwingUtilities.invokeLater(() -> { + numberEditor.getTextField().requestFocus(); + numberEditor.getTextField().selectAll(); }); } @@ -174,11 +172,9 @@ public class SampleCategoryComponent { @Override public void ancestorAdded(AncestorEvent event) { - SwingUtilities.invokeLater(new Runnable() { - public void run() { - numberEditor.getTextField().requestFocus(); - numberEditor.getTextField().selectAll(); - } + SwingUtilities.invokeLater(() -> { + numberEditor.getTextField().requestFocus(); + numberEditor.getTextField().selectAll(); }); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesAbleBatchRowHelper.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesAbleBatchRowHelper.java index f772c97..358e53b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesAbleBatchRowHelper.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesAbleBatchRowHelper.java @@ -147,8 +147,7 @@ public class SpeciesAbleBatchRowHelper { } public static TuttiDecorator<Species> getSpeciesColumnDecorator(TableColumnExt tableColumn) { - TuttiDecorator<Species> decorator = (TuttiDecorator<Species>) tableColumn.getClientProperty(SPECIES_DECORATOR); - return decorator; + return (TuttiDecorator<Species>) tableColumn.getClientProperty(SPECIES_DECORATOR); } public static <R extends Serializable, T extends AbstractApplicationTableModel<R>> void installSpeciesColumnComparatorPopup(JXTable table, @@ -159,7 +158,7 @@ public class SpeciesAbleBatchRowHelper { ButtonGroup buttonGroup = new ButtonGroup(); SpeciesDecoratorListener<R, T> speciesDecoratorListener = - new SpeciesDecoratorListener<R, T>(table, buttonGroup, speciesColumn, optionalModel); + new SpeciesDecoratorListener<>(table, buttonGroup, speciesColumn, optionalModel); TuttiDecorator<Species> decorator = getSpeciesColumnDecorator(speciesColumn); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchDecorator.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchDecorator.java index 30061bc..2f1c304 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchDecorator.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchDecorator.java @@ -40,7 +40,7 @@ public class SpeciesBatchDecorator<R extends SpeciesAbleBatch> extends Decorator private static final long serialVersionUID = 1L; public static <R extends SpeciesAbleBatch> SpeciesBatchDecorator<R> newDecorator() { - return new SpeciesBatchDecorator<R>(); + return new SpeciesBatchDecorator<>(); } protected final TuttiDecoratorComparator[] originalComparators; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java index d43330c..db94139 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java @@ -23,7 +23,6 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.accidental; */ import fr.ifremer.tutti.type.WeightUnit; -import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchRowModel; import org.jdesktop.swingx.table.TableColumnModelExt; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; @@ -73,10 +72,10 @@ public class AccidentalBatchTableModel extends AbstractApplicationTableModel<Acc n("tutti.editAccidentalBatch.table.header.deadOrAlive"), n("tutti.editAccidentalBatch.table.header.deadOrAlive.tip")); - public static final ColumnIdentifier<AccidentalBatchRowModel> OTHER_CARACTERISTICS = ColumnIdentifier.newId( - IndividualObservationBatchRowModel.PROPERTY_CARACTERISTICS, - n("tutti.editAccidentalBatch.table.header.otherCaracteristics"), - n("tutti.editAccidentalBatch.table.header.otherCaracteristics.tip")); +// public static final ColumnIdentifier<AccidentalBatchRowModel> OTHER_CARACTERISTICS = ColumnIdentifier.newId( +// IndividualObservationBatchRowModel.PROPERTY_CARACTERISTICS, +// n("tutti.editAccidentalBatch.table.header.otherCaracteristics"), +// n("tutti.editAccidentalBatch.table.header.otherCaracteristics.tip")); public static final ColumnIdentifier<AccidentalBatchRowModel> COMMENT = ColumnIdentifier.newId( AccidentalBatchRowModel.PROPERTY_COMMENT, diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java index 0936688..379437b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java @@ -130,7 +130,7 @@ public class AccidentalBatchUIHandler // get all marine litter root List<AccidentalBatch> batches = - getPersistenceService().getAllAccidentalBatch(bean.getId()); + getPersistenceService().getAllAccidentalBatch(bean.getIdAsInt()); for (AccidentalBatch aBatch : batches) { AccidentalBatchRowModel entry = loadBatch(aBatch); @@ -175,8 +175,7 @@ public class AccidentalBatchUIHandler AccidentalBatch batch = row.toEntity(); NuitonValidatorResult validator = getValidationService().validateEditAccidentalBatch(batch); - boolean result = !validator.hasErrorMessagess(); - return result; + return !validator.hasErrorMessagess(); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/CancelEditCatchBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/CancelEditCatchBatchAction.java index 05df1bf..bbba031 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/CancelEditCatchBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/CancelEditCatchBatchAction.java @@ -46,12 +46,12 @@ public class CancelEditCatchBatchAction extends LongActionSupport<EditCatchesUIM private static final Log log = LogFactory.getLog(CancelEditCatchBatchAction.class); - /** - * A flag to update ui after create or save the edit catch batch. - * - * @since 1.0 - */ - protected boolean updateUI; +// /** +// * A flag to update ui after create or save the edit catch batch. +// * +// * @since 1.0 +// */ +// protected boolean updateUI; protected EditFishingOperationAction editAction; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/CleanBatchWeightsAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/CleanBatchWeightsAction.java index 9332e8b..1cccea8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/CleanBatchWeightsAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/CleanBatchWeightsAction.java @@ -69,7 +69,7 @@ public class CleanBatchWeightsAction extends LongActionSupport<EditCatchesUIMode // do a check FishingOperation fishingOperation = getModel().getFishingOperation(); - Multimap<String, String> errors = cleaningService.checkFishingOperation(fishingOperation.getId()); + Multimap<String, String> errors = cleaningService.checkFishingOperation(fishingOperation.getIdAsInt()); nbErrors = errors.size(); @@ -110,7 +110,7 @@ public class CleanBatchWeightsAction extends LongActionSupport<EditCatchesUIMode FishingOperation fishingOperation = getModel().getFishingOperation(); model.setLoadingData(true); - cleaningService.cleanFishingOperation(fishingOperation.getId()); + cleaningService.cleanFishingOperation(fishingOperation.getIdAsInt()); try { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ComputeBatchWeightsAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ComputeBatchWeightsAction.java index 12181e9..e474cb9 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ComputeBatchWeightsAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ComputeBatchWeightsAction.java @@ -102,7 +102,7 @@ public class ComputeBatchWeightsAction extends LongActionSupport<EditCatchesUIMo // do a check of double weights FishingOperation fishingOperation = getModel().getFishingOperation(); - Multimap<String, String> errors = cleaningService.checkFishingOperation(fishingOperation.getId()); + Multimap<String, String> errors = cleaningService.checkFishingOperation(fishingOperation.getIdAsInt()); if (errors.isEmpty()) { @@ -134,7 +134,7 @@ public class ComputeBatchWeightsAction extends LongActionSupport<EditCatchesUIMo WeightComputingService weightComputingService = getContext().getWeightComputingService(); EditCatchesUIModel model = getModel(); - String operationId = model.getFishingOperation().getId(); + Integer operationId = model.getFishingOperation().getIdAsInt(); // --------- // Compute species batches diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ExportFishingOperationForSumatraAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ExportFishingOperationForSumatraAction.java index 7bbcf32..96fe75b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ExportFishingOperationForSumatraAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ExportFishingOperationForSumatraAction.java @@ -139,8 +139,8 @@ public class ExportFishingOperationForSumatraAction extends LongActionSupport<Ed getContext().getCatchesSumatraExportService(); sumatraExportResult = service.exportFishingOperationForSumatra(file, - cruise.getId(), - fishingOperation.getId(), + cruise.getIdAsInt(), + fishingOperation.getIdAsInt(), pm); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ExportFishingOperationReportAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ExportFishingOperationReportAction.java index 947455a..0b5bbaa 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ExportFishingOperationReportAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ExportFishingOperationReportAction.java @@ -108,7 +108,7 @@ public class ExportFishingOperationReportAction extends LongActionSupport<EditCa // export catches CatchesPdfExportService service = getContext().getGeneratePDFService(); - service.generateFishingOperationPDFFile(file, fishingOperation.getId(), getConfig().getI18nLocale()); + service.generateFishingOperationPDFFile(file, fishingOperation.getIdAsInt(), getConfig().getI18nLocale()); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ExportMultiPostActionSupport.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ExportMultiPostActionSupport.java index e5e255e..41fed1b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ExportMultiPostActionSupport.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ExportMultiPostActionSupport.java @@ -78,8 +78,7 @@ public abstract class ExportMultiPostActionSupport<M extends AbstractBean, UI ex } protected EditCatchesUI getEditCatchUI() { - EditCatchesUI catchesUI = getUI().getParentContainer(EditCatchesUI.class); - return catchesUI; + return getUI().getParentContainer(EditCatchesUI.class); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ExportMultiPostCatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ExportMultiPostCatchAction.java index 4466881..ba880c6 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ExportMultiPostCatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ExportMultiPostCatchAction.java @@ -48,8 +48,7 @@ public class ExportMultiPostCatchAction extends ExportMultiPostActionSupport<Edi @Override protected EditCatchesUI getEditCatchUI() { - EditCatchesUI catchesUI = getUI(); - return catchesUI; + return getUI(); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ImportMultiPostActionSupport.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ImportMultiPostActionSupport.java index be62a80..2eb4683 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ImportMultiPostActionSupport.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ImportMultiPostActionSupport.java @@ -252,8 +252,7 @@ public abstract class ImportMultiPostActionSupport<M extends AbstractBean, UI ex } protected EditCatchesUI getEditCatchUI() { - EditCatchesUI catchesUI = getUI().getParentContainer(EditCatchesUI.class); - return catchesUI; + return getUI().getParentContainer(EditCatchesUI.class); } protected void addNotImportedWeightToReport(StringBuilder builder, Float weight, WeightUnit weightUnit, String label) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ImportMultiPostCatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ImportMultiPostCatchAction.java index a29354e..db8c80a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ImportMultiPostCatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/actions/ImportMultiPostCatchAction.java @@ -78,8 +78,7 @@ public class ImportMultiPostCatchAction extends ImportMultiPostActionSupport<Edi @Override protected Map<String, Object> importBatches(MultiPostImportService multiPostImportExportService, File file, FishingOperation operation) { - Map<String, Object> notImportedData = multiPostImportExportService.importCatchBatch(file, operation); - return notImportedData; + return multiPostImportExportService.importCatchBatch(file, operation); } @@ -114,7 +113,6 @@ public class ImportMultiPostCatchAction extends ImportMultiPostActionSupport<Edi @Override protected EditCatchesUI getEditCatchUI() { - EditCatchesUI catchesUI = getUI(); - return catchesUI; + return getUI(); } } \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java index d0276ae..52d0df9 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchRowModel.java @@ -33,7 +33,6 @@ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; -import fr.ifremer.tutti.persistence.entities.data.SpeciesAbleBatch; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.content.operation.catches.SampleCategoryAble; @@ -117,7 +116,7 @@ public class BenthosBatchRowModel extends AbstractTuttiBeanUIModel<BenthosBatch, * @since 0.2 */ protected ComputableData<Float> computedOrNotWeight = - new ComputableData<Float>(); + new ComputableData<>(); /** * Total computed number (from frequencies). @@ -125,7 +124,7 @@ public class BenthosBatchRowModel extends AbstractTuttiBeanUIModel<BenthosBatch, * @since 0.2 */ protected ComputableData<Integer> computedOrNotNumber = - new ComputableData<Integer>(); + new ComputableData<>(); /** * Attachments (should never be null). @@ -487,20 +486,17 @@ public class BenthosBatchRowModel extends AbstractTuttiBeanUIModel<BenthosBatch, @Override public SampleCategory<?> getSampleCategoryById(Integer sampleCategoryId) { Integer index = getCategoryIndex(sampleCategoryId); - SampleCategory<?> result = index == null ? null : categories[index]; - return result; + return index == null ? null : categories[index]; } public SampleCategory<?> getSampleCategoryByIndex(int sampleCategoryIndex) { - SampleCategory<?> result = categories[sampleCategoryIndex]; - return result; + return categories[sampleCategoryIndex]; } @Override public Serializable getSampleCategoryValue(Integer sampleCategoryId) { SampleCategory<?> sampleCategory = getSampleCategoryById(sampleCategoryId); - Serializable result = (Serializable) JavaBeanObjectUtil.getProperty(sampleCategory, SampleCategory.PROPERTY_CATEGORY_VALUE); - return result; + return (Serializable) JavaBeanObjectUtil.getProperty(sampleCategory, SampleCategory.PROPERTY_CATEGORY_VALUE); } @Override @@ -607,8 +603,7 @@ public class BenthosBatchRowModel extends AbstractTuttiBeanUIModel<BenthosBatch, public BenthosBatchRowModel getFirstAncestor(Integer sampleCategoryId) { SampleCategory<?> sampleCategory = getSampleCategoryById(sampleCategoryId); - BenthosBatchRowModel firstAncestor = getFirstAncestor(sampleCategory); - return firstAncestor; + return getFirstAncestor(sampleCategory); } public List<BenthosBatchRowModel> getChildBatch() { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java index 900caa7..545b927 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java @@ -69,7 +69,6 @@ import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; -import org.jdesktop.swingx.decorator.ComponentAdapter; import org.jdesktop.swingx.decorator.HighlightPredicate; import org.jdesktop.swingx.decorator.Highlighter; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; @@ -82,13 +81,9 @@ import org.nuiton.validator.NuitonValidatorResult; import javax.swing.JComponent; import javax.swing.RowFilter; import javax.swing.event.TableModelEvent; -import javax.swing.event.TableModelListener; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumnModel; import java.awt.Color; -import java.awt.Component; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.io.Serializable; import java.util.Collections; import java.util.EnumMap; @@ -172,7 +167,7 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent if (log.isDebugEnabled()) { log.debug("Get species batch for fishingOperation: " + - bean.getId()); + bean.getId()); } rows = Lists.newArrayList(); @@ -181,7 +176,7 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent // get all batch species root (says the one with only a species sample category) BatchContainer<BenthosBatch> rootBenthosBatch = getPersistenceService().getRootBenthosBatch( - bean.getId(), true); + bean.getIdAsInt(), true); List<BenthosBatch> catches = rootBenthosBatch.getChildren(); @@ -194,15 +189,15 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent Preconditions.checkState( firstCategoryId.equals(aBatch.getSampleCategoryId()), "Root species batch must be a sortedUnsorted sample " + - "category but was:" + aBatch.getSampleCategoryId()); + "category but was:" + aBatch.getSampleCategoryId()); BenthosBatchRowModel rootRow = loadBatch(aBatch, null, rows); if (log.isDebugEnabled()) { log.debug("Loaded root batch " + - decorate(rootRow.getSpecies(), DecoratorService.FROM_PROTOCOL) + " - " + - decorate(rootRow.getSampleCategoryById(firstCategoryId))); + decorate(rootRow.getSpecies(), DecoratorService.FROM_PROTOCOL) + " - " + + decorate(rootRow.getSampleCategoryById(firstCategoryId))); } } } @@ -242,9 +237,9 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent boolean result = !validator.hasErrorMessagess(); if (result - && ValidationService.VALIDATION_CONTEXT_VALIDATE.equals( + && ValidationService.VALIDATION_CONTEXT_VALIDATE.equals( getContext().getValidationContext()) - && row.isBatchLeaf()) { + && row.isBatchLeaf()) { List<BenthosBatchFrequency> frequencies = BenthosFrequencyRowModel.toEntity( row.getFrequency(), @@ -287,8 +282,8 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent if (log.isDebugEnabled()) { log.debug("Sample category " + sampleCategoryId + - " weight was modified, First ancestor row: " + - firstAncestorIndex + " will save it"); + " weight was modified, First ancestor row: " + + firstAncestorIndex + " will save it"); } saveRow(firstAncestorRow); @@ -385,13 +380,9 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent new HighlightPredicate.AndHighlightPredicate( new HighlightPredicate.NotHighlightPredicate(HighlightPredicate.IS_SELECTED), HighlightPredicate.EDITABLE, - new HighlightPredicate() { - - public boolean isHighlighted(Component renderer, ComponentAdapter adapter) { - BenthosBatchRowModel row = getTableModel().getEntry(adapter.convertRowIndexToModel(adapter.row)); - return row.isSpeciesToConfirm(); - } - + (renderer, adapter) -> { + BenthosBatchRowModel row = getTableModel().getEntry(adapter.convertRowIndexToModel(adapter.row)); + return row.isSpeciesToConfirm(); }), toConfirmColor); table.addHighlighter(confirmHighlighter); @@ -400,13 +391,9 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent new HighlightPredicate.AndHighlightPredicate( new HighlightPredicate.NotHighlightPredicate(HighlightPredicate.IS_SELECTED), HighlightPredicate.READ_ONLY, - new HighlightPredicate() { - - public boolean isHighlighted(Component renderer, ComponentAdapter adapter) { - BenthosBatchRowModel row = getTableModel().getEntry(adapter.convertRowIndexToModel(adapter.row)); - return row.isSpeciesToConfirm(); - } - + (renderer, adapter) -> { + BenthosBatchRowModel row = getTableModel().getEntry(adapter.convertRowIndexToModel(adapter.row)); + return row.isSpeciesToConfirm(); }), toConfirmColor.darker()); table.addHighlighter(confirmNotEditableHighlighter); } @@ -459,17 +446,17 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent Integer lastSamplingId = sampleCategoryModel.getLastCategoryId(); enableSplit = row.isBatchLeaf() - && selectedRowCount == 1 - && ObjectUtils.notEqual(lastSamplingId, row.getFinestCategory().getCategoryId()) - && row.getNumber() == null - && (row.getComputedNumber() == null - || row.getComputedNumber() == 0); + && selectedRowCount == 1 + && ObjectUtils.notEqual(lastSamplingId, row.getFinestCategory().getCategoryId()) + && row.getNumber() == null + && (row.getComputedNumber() == null + || row.getComputedNumber() == 0); } Integer sampleCategoryId = tableModel.getSampleCategoryId(columnIndex); boolean firstCategory = false; - SampleCategoryModelEntry category = null; + SampleCategoryModelEntry category; List<CaracteristicQualitativeValue> available = null; @@ -623,7 +610,7 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent sampleCategoryModel = getDataContext().getSampleCategoryModel(); - tableFilters = new EnumMap<TableViewMode, RowFilter<BenthosBatchTableModel, Integer>>(TableViewMode.class); + tableFilters = new EnumMap<>(TableViewMode.class); tableFilters.put(TableViewMode.ALL, new RowFilter<BenthosBatchTableModel, Integer>() { @@ -750,7 +737,7 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent Decorator<? extends Serializable> decorator = sampleCategoryDef.getCaracteristic().isNumericType() ? - numberDecorator : caracteristicDecorator; + numberDecorator : caracteristicDecorator; addSampleCategoryColumnToModel(columnModel, columnIdentifier, decorator, @@ -804,57 +791,45 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent initBatchTable(table, columnModel, tableModel); - getModel().addPropertyChangeListener(BenthosBatchUIModel.PROPERTY_TABLE_VIEW_MODE, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - TableViewMode tableViewMode = (TableViewMode) evt.getNewValue(); + getModel().addPropertyChangeListener(BenthosBatchUIModel.PROPERTY_TABLE_VIEW_MODE, evt -> { + TableViewMode tableViewMode = (TableViewMode) evt.getNewValue(); - if (tableViewMode == null) { - tableViewMode = TableViewMode.ALL; - } + if (tableViewMode == null) { + tableViewMode = TableViewMode.ALL; + } - if (log.isDebugEnabled()) { - log.debug("Will use rowfilter for viewMode: " + tableViewMode); - } - RowFilter<BenthosBatchTableModel, Integer> filter = tableFilters.get(tableViewMode); - getTable().setRowFilter(filter); + if (log.isDebugEnabled()) { + log.debug("Will use rowfilter for viewMode: " + tableViewMode); } + RowFilter<BenthosBatchTableModel, Integer> filter = tableFilters.get(tableViewMode); + getTable().setRowFilter(filter); }); // when species sort mode change, must reload the firshing operation // and applying the sort on model - getModel().addPropertyChangeListener(BenthosBatchUIModel.PROPERTY_SPECIES_SORT_MODE, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - SpeciesSortMode newValue = (SpeciesSortMode) evt.getNewValue(); - if (log.isInfoEnabled()) { - log.info("New species sort mode: " + newValue); - } - - // must reload fishing operation - selectFishingOperation(getModel().getFishingOperation()); + getModel().addPropertyChangeListener(BenthosBatchUIModel.PROPERTY_SPECIES_SORT_MODE, evt -> { + SpeciesSortMode newValue = (SpeciesSortMode) evt.getNewValue(); + if (log.isInfoEnabled()) { + log.info("New species sort mode: " + newValue); } + + // must reload fishing operation + selectFishingOperation(getModel().getFishingOperation()); }); // when species sort mode change, must reload the firshing operation // and applying the sort on model - getModel().addPropertyChangeListener(BenthosBatchUIModel.PROPERTY_SPECIES_DECORATOR_CONTEXT_INDEX, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - int newValue = (int) evt.getNewValue(); - if (log.isInfoEnabled()) { - log.info("New species decorator context index: " + newValue); - } + getModel().addPropertyChangeListener(BenthosBatchUIModel.PROPERTY_SPECIES_DECORATOR_CONTEXT_INDEX, evt -> { + int newValue = (int) evt.getNewValue(); + if (log.isInfoEnabled()) { + log.info("New species decorator context index: " + newValue); + } - // update the decorator context index - getSpeciesColumnDecorator().setContextIndex(newValue); + // update the decorator context index + getSpeciesColumnDecorator().setContextIndex(newValue); - // reload fishing operation - selectFishingOperation(getModel().getFishingOperation()); - } + // reload fishing operation + selectFishingOperation(getModel().getFishingOperation()); }); } @@ -873,27 +848,23 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent final TableColumnExt speciesColumn = table.getColumnExt(BenthosBatchTableModel.SPECIES); // when model change, then rebuild the species comparator + set model as modified - tableModel.addTableModelListener(new TableModelListener() { + tableModel.addTableModelListener(e -> { - @Override - public void tableChanged(TableModelEvent e) { - - BenthosBatchTableModel tableModel = - (BenthosBatchTableModel) e.getSource(); - int type = e.getType(); - if (type == TableModelEvent.DELETE || + BenthosBatchTableModel tableModel1 = + (BenthosBatchTableModel) e.getSource(); + int type = e.getType(); + if (type == TableModelEvent.DELETE || type == TableModelEvent.INSERT || e.getLastRow() == Integer.MAX_VALUE) { - // get column comparator - SpeciesBatchDecoratorComparator<BenthosBatchRowModel> comparator = getSpeciesRowComparator(); + // get column comparator + SpeciesBatchDecoratorComparator<BenthosBatchRowModel> comparator = getSpeciesRowComparator(); - // get column decorator - SpeciesBatchDecorator<BenthosBatchRowModel> decorator = getSpeciesColumnDecorator(); + // get column decorator + SpeciesBatchDecorator<BenthosBatchRowModel> decorator = getSpeciesColumnDecorator(); - // init comparator with model species list - comparator.init((SpeciesBatchDecorator) decorator, tableModel.getRows()); - } + // init comparator with model species list + comparator.init((SpeciesBatchDecorator) decorator, tableModel1.getRows()); } }); @@ -973,7 +944,7 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent addToSpeciesUsed(newRow); if (batchRootRowModel.getBatchCount() == null && - batchRootRowModel.getSelectedCategory() != null) { + batchRootRowModel.getSelectedCategory() != null) { // add first category splitBatch(batchRootRowModel.getSelectedCategory(), @@ -1004,7 +975,7 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent // Create rows in batch table model Float parentWeight = parentBatch.getFinestCategory().getNotNullWeight(); boolean subSample = parentWeight != null && totalRowWeight != null - && Weights.isGreaterWeight(parentWeight, totalRowWeight); + && Weights.isGreaterWeight(parentWeight, totalRowWeight); List<BenthosBatchRowModel> newBatches = Lists.newArrayList(); for (SplitBenthosBatchRowModel row : rows) { @@ -1082,7 +1053,7 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent Float parentWeight = parentBatch.getSampleCategoryByIndex(categoryIndex - 1).getNotNullWeight(); boolean subSample = parentWeight != null && totalRowWeight != null - && Weights.isGreaterWeight(parentWeight, totalRowWeight); + && Weights.isGreaterWeight(parentWeight, totalRowWeight); Set<BenthosBatchRowModel> shell = Sets.newHashSet(); parentBatch.collectShell(shell); @@ -1146,7 +1117,7 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent BenthosBatchRowModel parentRow, List<BenthosBatchRowModel> rows) { - String id = aBatch.getId(); + Integer id = aBatch.getIdAsInt(); List<BenthosBatchFrequency> frequencies = getPersistenceService().getAllBenthosBatchFrequency(id); @@ -1194,7 +1165,7 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent // create batch childs rows List<BenthosBatchRowModel> batchChilds = Lists. - newArrayListWithCapacity(aBatch.sizeChildBatchs()); + newArrayListWithCapacity(aBatch.sizeChildBatchs()); Float childrenWeights = 0f; for (BenthosBatch childBatch : aBatch.getChildBatchs()) { @@ -1212,7 +1183,7 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent Float rowWeight = newRow.getFinestCategory().getNotNullWeight(); boolean subSample = rowWeight != null && childrenWeights != null - && Weights.isSmallerWeight(childrenWeights, rowWeight); + && Weights.isSmallerWeight(childrenWeights, rowWeight); for (BenthosBatchRowModel childRow : batchChilds) { childRow.getFinestCategory().setSubSample(subSample); } @@ -1269,15 +1240,15 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent if (TuttiEntities.isNew(entityToSave)) { BenthosBatchRowModel batchParent = row.getParentBatch(); - String parentBatchId = null; + Integer parentBatchId = null; if (batchParent != null) { - parentBatchId = batchParent.getId(); + parentBatchId = batchParent.getIdAsInt(); } if (log.isDebugEnabled()) { log.debug("Persist new species batch with parentId: " + - parentBatchId); + parentBatchId); } entityToSave = getPersistenceService().createBenthosBatch(entityToSave, parentBatchId, true); @@ -1302,7 +1273,7 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent log.debug("Will save " + frequency.size() + " frequencies."); } frequency = getPersistenceService().saveBenthosBatchFrequency( - entityToSave.getId(), frequency); + entityToSave.getIdAsInt(), frequency); // push it back to row model frequencyRows = BenthosFrequencyRowModel.fromEntity(weightUnit, frequency); @@ -1412,8 +1383,8 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent Preconditions.checkNotNull(firstSampleCategory); if (log.isDebugEnabled()) { log.debug("Add to speciesUsed: " + - decorate(categoryValue) + - " - " + decorate(row.getSpecies())); + decorate(categoryValue) + + " - " + decorate(row.getSpecies())); } BenthosBatchUIModel model = getModel(); model.getSpeciesUsed().put(categoryValue, row.getSpecies()); @@ -1480,8 +1451,6 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent protected SpeciesBatchDecorator<BenthosBatchRowModel> getSpeciesColumnDecorator() { TableColumnExt speciesColumn = getTable().getColumnExt(BenthosBatchTableModel.SPECIES); - SpeciesBatchDecorator<BenthosBatchRowModel> decorator = - (SpeciesBatchDecorator<BenthosBatchRowModel>) SpeciesAbleBatchRowHelper.getSpeciesColumnDecorator(speciesColumn); - return decorator; + return (SpeciesBatchDecorator<BenthosBatchRowModel>) SpeciesAbleBatchRowHelper.getSpeciesColumnDecorator(speciesColumn); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/CreateBenthosMelagAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/CreateBenthosMelagAction.java index 0a725da..b72e6d9 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/CreateBenthosMelagAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/CreateBenthosMelagAction.java @@ -179,11 +179,11 @@ public class CreateBenthosMelagAction extends LongActionSupport<BenthosBatchUIMo } - protected Float openMelagWeightDialog() { - EnterMelagWeightUI dialog = new EnterMelagWeightUI(getContext()); - Float result = dialog.openAndGetWeightValue(weightUnit); - return result; - } +// protected Float openMelagWeightDialog() { +// EnterMelagWeightUI dialog = new EnterMelagWeightUI(getContext()); +// Float result = dialog.openAndGetWeightValue(weightUnit); +// return result; +// } @Override public void doAction() throws Exception { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/ImportMultiPostBenthosAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/ImportMultiPostBenthosAction.java index b2accd8..19ff54f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/ImportMultiPostBenthosAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/ImportMultiPostBenthosAction.java @@ -77,8 +77,7 @@ public class ImportMultiPostBenthosAction extends ImportMultiPostActionSupport<B @Override protected Map<String, Object> importBatches(MultiPostImportService multiPostImportExportService, File file, FishingOperation operation) { - Map<String, Object> notImportedData = multiPostImportExportService.importBenthos(file, operation); - return notImportedData; + return multiPostImportExportService.importBenthos(file, operation); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenEditBenthosBatchFrequencyUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenEditBenthosBatchFrequencyUIAction.java index d5acb9d..3db5b9c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenEditBenthosBatchFrequencyUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/OpenEditBenthosBatchFrequencyUIAction.java @@ -30,8 +30,6 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.Ben import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.JTables; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.TableColumnModelExt; @@ -43,9 +41,6 @@ import org.jdesktop.swingx.table.TableColumnModelExt; */ public class OpenEditBenthosBatchFrequencyUIAction extends SimpleActionSupport<BenthosBatchUI> { - /** Logger. */ - private static final Log log = LogFactory.getLog(OpenEditBenthosBatchFrequencyUIAction.class); - private static final long serialVersionUID = -6540241422935319461L; public OpenEditBenthosBatchFrequencyUIAction(BenthosBatchUI ui) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RemoveBenthosBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RemoveBenthosBatchAction.java index edcdd25..84891fc 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RemoveBenthosBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RemoveBenthosBatchAction.java @@ -113,7 +113,7 @@ public class RemoveBenthosBatchAction extends LongActionSupport<BenthosBatchUIMo rowToRemove = Sets.newHashSet(); - Set<String> removedBatchId = new LinkedHashSet<>(); + Set<Integer> removedBatchId = new LinkedHashSet<>(); for (int rowIndex : selectedRowIndexes) { @@ -122,13 +122,13 @@ public class RemoveBenthosBatchAction extends LongActionSupport<BenthosBatchUIMo Preconditions.checkState(!TuttiEntities.isNew(selectedBatch), "Can't remove batch if batch is not persisted"); - String selectedBatchId = selectedBatch.getId(); + Integer selectedBatchId = selectedBatch.getIdAsInt(); boolean batchRoot = selectedBatch.isBatchRoot(); // remove selected batch and all his children // remove parent batch (will destroy all his childs from db) - if (!batchRoot && removedBatchId.contains(selectedBatch.getParentBatch().getId())) { + if (!batchRoot && removedBatchId.contains(selectedBatch.getParentBatch().getIdAsInt())) { // This batch was already removed if (log.isInfoEnabled()) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RemoveBenthosSubBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RemoveBenthosSubBatchAction.java index 086fe45..dc599d9 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RemoveBenthosSubBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RemoveBenthosSubBatchAction.java @@ -109,7 +109,7 @@ public class RemoveBenthosSubBatchAction extends LongActionSupport<BenthosBatchU "Can't remove sub batch if batch is not persisted"); // save parent batch (will destroy all his childs from db) - persistenceService.deleteSpeciesSubBatch(parentBatch.getId()); + persistenceService.deleteSpeciesSubBatch(parentBatch.getIdAsInt()); // collect of rows to remove from model rowToRemove = Sets.newHashSet(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RenameBenthosBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RenameBenthosBatchAction.java index 76daf42..2e55d0b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RenameBenthosBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/actions/RenameBenthosBatchAction.java @@ -125,7 +125,7 @@ public class RenameBenthosBatchAction extends LongActionSupport<BenthosBatchUIMo BenthosBatchRowModel row = tableModel.getEntry(selectedRowIndex); PersistenceService persistenceService = getContext().getPersistenceService(); - persistenceService.changeBenthosBatchSpecies(row.getId(), selectedSpecies); + persistenceService.changeBenthosBatchSpecies(row.getIdAsInt(), selectedSpecies); SampleCategory<?> firstSampleCategory = row.getFirstSampleCategory(); Serializable categoryValue = firstSampleCategory.getCategoryValue(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel.java index 5bfe7fb..0c6a2e8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel.java @@ -318,15 +318,13 @@ public class CreateBenthosBatchUIModel extends AbstractTuttiTableUIModel<CreateB } public boolean isSpeciesAndCategoryAvailable() { - boolean result = species != null && sampleCategory != null && + return species != null && sampleCategory != null && isSpeciesAndCategoryAvailable(species, sampleCategory); - return result; } public boolean isSpeciesAndCategoryAvailable(Species species, CaracteristicQualitativeValue value) { - boolean result = !speciesUsed.containsEntry(value, species); - return result; + return !speciesUsed.containsEntry(value, species); } public boolean isCategoryIsFilled() { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchAndFrequenciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchAndFrequenciesAction.java index b695692..12d8472 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchAndFrequenciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/actions/CreateBenthosBatchAndFrequenciesAction.java @@ -28,7 +28,6 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.create.CreateBenthosBatchUI; -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java index 103db4c..6ce1de7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java @@ -276,7 +276,6 @@ public class BenthosFrequencyCellComponent extends DefaultTableCellRenderer { } else { // keep next cell to edit - int r = rowIndex; int nextR = nextEditableRowIndex; int c = columnIndex; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyLogsTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyLogsTableModel.java index 3f32637..c13b071 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyLogsTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyLogsTableModel.java @@ -51,8 +51,7 @@ public class BenthosFrequencyLogsTableModel extends AbstractApplicationTableMode @Override public BenthosFrequencyLogRowModel createNewRow() { - BenthosFrequencyLogRowModel result = new BenthosFrequencyLogRowModel(); - return result; + return new BenthosFrequencyLogRowModel(); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyRowModel.java index 93bf46f..0ab08a0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyRowModel.java @@ -221,8 +221,7 @@ public class BenthosFrequencyRowModel extends AbstractTuttiBeanUIModel<BenthosBa @Override public int compareTo(BenthosFrequencyRowModel o) { - int result = ordering.compare(lengthStep, o.lengthStep); - return result; + return ordering.compare(lengthStep, o.lengthStep); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java index 4f1fe60..a682730 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java @@ -28,7 +28,6 @@ import org.jfree.data.xy.XYSeries; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; -import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; @@ -150,9 +149,7 @@ public class BenthosFrequencyTableModel extends AbstractApplicationTableModel<Be if (oldRows != null) { - for (BenthosFrequencyRowModel row : oldRows) { - dettachListeners(row); - } + oldRows.forEach(this::dettachListeners); } @@ -204,45 +201,42 @@ public class BenthosFrequencyTableModel extends AbstractApplicationTableModel<Be private PropertyChangeListener getOnLengthStepChangedListener() { if (onLengthStepChangedListener == null) { - onLengthStepChangedListener = new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - - Float oldValue = (Float) evt.getOldValue(); - if (oldValue != null) { + onLengthStepChangedListener = evt -> { - modelCache.removeLengthStep(oldValue); - if (series.indexOf(oldValue) >= 0) { - series.remove(oldValue); - } + Float oldValue = (Float) evt.getOldValue(); + if (oldValue != null) { + modelCache.removeLengthStep(oldValue); + if (series.indexOf(oldValue) >= 0) { + series.remove(oldValue); } - BenthosFrequencyRowModel row = (BenthosFrequencyRowModel) evt.getSource(); + } - Float newValue = (Float) evt.getNewValue(); - if (newValue != null) { + BenthosFrequencyRowModel row = (BenthosFrequencyRowModel) evt.getSource(); - modelCache.addLengthStep(row); + Float newValue = (Float) evt.getNewValue(); + if (newValue != null) { - if (row.getNumber() != null) { + modelCache.addLengthStep(row); - series.addOrUpdate(newValue, row.getNumber()); + if (row.getNumber() != null) { - } + series.addOrUpdate(newValue, row.getNumber()); } - uiModel.recomputeCanEditLengthStep(); - uiModel.recomputeRowsValidateState(); - uiModel.updateEmptyRow(row); + } + + uiModel.recomputeCanEditLengthStep(); + uiModel.recomputeRowsValidateState(); + uiModel.updateEmptyRow(row); - // Can recompute total number and weight only after valid flag change - uiModel.recomputeTotalNumberAndWeight(); + // Can recompute total number and weight only after valid flag change + uiModel.recomputeTotalNumberAndWeight(); - fireTableDataChanged(); + fireTableDataChanged(); - } }; } return onLengthStepChangedListener; @@ -250,41 +244,38 @@ public class BenthosFrequencyTableModel extends AbstractApplicationTableModel<Be private PropertyChangeListener getOnNumberChangedListener() { if (onNumberChangedListener == null) { - onNumberChangedListener = new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { + onNumberChangedListener = evt -> { - BenthosFrequencyRowModel row = (BenthosFrequencyRowModel) evt.getSource(); + BenthosFrequencyRowModel row = (BenthosFrequencyRowModel) evt.getSource(); - Integer newValue = (Integer) evt.getNewValue(); + Integer newValue = (Integer) evt.getNewValue(); - Float lengthStep = row.getLengthStep(); + Float lengthStep = row.getLengthStep(); - if (lengthStep != null) { + if (lengthStep != null) { - if (newValue == null) { + if (newValue == null) { - // remove the value for the lengthStep - if (series.indexOf(lengthStep) >= 0) { - series.remove(lengthStep); - } - - } else { + // remove the value for the lengthStep + if (series.indexOf(lengthStep) >= 0) { + series.remove(lengthStep); + } - series.addOrUpdate(lengthStep, row.getNumber()); + } else { - } + series.addOrUpdate(lengthStep, row.getNumber()); } - uiModel.recomputeCanEditLengthStep(); - uiModel.recomputeRowValidState(row); - uiModel.updateEmptyRow(row); + } - // Can recompute total number and weight only after valid flag change - uiModel.recomputeTotalNumberAndWeight(); + uiModel.recomputeCanEditLengthStep(); + uiModel.recomputeRowValidState(row); + uiModel.updateEmptyRow(row); + + // Can recompute total number and weight only after valid flag change + uiModel.recomputeTotalNumberAndWeight(); - } }; } return onNumberChangedListener; @@ -292,20 +283,17 @@ public class BenthosFrequencyTableModel extends AbstractApplicationTableModel<Be private PropertyChangeListener getOnWeightChangedListener() { if (onWeightChangedListener == null) { - onWeightChangedListener = new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { + onWeightChangedListener = evt -> { - BenthosFrequencyRowModel row = (BenthosFrequencyRowModel) evt.getSource(); - modelCache.updateRowWithWeight(row); + BenthosFrequencyRowModel row = (BenthosFrequencyRowModel) evt.getSource(); + modelCache.updateRowWithWeight(row); - uiModel.recomputeRowsValidateState(); - uiModel.updateEmptyRow(row); + uiModel.recomputeRowsValidateState(); + uiModel.updateEmptyRow(row); - // Can recompute total number and weight only after valid flag change - uiModel.recomputeTotalNumberAndWeight(); + // Can recompute total number and weight only after valid flag change + uiModel.recomputeTotalNumberAndWeight(); - } }; } return onWeightChangedListener; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java index 7e540e7..5060900 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java @@ -64,8 +64,6 @@ import javax.swing.SwingUtilities; import java.awt.BorderLayout; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -124,8 +122,7 @@ public class BenthosFrequencyUIHandler extends AbstractTuttiTableUIHandler<Benth public boolean isRowValid(BenthosFrequencyRowModel row) { BenthosFrequencyUIModel model = getModel(); - boolean valid = model.isRowValid(row); - return valid; + return model.isRowValid(row); } @@ -239,71 +236,58 @@ public class BenthosFrequencyUIHandler extends AbstractTuttiTableUIHandler<Benth }); // when lengthStepCaracteristic changed, let's updates all row with the new value - model.addPropertyChangeListener(BenthosFrequencyUIModel.PROPERTY_LENGTH_STEP_CARACTERISTIC, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - Caracteristic newValue = (Caracteristic) evt.getNewValue(); - // get step from the pmfm - float step = getStep(newValue); - getModel().setStep(step); - getModel().setDataSetIntervalWidth(step); - chart.getXYPlot().getDomainAxis().setStandardTickUnits(new TuttiNumberTickUnitSource(step == 1f)); - if (CollectionUtils.isNotEmpty(getModel().getRows())) { - for (BenthosFrequencyRowModel rowModel : getModel().getRows()) { - rowModel.setLengthStepCaracteristic(newValue); - recomputeRowValidState(rowModel); - } + model.addPropertyChangeListener(BenthosFrequencyUIModel.PROPERTY_LENGTH_STEP_CARACTERISTIC, evt -> { + Caracteristic newValue = (Caracteristic) evt.getNewValue(); + // get step from the pmfm + float step1 = getStep(newValue); + getModel().setStep(step1); + getModel().setDataSetIntervalWidth(step1); + chart.getXYPlot().getDomainAxis().setStandardTickUnits(new TuttiNumberTickUnitSource(step1 == 1f)); + if (CollectionUtils.isNotEmpty(getModel().getRows())) { + for (BenthosFrequencyRowModel rowModel : getModel().getRows()) { + rowModel.setLengthStepCaracteristic(newValue); + recomputeRowValidState(rowModel); } - BenthosFrequencyUIHandler.this.ui.getValidator().doValidate(); } + BenthosFrequencyUIHandler.this.ui.getValidator().doValidate(); }); // when lengthStepCaracteristicUnit changed, let's updates the label of some fields - model.addPropertyChangeListener(BenthosFrequencyUIModel.PROPERTY_LENGTH_STEP_CARACTERISTIC_UNIT, new PropertyChangeListener() { + model.addPropertyChangeListener(BenthosFrequencyUIModel.PROPERTY_LENGTH_STEP_CARACTERISTIC_UNIT, evt -> { - @Override - public void propertyChange(PropertyChangeEvent evt) { + String unit = (String) evt.getNewValue(); - String unit = (String) evt.getNewValue(); + if (unit == null) { - if (unit == null) { - - unit = t("tutti.editBenthosFrequencies.unkownStepUnit"); - } + unit = t("tutti.editBenthosFrequencies.unkownStepUnit"); + } - getUI().getMinStepLabel().setText(getLabelWithUnit(t("tutti.editBenthosFrequencies.field.minStep"), unit)); - getUI().getMinStepLabel().setToolTipText(getLabelWithUnit(t("tutti.editBenthosFrequencies.field.minStep.tip"), unit)); + getUI().getMinStepLabel().setText(getLabelWithUnit(t("tutti.editBenthosFrequencies.field.minStep"), unit)); + getUI().getMinStepLabel().setToolTipText(getLabelWithUnit(t("tutti.editBenthosFrequencies.field.minStep.tip"), unit)); - getUI().getMaxStepLabel().setText(getLabelWithUnit(t("tutti.editBenthosFrequencies.field.maxStep"), unit)); - getUI().getMaxStepLabel().setToolTipText(getLabelWithUnit(t("tutti.editBenthosFrequencies.field.maxStep.tip"), unit)); + getUI().getMaxStepLabel().setText(getLabelWithUnit(t("tutti.editBenthosFrequencies.field.maxStep"), unit)); + getUI().getMaxStepLabel().setToolTipText(getLabelWithUnit(t("tutti.editBenthosFrequencies.field.maxStep.tip"), unit)); - getUI().getRafaleStepLabel().setText(getLabelWithUnit(t("tutti.editBenthosFrequencies.field.rafaleStep"), unit)); - getUI().getRafaleStepLabel().setToolTipText(getLabelWithUnit(t("tutti.editBenthosFrequencies.field.rafaleStep.tip"), unit)); + getUI().getRafaleStepLabel().setText(getLabelWithUnit(t("tutti.editBenthosFrequencies.field.rafaleStep"), unit)); + getUI().getRafaleStepLabel().setToolTipText(getLabelWithUnit(t("tutti.editBenthosFrequencies.field.rafaleStep.tip"), unit)); - TableColumnExt column = (TableColumnExt) getUI().getTable().getColumn(BenthosFrequencyTableModel.LENGTH_STEP); - column.setHeaderValue(getLabelWithUnit(t("tutti.editSpeciesFrequencies.table.header.lengthStep"), unit)); - column.setToolTipText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.table.header.lengthStep"), unit)); - } + TableColumnExt column = (TableColumnExt) getUI().getTable().getColumn(BenthosFrequencyTableModel.LENGTH_STEP); + column.setHeaderValue(getLabelWithUnit(t("tutti.editSpeciesFrequencies.table.header.lengthStep"), unit)); + column.setToolTipText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.table.header.lengthStep"), unit)); }); // when configuration mode change, let's focus the best component (see http://forge.codelutin.com/issues/4035) - model.addPropertyChangeListener(BenthosFrequencyUIModel.PROPERTY_CONFIGURATION_MODE, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - final FrequencyConfigurationMode newValue = (FrequencyConfigurationMode) evt.getNewValue(); - SwingUtilities.invokeLater( - new Runnable() { - @Override - public void run() { - JComponent componentToFocus = getComponentToFocus(newValue); - if (componentToFocus != null) { - componentToFocus.grabFocus(); - } - updateLogVisibility(); - } + model.addPropertyChangeListener(BenthosFrequencyUIModel.PROPERTY_CONFIGURATION_MODE, evt -> { + final FrequencyConfigurationMode newValue = (FrequencyConfigurationMode) evt.getNewValue(); + SwingUtilities.invokeLater( + () -> { + JComponent componentToFocus = getComponentToFocus(newValue); + if (componentToFocus != null) { + componentToFocus.grabFocus(); } - ); - } + updateLogVisibility(); + } + ); }); // set the pattern to the weight in simple counting mode according to the weight unit @@ -393,7 +377,7 @@ public class BenthosFrequencyUIHandler extends AbstractTuttiTableUIHandler<Benth // create log table model BenthosFrequencyLogsTableModel logTableModel = new BenthosFrequencyLogsTableModel(logColumnModel); - logTableModel.setRows(new ArrayList<BenthosFrequencyLogRowModel>()); + logTableModel.setRows(new ArrayList<>()); logTable.setModel(logTableModel); logTable.setColumnModel(logColumnModel); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java index a88c332..7ec0837 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java @@ -150,7 +150,7 @@ public class BenthosFrequencyUIModel extends AbstractTuttiTableUIModel<BenthosBa * * @since 3.8 */ - protected ComputableData<Float> totalComputedOrNotWeight = new ComputableData<Float>(); + protected ComputableData<Float> totalComputedOrNotWeight = new ComputableData<>(); /** * The index of the next editable row (null if none). @@ -404,8 +404,7 @@ public class BenthosFrequencyUIModel extends AbstractTuttiTableUIModel<BenthosBa int intValue = (int) (lengthStep * 10); int intStep = (int) (step * 10); int correctIntStep = intValue - (intValue % intStep); - float result = correctIntStep / 10f; - return result; + return correctIntStep / 10f; } public Integer getTotalNumber() { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModelCache.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModelCache.java index 3359f5a..5be5e84 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModelCache.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModelCache.java @@ -59,9 +59,9 @@ public class BenthosFrequencyUIModelCache implements Serializable { * * @since 3.10 */ - protected final Map<Integer, MutableInt> nbOfRowsByLengthStep = new TreeMap<Integer, MutableInt>(); + protected final Map<Integer, MutableInt> nbOfRowsByLengthStep = new TreeMap<>(); - private final Map<Float, BenthosFrequencyRowModel> rowCache = new TreeMap<Float, BenthosFrequencyRowModel>(); + private final Map<Float, BenthosFrequencyRowModel> rowCache = new TreeMap<>(); public void loadCache(List<BenthosFrequencyRowModel> rows) { @@ -98,8 +98,7 @@ public class BenthosFrequencyUIModelCache implements Serializable { public int numberOfRows(float lengthStep) { MutableInt mutableInt = getNbRowsByLengthStep(lengthStep); - int result = mutableInt.intValue(); - return result; + return mutableInt.intValue(); } public void incNumberOfRows(float lengthStep) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/AddBenthosFrequencyLengthStepCaracteristicAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/AddBenthosFrequencyLengthStepCaracteristicAction.java index 663ccc2..35ec3a5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/AddBenthosFrequencyLengthStepCaracteristicAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/AddBenthosFrequencyLengthStepCaracteristicAction.java @@ -69,7 +69,7 @@ public class AddBenthosFrequencyLengthStepCaracteristicAction extends AbstractAc // open a dialog to select it - BeanFilterableComboBox<Caracteristic> editor = new BeanFilterableComboBox<Caracteristic>(); + BeanFilterableComboBox<Caracteristic> editor = new BeanFilterableComboBox<>(); editor.setBeanType(Caracteristic.class); editor.setShowReset(true); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchRowModel.java index 3d4fee8..4da9ab1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchRowModel.java @@ -84,9 +84,9 @@ public class SplitBenthosBatchRowModel super(fromBeanBinder, toBeanBinder); } - public SampleCategoryModelEntry getCategorytype() { - return category.getCategoryDef(); - } +// public SampleCategoryModelEntry getCategorytype() { +// return category.getCategoryDef(); +// } public void setCategoryType(SampleCategoryModelEntry categoryType) { category.setCategoryDef(categoryType); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java index 0f958b7..9b5d481 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java @@ -22,7 +22,6 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.split; * #L% */ -import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -347,12 +346,7 @@ public class SplitBenthosBatchUIHandler extends AbstractTuttiTableUIHandler<Spli model.setBatch(batch); // add existing rows - Map<Serializable, SplitBenthosBatchRowModel> rowsByValue = Maps.uniqueIndex(model.getRows(), new Function<SplitBenthosBatchRowModel, Serializable>() { - @Override - public Serializable apply(SplitBenthosBatchRowModel input) { - return input.getCategoryValue(); - } - }); + Map<Serializable, SplitBenthosBatchRowModel> rowsByValue = Maps.uniqueIndex(model.getRows(), SplitBenthosBatchRowModel::getCategoryValue); for (BenthosBatchRowModel row : rows) { SampleCategory<?> sampleCategory = row.getSampleCategoryById(sampleCategoryId); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java index 777ad42..d36287e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java @@ -145,7 +145,7 @@ public class IndividualObservationBatchUIHandler if (!TuttiEntities.isNew(bean)) { PersistenceService persistenceService = getPersistenceService(); List<IndividualObservationBatch> batches = - persistenceService.getAllIndividualObservationBatch(bean.getId()); + persistenceService.getAllIndividualObservationBatchsForFishingOperation(bean.getIdAsInt()); for (IndividualObservationBatch aBatch : batches) { @@ -195,8 +195,7 @@ public class IndividualObservationBatchUIHandler protected boolean isRowValid(IndividualObservationBatchRowModel row) { IndividualObservationBatch batch = row.toEntity(); NuitonValidatorResult validator = getValidationService().validateEditIndividualObservationBatch(batch); - boolean result = !validator.hasErrorMessagess(); - return result; + return !validator.hasErrorMessagess(); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java index 22ca4c6..bac444e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java @@ -33,6 +33,7 @@ import org.apache.commons.collections4.CollectionUtils; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; import static org.nuiton.i18n.I18n.n; @@ -96,9 +97,7 @@ public class IndividualObservationBatchUIModel extends AbstractTuttiBatchUIModel public Set<Species> getSpeciesUsed() { Set<Species> result = Sets.newHashSet(); - for (IndividualObservationBatchRowModel row : getRows()) { - result.add(row.getSpecies()); - } + result.addAll(getRows().stream().map(IndividualObservationBatchRowModel::getSpecies).collect(Collectors.toList())); return result; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/OpenCreateIndividualObservationBatchUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/OpenCreateIndividualObservationBatchUIAction.java index 94ed130..abc5d98 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/OpenCreateIndividualObservationBatchUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/OpenCreateIndividualObservationBatchUIAction.java @@ -29,8 +29,6 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.create.CreateIndividualObservationBatchUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * Created on 3/7/15. @@ -40,9 +38,6 @@ import org.apache.commons.logging.LogFactory; */ public class OpenCreateIndividualObservationBatchUIAction extends SimpleActionSupport<IndividualObservationBatchUI> { - /** Logger. */ - private static final Log log = LogFactory.getLog(OpenCreateIndividualObservationBatchUIAction.class); - private static final long serialVersionUID = 1L; public OpenCreateIndividualObservationBatchUIAction(IndividualObservationBatchUI ui) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/RemoveAllIndividualObservationBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/RemoveAllIndividualObservationBatchAction.java index 362ac97..1c46006 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/RemoveAllIndividualObservationBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/RemoveAllIndividualObservationBatchAction.java @@ -124,7 +124,7 @@ public class RemoveAllIndividualObservationBatchAction // remove it from db - String id = selectedBatch.getId(); + Integer id = selectedBatch.getIdAsInt(); if (log.isInfoEnabled()) { log.info("Remove individual observation with id: " + id); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/RemoveIndividualObservationBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/RemoveIndividualObservationBatchAction.java index 5ede469..5a76be2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/RemoveIndividualObservationBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/actions/RemoveIndividualObservationBatchAction.java @@ -90,7 +90,7 @@ public class RemoveIndividualObservationBatchAction // remove it from db - String id = selectedBatch.getId(); + Integer id = selectedBatch.getIdAsInt(); if (log.isInfoEnabled()) { log.info("Remove individual observation with id: " + id); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java index 1716cc8..7a60a45 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java @@ -58,8 +58,6 @@ import java.awt.GridBagConstraints; import java.awt.Insets; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.util.List; import java.util.Map; import java.util.Set; @@ -121,17 +119,14 @@ public class CreateIndividualObservationBatchUIHandler extends AbstractTuttiUIHa final TaxonCache taxonCache = TaxonCaches.createSpeciesCacheWithoutVernacularCode(getPersistenceService(), getDataContext().getProtocol()); getModel().addPropertyChangeListener(IndividualObservationBatch.PROPERTY_SPECIES, - new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - Species species = (Species) evt.getNewValue(); - if (species != null) { - - String lengthStepPmfmId = taxonCache.getLengthStepPmfmId(species); - if (lengthStepPmfmId != null) { - Caracteristic lengthStepCaracteristic = lengthStepCaracteristicMap.get(lengthStepPmfmId); - getModel().setLengthStepCaracteristic(lengthStepCaracteristic); - } + evt -> { + Species species = (Species) evt.getNewValue(); + if (species != null) { + + String lengthStepPmfmId = taxonCache.getLengthStepPmfmId(species); + if (lengthStepPmfmId != null) { + Caracteristic lengthStepCaracteristic = lengthStepCaracteristicMap.get(lengthStepPmfmId); + getModel().setLengthStepCaracteristic(lengthStepCaracteristic); } } }); @@ -171,12 +166,7 @@ public class CreateIndividualObservationBatchUIHandler extends AbstractTuttiUIHa numberEditor.setNumberType(Float.class); numberEditor.setNumberPattern(TuttiUI.DECIMAL3_PATTERN); - editorModel.addPropertyChangeListener(CreateIndividualObservationBatchUIModel.CaracteristicMapPropertyEditor.PROPERTY_PROPERTY, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - numberEditor.setNumberValue((Number) evt.getNewValue()); - } - }); + editorModel.addPropertyChangeListener(CreateIndividualObservationBatchUIModel.CaracteristicMapPropertyEditor.PROPERTY_PROPERTY, evt -> numberEditor.setNumberValue((Number) evt.getNewValue())); editor = numberEditor; ui.get$objectMap().put(name, editor); @@ -187,7 +177,7 @@ public class CreateIndividualObservationBatchUIHandler extends AbstractTuttiUIHa case QUALITATIVE: { - final BeanFilterableComboBox<CaracteristicQualitativeValue> qualitativeValuesEditor = new BeanFilterableComboBox<CaracteristicQualitativeValue>(ui); + final BeanFilterableComboBox<CaracteristicQualitativeValue> qualitativeValuesEditor = new BeanFilterableComboBox<>(ui); String name = caracteristic.getId() + "CaracteristicComboBox"; qualitativeValuesEditor.setName(name); @@ -198,12 +188,7 @@ public class CreateIndividualObservationBatchUIHandler extends AbstractTuttiUIHa qualitativeValuesEditor.setBean(editorModel); - editorModel.addPropertyChangeListener(CreateIndividualObservationBatchUIModel.CaracteristicMapPropertyEditor.PROPERTY_PROPERTY, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - qualitativeValuesEditor.setSelectedItem(evt.getNewValue()); - } - }); + editorModel.addPropertyChangeListener(CreateIndividualObservationBatchUIModel.CaracteristicMapPropertyEditor.PROPERTY_PROPERTY, evt -> qualitativeValuesEditor.setSelectedItem(evt.getNewValue())); editor = qualitativeValuesEditor; ui.get$objectMap().put(name, editor); @@ -217,12 +202,7 @@ public class CreateIndividualObservationBatchUIHandler extends AbstractTuttiUIHa case TEXT: final JTextField textField = new JTextField(); String name = caracteristic.getId() + "TextField"; - editorModel.addPropertyChangeListener(CreateIndividualObservationBatchUIModel.CaracteristicMapPropertyEditor.PROPERTY_PROPERTY, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - textField.setText((String) evt.getNewValue()); - } - }); + editorModel.addPropertyChangeListener(CreateIndividualObservationBatchUIModel.CaracteristicMapPropertyEditor.PROPERTY_PROPERTY, evt -> textField.setText((String) evt.getNewValue())); textField.addKeyListener(new KeyAdapter() { @Override @@ -252,64 +232,58 @@ public class CreateIndividualObservationBatchUIHandler extends AbstractTuttiUIHa } getModel().addPropertyChangeListener(IndividualObservationBatch.PROPERTY_SPECIES, - new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { + evt -> { - CreateIndividualObservationBatchUIModel source = (CreateIndividualObservationBatchUIModel) evt.getSource(); + CreateIndividualObservationBatchUIModel source = (CreateIndividualObservationBatchUIModel) evt.getSource(); - Species species = (Species) evt.getNewValue(); + Species species = (Species) evt.getNewValue(); - source.setValueIsAdjusting(true); + source.setValueIsAdjusting(true); - try { - if (species == null || - !source.isSpeciesFromBatch()) { + try { + if (species == null || + !source.isSpeciesFromBatch()) { - // reset create from batch flag - source.setCreateFromBatch(false); - } + // reset create from batch flag + source.setCreateFromBatch(false); + } - // compute editors enable property - boolean enabled = species != null && - (!source.isCreateFromBatch() || - !source.isSpeciesFromBatch()); + // compute editors enable property + boolean enabled = species != null && + (!source.isCreateFromBatch() || + !source.isSpeciesFromBatch()); // boolean enabled = species != null && // (!source.isCreateFromBatch() || // !source.isSpeciesFromBatch() || // source.isSpeciesFromBatchWithOneCount()); - if (log.isInfoEnabled()) { - log.info("can edit? " + enabled + " (species changed: " + species + ")"); - } - for (JComponent editorComponent : editorComponents) { - editorComponent.setEnabled(enabled); - } - } finally { - source.setValueIsAdjusting(false); + if (log.isInfoEnabled()) { + log.info("can edit? " + enabled + " (species changed: " + species + ")"); + } + for (JComponent editorComponent : editorComponents) { + editorComponent.setEnabled(enabled); } + } finally { + source.setValueIsAdjusting(false); } }); getModel().addPropertyChangeListener(CreateIndividualObservationBatchUIModel.PROPERTY_CREATE_FROM_BATCH, - new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { + evt -> { - CreateIndividualObservationBatchUIModel source = (CreateIndividualObservationBatchUIModel) evt.getSource(); - Boolean newValue = (Boolean) evt.getNewValue(); - newValue = newValue != null && newValue; + CreateIndividualObservationBatchUIModel source = (CreateIndividualObservationBatchUIModel) evt.getSource(); + Boolean newValue = (Boolean) evt.getNewValue(); + newValue = newValue != null && newValue; - // compute editors enable property - boolean enabled = !newValue || !source.isSpeciesFromBatch(); + // compute editors enable property + boolean enabled = !newValue || !source.isSpeciesFromBatch(); // boolean enabled = !newValue || // !source.isSpeciesFromBatch() || // source.isSpeciesFromBatchWithOneCount(); - if (log.isInfoEnabled()) { - log.info("can edit? " + enabled + " (createFromBatch changed: " + newValue + ")"); - } - for (JComponent editorComponent : editorComponents) { - editorComponent.setEnabled(enabled); - } + if (log.isInfoEnabled()) { + log.info("can edit? " + enabled + " (createFromBatch changed: " + newValue + ")"); + } + for (JComponent editorComponent : editorComponents) { + editorComponent.setEnabled(enabled); } }); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java index f357491..6451028 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java @@ -115,7 +115,7 @@ public class MarineLitterBatchUIHandler extends AbstractTuttiBatchTableUIHandler // get all marine litter root BatchContainer<MarineLitterBatch> batchContainer = - getPersistenceService().getRootMarineLitterBatch(bean.getId()); + getPersistenceService().getRootMarineLitterBatch(bean.getIdAsInt()); for (MarineLitterBatch aBatch : batchContainer.getChildren()) { MarineLitterBatchRowModel entry = loadBatch(aBatch); @@ -144,8 +144,7 @@ public class MarineLitterBatchUIHandler extends AbstractTuttiBatchTableUIHandler protected boolean isRowValid(MarineLitterBatchRowModel row) { MarineLitterBatch batch = row.toEntity(); NuitonValidatorResult validator = getValidationService().validateEditMarineLitterBatch(batch); - boolean result = !validator.hasErrorMessagess(); - return result; + return !validator.hasErrorMessagess(); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/actions/ImportMultiPostMarineLitterAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/actions/ImportMultiPostMarineLitterAction.java index 0bdc8e6..ed25293 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/actions/ImportMultiPostMarineLitterAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/actions/ImportMultiPostMarineLitterAction.java @@ -77,8 +77,7 @@ public class ImportMultiPostMarineLitterAction extends ImportMultiPostActionSupp @Override protected Map<String, Object> importBatches(MultiPostImportService multiPostImportExportService, File file, FishingOperation operation) { - Map<String, Object> notImportedData = multiPostImportExportService.importMarineLitter(file, operation); - return notImportedData; + return multiPostImportExportService.importMarineLitter(file, operation); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/actions/OpenCreateMarineLitterBatchUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/actions/OpenCreateMarineLitterBatchUIAction.java index 6e5b0b4..5807940 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/actions/OpenCreateMarineLitterBatchUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/actions/OpenCreateMarineLitterBatchUIAction.java @@ -29,8 +29,6 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.create.CreateMarineLitterBatchUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * Created on 3/7/15. @@ -40,9 +38,6 @@ import org.apache.commons.logging.LogFactory; */ public class OpenCreateMarineLitterBatchUIAction extends SimpleActionSupport<MarineLitterBatchUI> { - /** Logger. */ - private static final Log log = LogFactory.getLog(OpenCreateMarineLitterBatchUIAction.class); - private static final long serialVersionUID = 1L; public OpenCreateMarineLitterBatchUIAction(MarineLitterBatchUI ui) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/actions/RemoveMarineLitterBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/actions/RemoveMarineLitterBatchAction.java index 84c392b..ed95c8e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/actions/RemoveMarineLitterBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/actions/RemoveMarineLitterBatchAction.java @@ -25,14 +25,13 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.actions import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.TuttiPersistence; import fr.ifremer.tutti.persistence.entities.TuttiEntities; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchTableModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchUIModel; -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.actions.RemoveSpeciesSubBatchAction; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; @@ -53,7 +52,7 @@ public class RemoveMarineLitterBatchAction extends LongActionSupport<MarineLitte private static final Log log = LogFactory.getLog(RemoveMarineLitterBatchAction.class); - protected RemoveSpeciesSubBatchAction removeSpeciesSubBatchAction; +// protected RemoveSpeciesSubBatchAction removeSpeciesSubBatchAction; public RemoveMarineLitterBatchAction(MarineLitterBatchUIHandler handler) { super(handler, false); @@ -95,7 +94,7 @@ public class RemoveMarineLitterBatchAction extends LongActionSupport<MarineLitte // remove it from db - String id = selectedBatch.getId(); + Integer id = selectedBatch.getIdAsInt(); if (log.isInfoEnabled()) { log.info("Remove marineLitter with id: " + id); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIModel.java index ed68785..ab2c334 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIModel.java @@ -107,15 +107,13 @@ public class CreateMarineLitterBatchUIModel extends AbstractTuttiBeanUIModel<Cre CaracteristicQualitativeValue category = getMarineLitterCategory(); CaracteristicQualitativeValue sizeCategory = getMarineLitterSizeCategory(); - boolean result = category != null && sizeCategory != null && + return category != null && sizeCategory != null && isCategoryAndSizeCategoryAvailable(category, sizeCategory); - return result; } public boolean isCategoryAndSizeCategoryAvailable(CaracteristicQualitativeValue category, CaracteristicQualitativeValue sizeCategory) { - boolean result = !marineLitterCategoryUsed.containsEntry(sizeCategory, category); - return result; + return !marineLitterCategoryUsed.containsEntry(sizeCategory, category); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriMelagWeightPopupUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriMelagWeightPopupUIHandler.java index 8a2ab2a..5ed1b6f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriMelagWeightPopupUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriMelagWeightPopupUIHandler.java @@ -26,8 +26,6 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import javax.swing.JComponent; @@ -37,9 +35,6 @@ import javax.swing.JComponent; */ public class ImportPupitriMelagWeightPopupUIHandler extends AbstractTuttiUIHandler<ImportPupitriMelagWeightPopupUIModel, ImportPupitriMelagWeightPopupUI> { - /** Logger. */ - private static final Log log = LogFactory.getLog(ImportPupitriMelagWeightPopupUIHandler.class); - @Override public void beforeInit(ImportPupitriMelagWeightPopupUI ui) { super.beforeInit(ui); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriMelagWeightPopupUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriMelagWeightPopupUIModel.java index 62a7021..e176cc8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriMelagWeightPopupUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriMelagWeightPopupUIModel.java @@ -33,7 +33,7 @@ import org.jdesktop.beans.AbstractSerializableBean; */ public class ImportPupitriMelagWeightPopupUIModel extends AbstractSerializableBean { - public static final String PROPERTY_TOTAL_MELAG_WEIGHT = "totalMelagWeight"; +// public static final String PROPERTY_TOTAL_MELAG_WEIGHT = "totalMelagWeight"; protected ComputableData<Float> totalMelagWeight = new ComputableData<>(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java index f6b8493..dd8d936 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIHandler.java @@ -31,8 +31,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import javax.swing.JComponent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.io.File; /** @@ -64,21 +62,9 @@ public class ImportPupitriPopupUIHandler extends AbstractTuttiUIHandler<ImportPu ui.pack(); ui.setResizable(true); - getModel().addPropertyChangeListener(ImportPupitriPopupUIModel.PROPERTY_TRUNK_FILE, new PropertyChangeListener() { + getModel().addPropertyChangeListener(ImportPupitriPopupUIModel.PROPERTY_TRUNK_FILE, evt -> updateCarrouselFile()); - @Override - public void propertyChange(PropertyChangeEvent evt) { - updateCarrouselFile(); - } - }); - - getModel().addPropertyChangeListener(ImportPupitriPopupUIModel.PROPERTY_CARROUSEL_FILE, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - updateTrunkFile(); - } - }); + getModel().addPropertyChangeListener(ImportPupitriPopupUIModel.PROPERTY_CARROUSEL_FILE, evt -> updateTrunkFile()); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java index 22fc10d..00f01ba 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchRowModel.java @@ -41,9 +41,7 @@ import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.attachment.AttachmentModelAware; import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; import org.apache.commons.collections4.CollectionUtils; -import org.nuiton.jaxx.application.ApplicationDataUtil; import org.nuiton.jaxx.application.bean.JavaBeanObjectUtil; -import org.nuiton.util.beans.BeanUtil; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -108,7 +106,7 @@ public class SpeciesBatchRowModel extends AbstractTuttiBeanUIModel<SpeciesBatch, * @since 0.2 */ protected ComputableData<Float> computedOrNotWeight = - new ComputableData<Float>(); + new ComputableData<>(); /** * Total computed number (from frequencies). @@ -116,7 +114,7 @@ public class SpeciesBatchRowModel extends AbstractTuttiBeanUIModel<SpeciesBatch, * @since 0.2 */ protected ComputableData<Integer> computedOrNotNumber = - new ComputableData<Integer>(); + new ComputableData<>(); /** * Attachments (should never be null). @@ -477,21 +475,18 @@ public class SpeciesBatchRowModel extends AbstractTuttiBeanUIModel<SpeciesBatch, @Override public SampleCategory<?> getSampleCategoryById(Integer sampleCategoryId) { Integer index = getCategoryIndex(sampleCategoryId); - SampleCategory<?> result = index == null ? null : categories[index]; - return result; + return index == null ? null : categories[index]; } @Override public SampleCategory<?> getSampleCategoryByIndex(int sampleCategoryIndex) { - SampleCategory<?> result = categories[sampleCategoryIndex]; - return result; + return categories[sampleCategoryIndex]; } @Override public Serializable getSampleCategoryValue(Integer sampleCategoryId) { SampleCategory<?> sampleCategory = getSampleCategoryById(sampleCategoryId); - Serializable result = (Serializable) JavaBeanObjectUtil.getProperty(sampleCategory, SampleCategory.PROPERTY_CATEGORY_VALUE); - return result; + return (Serializable) JavaBeanObjectUtil.getProperty(sampleCategory, SampleCategory.PROPERTY_CATEGORY_VALUE); } @Override @@ -598,8 +593,7 @@ public class SpeciesBatchRowModel extends AbstractTuttiBeanUIModel<SpeciesBatch, public SpeciesBatchRowModel getFirstAncestor(Integer sampleCategoryId) { SampleCategory<?> sampleCategory = getSampleCategoryById(sampleCategoryId); - SpeciesBatchRowModel firstAncestor = getFirstAncestor(sampleCategory); - return firstAncestor; + return getFirstAncestor(sampleCategory); } public List<SpeciesBatchRowModel> getChildBatch() { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java index 8132482..df890b7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java @@ -69,7 +69,6 @@ import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; -import org.jdesktop.swingx.decorator.ComponentAdapter; import org.jdesktop.swingx.decorator.HighlightPredicate; import org.jdesktop.swingx.decorator.Highlighter; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; @@ -82,13 +81,9 @@ import org.nuiton.validator.NuitonValidatorResult; import javax.swing.JComponent; import javax.swing.RowFilter; import javax.swing.event.TableModelEvent; -import javax.swing.event.TableModelListener; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumnModel; import java.awt.Color; -import java.awt.Component; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.io.Serializable; import java.util.Collections; import java.util.EnumMap; @@ -171,7 +166,7 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec if (log.isDebugEnabled()) { log.debug("Get species batch for fishingOperation: " + - bean.getId()); + bean.getId()); } rows = Lists.newArrayList(); @@ -179,8 +174,7 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec // get all batch species root (says the one with only a species sample category) BatchContainer<SpeciesBatch> rootSpeciesBatch = - getPersistenceService().getRootSpeciesBatch( - bean.getId(), true); + getPersistenceService().getRootSpeciesBatch(bean.getIdAsInt(), true); List<SpeciesBatch> catches = rootSpeciesBatch.getChildren(); @@ -194,10 +188,10 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec Preconditions.checkState( firstCategoryId.equals(aBatch.getSampleCategoryId()), "Root species batch must be a sortedUnsorted sample " + - "category but was:" + aBatch.getSampleCategoryId()); + "category but was:" + aBatch.getSampleCategoryId()); - SpeciesBatchRowModel rootRow = - loadBatch(aBatch, null, rows); +// SpeciesBatchRowModel rootRow = + loadBatch(aBatch, null, rows); //FIXME kmorin 20140902 NPE decorator does not exist // if (log.isDebugEnabled()) { @@ -244,9 +238,9 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec boolean result = !validator.hasErrorMessagess(); if (result - && ValidationService.VALIDATION_CONTEXT_VALIDATE.equals( + && ValidationService.VALIDATION_CONTEXT_VALIDATE.equals( getContext().getValidationContext()) - && row.isBatchLeaf()) { + && row.isBatchLeaf()) { List<SpeciesBatchFrequency> frequencies = SpeciesFrequencyRowModel.toEntity( @@ -289,8 +283,8 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec if (log.isDebugEnabled()) { log.debug("Sample category " + sampleCategoryId + - " weight was modified, First ancestor row: " + - firstAncestorIndex + " will save it"); + " weight was modified, First ancestor row: " + + firstAncestorIndex + " will save it"); } saveRow(firstAncestorRow); @@ -388,13 +382,9 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec new HighlightPredicate.AndHighlightPredicate( new HighlightPredicate.NotHighlightPredicate(HighlightPredicate.IS_SELECTED), HighlightPredicate.EDITABLE, - new HighlightPredicate() { - - public boolean isHighlighted(Component renderer, ComponentAdapter adapter) { - SpeciesBatchRowModel row = getTableModel().getEntry(adapter.convertRowIndexToModel(adapter.row)); - return row.isSpeciesToConfirm(); - } - + (renderer, adapter) -> { + SpeciesBatchRowModel row = getTableModel().getEntry(adapter.convertRowIndexToModel(adapter.row)); + return row.isSpeciesToConfirm(); }), toConfirmColor); table.addHighlighter(confirmHighlighter); @@ -403,13 +393,9 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec new HighlightPredicate.AndHighlightPredicate( new HighlightPredicate.NotHighlightPredicate(HighlightPredicate.IS_SELECTED), HighlightPredicate.READ_ONLY, - new HighlightPredicate() { - - public boolean isHighlighted(Component renderer, ComponentAdapter adapter) { - SpeciesBatchRowModel row = getTableModel().getEntry(adapter.convertRowIndexToModel(adapter.row)); - return row.isSpeciesToConfirm() && !adapter.isEditable(); - } - + (renderer, adapter) -> { + SpeciesBatchRowModel row = getTableModel().getEntry(adapter.convertRowIndexToModel(adapter.row)); + return row.isSpeciesToConfirm() && !adapter.isEditable(); }), toConfirmColor.darker()); table.addHighlighter(confirmNotEditableHighlighter); } @@ -461,18 +447,18 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec Integer lastSamplingId = sampleCategoryModel.getLastCategoryId(); enableSplit = row.isBatchLeaf() - && selectedRowCount == 1 - && ObjectUtils.notEqual(lastSamplingId, row.getFinestCategory().getCategoryId()) - && row.getNumber() == null - && (row.getComputedNumber() == null - || row.getComputedNumber() == 0); + && selectedRowCount == 1 + && ObjectUtils.notEqual(lastSamplingId, row.getFinestCategory().getCategoryId()) + && row.getNumber() == null + && (row.getComputedNumber() == null + || row.getComputedNumber() == 0); } boolean firstCategory = false; Integer sampleCategoryId = tableModel.getSampleCategoryId(columnIndex); - SampleCategoryModelEntry category = null; + SampleCategoryModelEntry category; List<CaracteristicQualitativeValue> available = null; @@ -629,7 +615,7 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec sampleCategoryModel = getDataContext().getSampleCategoryModel(); - tableFilters = new EnumMap<TableViewMode, RowFilter<SpeciesBatchTableModel, Integer>>(TableViewMode.class); + tableFilters = new EnumMap<>(TableViewMode.class); tableFilters.put(TableViewMode.ALL, new RowFilter<SpeciesBatchTableModel, Integer>() { @@ -753,7 +739,7 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec Decorator<? extends Serializable> decorator = sampleCategoryDef.getCaracteristic().isNumericType() ? - numberDecorator : caracteristicDecorator; + numberDecorator : caracteristicDecorator; addSampleCategoryColumnToModel(columnModel, columnIdentifier, @@ -808,57 +794,45 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec initBatchTable(table, columnModel, tableModel); - getModel().addPropertyChangeListener(SpeciesBatchUIModel.PROPERTY_TABLE_VIEW_MODE, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - TableViewMode tableViewMode = (TableViewMode) evt.getNewValue(); + getModel().addPropertyChangeListener(SpeciesBatchUIModel.PROPERTY_TABLE_VIEW_MODE, evt -> { + TableViewMode tableViewMode = (TableViewMode) evt.getNewValue(); - if (tableViewMode == null) { - tableViewMode = TableViewMode.ALL; - } + if (tableViewMode == null) { + tableViewMode = TableViewMode.ALL; + } - if (log.isDebugEnabled()) { - log.debug("Will use rowfilter for viewMode: " + tableViewMode); - } - RowFilter<SpeciesBatchTableModel, Integer> filter = tableFilters.get(tableViewMode); - getTable().setRowFilter(filter); + if (log.isDebugEnabled()) { + log.debug("Will use rowfilter for viewMode: " + tableViewMode); } + RowFilter<SpeciesBatchTableModel, Integer> filter = tableFilters.get(tableViewMode); + getTable().setRowFilter(filter); }); // when species sort mode change, must reload the firshing operation // and applying the sort on model - getModel().addPropertyChangeListener(SpeciesBatchUIModel.PROPERTY_SPECIES_SORT_MODE, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - SpeciesSortMode newValue = (SpeciesSortMode) evt.getNewValue(); - if (log.isInfoEnabled()) { - log.info("New species sort mode: " + newValue); - } - - // must reload fishing operation - selectFishingOperation(getModel().getFishingOperation()); + getModel().addPropertyChangeListener(SpeciesBatchUIModel.PROPERTY_SPECIES_SORT_MODE, evt -> { + SpeciesSortMode newValue = (SpeciesSortMode) evt.getNewValue(); + if (log.isInfoEnabled()) { + log.info("New species sort mode: " + newValue); } + + // must reload fishing operation + selectFishingOperation(getModel().getFishingOperation()); }); // when species sort mode change, must reload the firshing operation // and applying the sort on model - getModel().addPropertyChangeListener(SpeciesBatchUIModel.PROPERTY_SPECIES_DECORATOR_CONTEXT_INDEX, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - int newValue = (int) evt.getNewValue(); - if (log.isInfoEnabled()) { - log.info("New species decorator context index: " + newValue); - } + getModel().addPropertyChangeListener(SpeciesBatchUIModel.PROPERTY_SPECIES_DECORATOR_CONTEXT_INDEX, evt -> { + int newValue = (int) evt.getNewValue(); + if (log.isInfoEnabled()) { + log.info("New species decorator context index: " + newValue); + } - // update the decorator context index - getSpeciesColumnDecorator().setContextIndex(newValue); + // update the decorator context index + getSpeciesColumnDecorator().setContextIndex(newValue); - // reload fishing operation - selectFishingOperation(getModel().getFishingOperation()); - } + // reload fishing operation + selectFishingOperation(getModel().getFishingOperation()); }); } @@ -878,29 +852,25 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec // when model change, then rebuild the species comparator + set model as modified - tableModel.addTableModelListener(new TableModelListener() { + tableModel.addTableModelListener(e -> { - @Override - public void tableChanged(TableModelEvent e) { - - SpeciesBatchTableModel tableModel = - (SpeciesBatchTableModel) e.getSource(); - int type = e.getType(); - if (type == TableModelEvent.DELETE || + SpeciesBatchTableModel tableModel1 = + (SpeciesBatchTableModel) e.getSource(); + int type = e.getType(); + if (type == TableModelEvent.DELETE || type == TableModelEvent.INSERT || e.getLastRow() == Integer.MAX_VALUE) { - // get column comparator - SpeciesBatchDecoratorComparator<SpeciesBatchRowModel> comparator = - getSpeciesRowComparator(); + // get column comparator + SpeciesBatchDecoratorComparator<SpeciesBatchRowModel> comparator = + getSpeciesRowComparator(); - // get column decorator - SpeciesBatchDecorator<SpeciesBatchRowModel> decorator = - getSpeciesColumnDecorator(); + // get column decorator + SpeciesBatchDecorator<SpeciesBatchRowModel> decorator = + getSpeciesColumnDecorator(); - // init comparator with model species list - comparator.init((SpeciesBatchDecorator) decorator, tableModel.getRows()); - } + // init comparator with model species list + comparator.init((SpeciesBatchDecorator) decorator, tableModel1.getRows()); } }); @@ -978,7 +948,7 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec addToSpeciesUsed(newRow); if (batchRootRowModel.getBatchCount() == null && - batchRootRowModel.getSelectedCategory() != null) { + batchRootRowModel.getSelectedCategory() != null) { // add first category splitBatch(batchRootRowModel.getSelectedCategory(), @@ -1009,7 +979,7 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec Float parentWeight = parentBatch.getFinestCategory().getNotNullWeight(); boolean subSample = parentWeight != null && totalRowWeight != null - && Weights.isGreaterWeight(parentWeight, totalRowWeight); + && Weights.isGreaterWeight(parentWeight, totalRowWeight); List<SpeciesBatchRowModel> newBatches = Lists.newArrayList(); for (SplitSpeciesBatchRowModel row : rows) { if (row.isValid()) { @@ -1087,7 +1057,7 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec Float parentWeight = parentBatch.getSampleCategoryByIndex(categoryIndex - 1).getNotNullWeight(); boolean subSample = parentWeight != null && totalRowWeight != null - && Weights.isGreaterWeight(parentWeight, totalRowWeight); + && Weights.isGreaterWeight(parentWeight, totalRowWeight); Set<SpeciesBatchRowModel> shell = Sets.newHashSet(); parentBatch.collectShell(shell); @@ -1151,10 +1121,9 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec SpeciesBatchRowModel parentRow, List<SpeciesBatchRowModel> rows) { - String id = aBatch.getId(); + Integer id = aBatch.getIdAsInt(); - List<SpeciesBatchFrequency> frequencies = - getPersistenceService().getAllSpeciesBatchFrequency(id); + List<SpeciesBatchFrequency> frequencies = getPersistenceService().getAllSpeciesBatchFrequency(id); SpeciesBatchRowModel newRow = new SpeciesBatchRowModel(weightUnit, @@ -1199,7 +1168,7 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec // create batch childs rows List<SpeciesBatchRowModel> batchChilds = Lists. - newArrayListWithCapacity(aBatch.sizeChildBatchs()); + newArrayListWithCapacity(aBatch.sizeChildBatchs()); Float childrenWeights = 0f; for (SpeciesBatch childBatch : aBatch.getChildBatchs()) { @@ -1218,7 +1187,7 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec Float rowWeight = newRow.getFinestCategory().getNotNullWeight(); boolean subSample = rowWeight != null && childrenWeights != null - && Weights.isSmallerWeight(childrenWeights, rowWeight); + && Weights.isSmallerWeight(childrenWeights, rowWeight); for (SpeciesBatchRowModel childRow : batchChilds) { childRow.getFinestCategory().setSubSample(subSample); } @@ -1291,17 +1260,16 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec if (TuttiEntities.isNew(catchBean)) { - String parentBatchId = null; + Integer parentBatchId = null; if (parent != null) { - parentBatchId = parent.getId(); + parentBatchId = parent.getIdAsInt(); } if (log.isDebugEnabled()) { log.debug("Persist new species batch with parentId: " + - parentBatchId); + parentBatchId); } - catchBean = getPersistenceService().createSpeciesBatch(catchBean, - parentBatchId, true); + catchBean = getPersistenceService().createSpeciesBatch(catchBean, parentBatchId, true); row.setId(catchBean.getId()); } else { if (log.isDebugEnabled()) { @@ -1322,8 +1290,7 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec if (log.isDebugEnabled()) { log.debug("Will save " + frequency.size() + " frequencies."); } - frequency = getPersistenceService().saveSpeciesBatchFrequency( - catchBean.getId(), frequency); + frequency = getPersistenceService().saveSpeciesBatchFrequency(catchBean.getIdAsInt(), frequency); // push it back to row model frequencyRows = SpeciesFrequencyRowModel.fromEntity(weightUnit, @@ -1397,8 +1364,8 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec CaracteristicQualitativeValue categoryValue = (CaracteristicQualitativeValue) firstSampleCategory.getCategoryValue(); if (log.isDebugEnabled()) { log.debug("Add to speciesUsed: " + - decorate(categoryValue) + - " - " + decorate(row.getSpecies())); + decorate(categoryValue) + + " - " + decorate(row.getSpecies())); } SpeciesBatchUIModel model = getModel(); model.getSpeciesUsed().put(categoryValue, row.getSpecies()); @@ -1490,9 +1457,7 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec protected SpeciesBatchDecorator<SpeciesBatchRowModel> getSpeciesColumnDecorator() { TableColumnExt speciesColumn = getTable().getColumnExt(SpeciesBatchTableModel.SPECIES); - SpeciesBatchDecorator<SpeciesBatchRowModel> decorator = - (SpeciesBatchDecorator<SpeciesBatchRowModel>) SpeciesAbleBatchRowHelper.getSpeciesColumnDecorator(speciesColumn); - return decorator; + return (SpeciesBatchDecorator<SpeciesBatchRowModel>) SpeciesAbleBatchRowHelper.getSpeciesColumnDecorator(speciesColumn); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesAction.java index c5d0ef4..27439a5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportMultiPostSpeciesAction.java @@ -77,8 +77,7 @@ public class ImportMultiPostSpeciesAction extends ImportMultiPostActionSupport<S @Override protected Map<String, Object> importBatches(MultiPostImportService multiPostImportExportService, File file, FishingOperation operation) { - Map<String, Object> notImportedData = multiPostImportExportService.importSpecies(file, operation); - return notImportedData; + return multiPostImportExportService.importSpecies(file, operation); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenCreateSpeciesBatchUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenCreateSpeciesBatchUIAction.java index 28e192f..bf309f8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenCreateSpeciesBatchUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenCreateSpeciesBatchUIAction.java @@ -29,8 +29,6 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.create.CreateSpeciesBatchUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * Created on 3/7/15. @@ -40,9 +38,6 @@ import org.apache.commons.logging.LogFactory; */ public class OpenCreateSpeciesBatchUIAction extends SimpleActionSupport<SpeciesBatchUI> { - /** Logger. */ - private static final Log log = LogFactory.getLog(OpenCreateSpeciesBatchUIAction.class); - private static final long serialVersionUID = 1L; public OpenCreateSpeciesBatchUIAction(SpeciesBatchUI ui) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenEditSpeciesBatchFrequencyUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenEditSpeciesBatchFrequencyUIAction.java index 112289d..1d147f0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenEditSpeciesBatchFrequencyUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/OpenEditSpeciesBatchFrequencyUIAction.java @@ -30,8 +30,6 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.Spe import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; import jaxx.runtime.SwingUtil; import jaxx.runtime.swing.JTables; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.TableColumnModelExt; @@ -43,9 +41,6 @@ import org.jdesktop.swingx.table.TableColumnModelExt; */ public class OpenEditSpeciesBatchFrequencyUIAction extends SimpleActionSupport<SpeciesBatchUI> { - /** Logger. */ - private static final Log log = LogFactory.getLog(OpenEditSpeciesBatchFrequencyUIAction.class); - private static final long serialVersionUID = 1L; public OpenEditSpeciesBatchFrequencyUIAction(SpeciesBatchUI ui) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/RemoveSpeciesBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/RemoveSpeciesBatchAction.java index cee073b..bf249ff 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/RemoveSpeciesBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/RemoveSpeciesBatchAction.java @@ -113,7 +113,7 @@ public class RemoveSpeciesBatchAction extends LongActionSupport<SpeciesBatchUIMo rowToRemove = Sets.newHashSet(); - Set<String> removedBatchId = new LinkedHashSet<>(); + Set<Integer> removedBatchId = new LinkedHashSet<>(); for (int rowIndex : selectedRowIndexes) { @@ -122,9 +122,9 @@ public class RemoveSpeciesBatchAction extends LongActionSupport<SpeciesBatchUIMo Preconditions.checkState(!TuttiEntities.isNew(selectedBatch), "Can't remove batch if batch is not persisted"); - String selectedBatchId = selectedBatch.getId(); + Integer selectedBatchId = selectedBatch.getIdAsInt(); boolean batchRoot = selectedBatch.isBatchRoot(); - if (!batchRoot && removedBatchId.contains(selectedBatch.getParentBatch().getId())) { + if (!batchRoot && removedBatchId.contains(selectedBatch.getParentBatch().getIdAsInt())) { // This batch was already removed if (log.isInfoEnabled()) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/RemoveSpeciesSubBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/RemoveSpeciesSubBatchAction.java index 6f21749..841c1a2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/RemoveSpeciesSubBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/RemoveSpeciesSubBatchAction.java @@ -110,7 +110,7 @@ public class RemoveSpeciesSubBatchAction extends LongActionSupport<SpeciesBatchU "Can't remove sub batch if batch is not persisted"); // save parent batch (will destroy all his childs from db) - persistenceService.deleteSpeciesSubBatch(parentBatch.getId()); + persistenceService.deleteSpeciesSubBatch(parentBatch.getIdAsInt()); // collect of rows to remove from model diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/RenameSpeciesBatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/RenameSpeciesBatchAction.java index 7ca7a10..a041b14 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/RenameSpeciesBatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/RenameSpeciesBatchAction.java @@ -124,7 +124,7 @@ public class RenameSpeciesBatchAction extends LongActionSupport<SpeciesBatchUIMo SpeciesBatchRowModel row = tableModel.getEntry(selectedRowIndex); PersistenceService persistenceService = getContext().getPersistenceService(); - persistenceService.changeSpeciesBatchSpecies(row.getId(), selectedSpecies); + persistenceService.changeSpeciesBatchSpecies(row.getIdAsInt(), selectedSpecies); SampleCategory<?> firstSampleCategory = row.getFirstSampleCategory(); Serializable categoryValue = firstSampleCategory.getCategoryValue(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel.java index 65b996e..e5fcd4c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel.java @@ -318,15 +318,13 @@ public class CreateSpeciesBatchUIModel extends AbstractTuttiTableUIModel<CreateS } public boolean isSpeciesAndCategoryAvailable() { - boolean result = species != null && sampleCategory != null && + return species != null && sampleCategory != null && isSpeciesAndCategoryAvailable(species, sampleCategory); - return result; } public boolean isSpeciesAndCategoryAvailable(Species species, CaracteristicQualitativeValue sampleCategory) { - boolean result = !speciesUsed.containsEntry(sampleCategory, species); - return result; + return !speciesUsed.containsEntry(sampleCategory, species); } public boolean isCategoryIsFilled() { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java index 47460d0..04472f8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java @@ -280,7 +280,6 @@ public class SpeciesFrequencyCellComponent extends DefaultTableCellRenderer { } else { // keep next cell to edit - int r = rowIndex; int nextR = nextEditableRowIndex; int c = columnIndex; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyLogsTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyLogsTableModel.java index 8e0f1b4..b4b4485 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyLogsTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyLogsTableModel.java @@ -51,8 +51,7 @@ public class SpeciesFrequencyLogsTableModel extends AbstractApplicationTableMode @Override public SpeciesFrequencyLogRowModel createNewRow() { - SpeciesFrequencyLogRowModel result = new SpeciesFrequencyLogRowModel(); - return result; + return new SpeciesFrequencyLogRowModel(); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java index be1e33a..63dd67e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java @@ -221,8 +221,7 @@ public class SpeciesFrequencyRowModel extends AbstractTuttiBeanUIModel<SpeciesBa @Override public int compareTo(SpeciesFrequencyRowModel o) { - int result = ordering.compare(lengthStep, o.lengthStep); - return result; + return ordering.compare(lengthStep, o.lengthStep); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java index 0658008..01fbc34 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java @@ -28,7 +28,6 @@ import org.jfree.data.xy.XYSeries; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; -import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; @@ -150,9 +149,7 @@ public class SpeciesFrequencyTableModel extends AbstractApplicationTableModel<Sp if (oldRows != null) { - for (SpeciesFrequencyRowModel row : oldRows) { - dettachListeners(row); - } + oldRows.forEach(this::dettachListeners); } @@ -204,45 +201,42 @@ public class SpeciesFrequencyTableModel extends AbstractApplicationTableModel<Sp private PropertyChangeListener getOnLengthStepChangedListener() { if (onLengthStepChangedListener == null) { - onLengthStepChangedListener = new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - - Float oldValue = (Float) evt.getOldValue(); - if (oldValue != null) { + onLengthStepChangedListener = evt -> { - modelCache.removeLengthStep(oldValue); - if (series.indexOf(oldValue) >= 0) { - series.remove(oldValue); - } + Float oldValue = (Float) evt.getOldValue(); + if (oldValue != null) { + modelCache.removeLengthStep(oldValue); + if (series.indexOf(oldValue) >= 0) { + series.remove(oldValue); } - SpeciesFrequencyRowModel row = (SpeciesFrequencyRowModel) evt.getSource(); + } - Float newValue = (Float) evt.getNewValue(); - if (newValue != null) { + SpeciesFrequencyRowModel row = (SpeciesFrequencyRowModel) evt.getSource(); - modelCache.addLengthStep(row); + Float newValue = (Float) evt.getNewValue(); + if (newValue != null) { - if (row.getNumber() != null) { + modelCache.addLengthStep(row); - series.addOrUpdate(newValue, row.getNumber()); + if (row.getNumber() != null) { - } + series.addOrUpdate(newValue, row.getNumber()); } - uiModel.recomputeCanEditLengthStep(); - uiModel.recomputeRowsValidateState(); - uiModel.updateEmptyRow(row); + } + + uiModel.recomputeCanEditLengthStep(); + uiModel.recomputeRowsValidateState(); + uiModel.updateEmptyRow(row); - // Can recompute total number and weight only after valid flag change - uiModel.recomputeTotalNumberAndWeight(); + // Can recompute total number and weight only after valid flag change + uiModel.recomputeTotalNumberAndWeight(); - fireTableDataChanged(); + fireTableDataChanged(); - } }; } return onLengthStepChangedListener; @@ -250,41 +244,38 @@ public class SpeciesFrequencyTableModel extends AbstractApplicationTableModel<Sp private PropertyChangeListener getOnNumberChangedListener() { if (onNumberChangedListener == null) { - onNumberChangedListener = new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { + onNumberChangedListener = evt -> { - SpeciesFrequencyRowModel row = (SpeciesFrequencyRowModel) evt.getSource(); + SpeciesFrequencyRowModel row = (SpeciesFrequencyRowModel) evt.getSource(); - Integer newValue = (Integer) evt.getNewValue(); + Integer newValue = (Integer) evt.getNewValue(); - Float lengthStep = row.getLengthStep(); + Float lengthStep = row.getLengthStep(); - if (lengthStep != null) { + if (lengthStep != null) { - if (newValue == null) { + if (newValue == null) { - // remove the value for the lengthStep - if (series.indexOf(lengthStep) >= 0) { - series.remove(lengthStep); - } - - } else { + // remove the value for the lengthStep + if (series.indexOf(lengthStep) >= 0) { + series.remove(lengthStep); + } - series.addOrUpdate(lengthStep, row.getNumber()); + } else { - } + series.addOrUpdate(lengthStep, row.getNumber()); } - uiModel.recomputeCanEditLengthStep(); - uiModel.recomputeRowValidState(row); - uiModel.updateEmptyRow(row); + } - // Can recompute total number and weight only after valid flag change - uiModel.recomputeTotalNumberAndWeight(); + uiModel.recomputeCanEditLengthStep(); + uiModel.recomputeRowValidState(row); + uiModel.updateEmptyRow(row); + + // Can recompute total number and weight only after valid flag change + uiModel.recomputeTotalNumberAndWeight(); - } }; } return onNumberChangedListener; @@ -292,20 +283,17 @@ public class SpeciesFrequencyTableModel extends AbstractApplicationTableModel<Sp private PropertyChangeListener getOnWeightChangedListener() { if (onWeightChangedListener == null) { - onWeightChangedListener = new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { + onWeightChangedListener = evt -> { - SpeciesFrequencyRowModel row = (SpeciesFrequencyRowModel) evt.getSource(); - modelCache.updateRowWithWeight(row); + SpeciesFrequencyRowModel row = (SpeciesFrequencyRowModel) evt.getSource(); + modelCache.updateRowWithWeight(row); - uiModel.recomputeRowsValidateState(); - uiModel.updateEmptyRow(row); + uiModel.recomputeRowsValidateState(); + uiModel.updateEmptyRow(row); - // Can recompute total number and weight only after valid flag change - uiModel.recomputeTotalNumberAndWeight(); + // Can recompute total number and weight only after valid flag change + uiModel.recomputeTotalNumberAndWeight(); - } }; } return onWeightChangedListener; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java index 383bbdd..9b9b1f0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java @@ -71,8 +71,6 @@ import javax.swing.SwingUtilities; import java.awt.BorderLayout; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -159,8 +157,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci public boolean isRowValid(SpeciesFrequencyRowModel row) { SpeciesFrequencyUIModel model = getModel(); - boolean valid = model.isRowValid(row); - return valid; + return model.isRowValid(row); } @@ -227,25 +224,16 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci this.ui.setContextValue(model); // listen when ichtyometer is connected or not and adjust the listener - getContext().addPropertyChangeListener(TuttiUIContext.PROPERTY_ICHTYOMETER_CONNECTED, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - boolean connected = (boolean) evt.getNewValue(); - - if (connected && SpeciesFrequencyUIHandler.this.frequencyEditor != null) { + getContext().addPropertyChangeListener(TuttiUIContext.PROPERTY_ICHTYOMETER_CONNECTED, evt -> { + boolean connected = (boolean) evt.getNewValue(); - // listen when itchtyometer is connected and this ui is showing - listenItchtyometer(); - } + if (connected && SpeciesFrequencyUIHandler.this.frequencyEditor != null) { - SwingUtilities.invokeLater( - new Runnable() { - @Override - public void run() { - updateLogVisibility(); - } - }); + // listen when itchtyometer is connected and this ui is showing + listenItchtyometer(); } + + SwingUtilities.invokeLater(this::updateLogVisibility); }); } @@ -295,71 +283,58 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci }); // when lengthStepCaracteristic changed, let's updates all row with the new value - model.addPropertyChangeListener(SpeciesFrequencyUIModel.PROPERTY_LENGTH_STEP_CARACTERISTIC, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - Caracteristic newValue = (Caracteristic) evt.getNewValue(); - // get step from the pmfm - float step = getStep(newValue); - getModel().setStep(step); - getModel().setDataSetIntervalWidth(step); - chart.getXYPlot().getDomainAxis().setStandardTickUnits(new TuttiNumberTickUnitSource(step == 1f)); - if (CollectionUtils.isNotEmpty(getModel().getRows())) { - for (SpeciesFrequencyRowModel rowModel : getModel().getRows()) { - rowModel.setLengthStepCaracteristic(newValue); - recomputeRowValidState(rowModel); - } + model.addPropertyChangeListener(SpeciesFrequencyUIModel.PROPERTY_LENGTH_STEP_CARACTERISTIC, evt -> { + Caracteristic newValue = (Caracteristic) evt.getNewValue(); + // get step from the pmfm + float step1 = getStep(newValue); + getModel().setStep(step1); + getModel().setDataSetIntervalWidth(step1); + chart.getXYPlot().getDomainAxis().setStandardTickUnits(new TuttiNumberTickUnitSource(step1 == 1f)); + if (CollectionUtils.isNotEmpty(getModel().getRows())) { + for (SpeciesFrequencyRowModel rowModel : getModel().getRows()) { + rowModel.setLengthStepCaracteristic(newValue); + recomputeRowValidState(rowModel); } - SpeciesFrequencyUIHandler.this.ui.getValidator().doValidate(); } + SpeciesFrequencyUIHandler.this.ui.getValidator().doValidate(); }); // when lengthStepCaracteristicUnit changed, let's updates the label of some fields - model.addPropertyChangeListener(SpeciesFrequencyUIModel.PROPERTY_LENGTH_STEP_CARACTERISTIC_UNIT, new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { + model.addPropertyChangeListener(SpeciesFrequencyUIModel.PROPERTY_LENGTH_STEP_CARACTERISTIC_UNIT, evt -> { - String unit = (String) evt.getNewValue(); + String unit = (String) evt.getNewValue(); - if (unit == null) { + if (unit == null) { - unit = t("tutti.editSpeciesFrequencies.unkownStepUnit"); - } + unit = t("tutti.editSpeciesFrequencies.unkownStepUnit"); + } - getUI().getMinStepLabel().setText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.minStep"), unit)); - getUI().getMinStepLabel().setToolTipText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.minStep.tip"), unit)); + getUI().getMinStepLabel().setText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.minStep"), unit)); + getUI().getMinStepLabel().setToolTipText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.minStep.tip"), unit)); - getUI().getMaxStepLabel().setText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.maxStep"), unit)); - getUI().getMaxStepLabel().setToolTipText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.maxStep.tip"), unit)); + getUI().getMaxStepLabel().setText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.maxStep"), unit)); + getUI().getMaxStepLabel().setToolTipText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.maxStep.tip"), unit)); - getUI().getRafaleStepLabel().setText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.rafaleStep"), unit)); - getUI().getRafaleStepLabel().setToolTipText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.rafaleStep.tip"), unit)); + getUI().getRafaleStepLabel().setText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.rafaleStep"), unit)); + getUI().getRafaleStepLabel().setToolTipText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.field.rafaleStep.tip"), unit)); - TableColumnExt column = (TableColumnExt) getUI().getTable().getColumn(SpeciesFrequencyTableModel.LENGTH_STEP); - column.setHeaderValue(getLabelWithUnit(t("tutti.editSpeciesFrequencies.table.header.lengthStep"), unit)); - column.setToolTipText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.table.header.lengthStep"), unit)); - } + TableColumnExt column = (TableColumnExt) getUI().getTable().getColumn(SpeciesFrequencyTableModel.LENGTH_STEP); + column.setHeaderValue(getLabelWithUnit(t("tutti.editSpeciesFrequencies.table.header.lengthStep"), unit)); + column.setToolTipText(getLabelWithUnit(t("tutti.editSpeciesFrequencies.table.header.lengthStep"), unit)); }); // when configuration mode change, let's focus the best component (see http://forge.codelutin.com/issues/4035) - model.addPropertyChangeListener(SpeciesFrequencyUIModel.PROPERTY_CONFIGURATION_MODE, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - final FrequencyConfigurationMode newValue = (FrequencyConfigurationMode) evt.getNewValue(); - SwingUtilities.invokeLater( - new Runnable() { - @Override - public void run() { - JComponent componentToFocus = getComponentToFocus(newValue); - if (componentToFocus != null) { - componentToFocus.grabFocus(); - } - updateLogVisibility(); - } + model.addPropertyChangeListener(SpeciesFrequencyUIModel.PROPERTY_CONFIGURATION_MODE, evt -> { + final FrequencyConfigurationMode newValue = (FrequencyConfigurationMode) evt.getNewValue(); + SwingUtilities.invokeLater( + () -> { + JComponent componentToFocus = getComponentToFocus(newValue); + if (componentToFocus != null) { + componentToFocus.grabFocus(); } - ); - } + updateLogVisibility(); + } + ); }); // set the pattern to the weight in simple counting mode according to the weight unit @@ -450,7 +425,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci // create log table model SpeciesFrequencyLogsTableModel logTableModel = new SpeciesFrequencyLogsTableModel(logColumnModel); - logTableModel.setRows(new ArrayList<SpeciesFrequencyLogRowModel>()); + logTableModel.setRows(new ArrayList<>()); logTable.setModel(logTableModel); logTable.setColumnModel(logColumnModel); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java index e1cdfb9..145f829 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java @@ -143,7 +143,7 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa * * @since 3.8 */ - protected ComputableData<Float> totalComputedOrNotWeight = new ComputableData<Float>(); + protected ComputableData<Float> totalComputedOrNotWeight = new ComputableData<>(); /** * Number in case of simple counting mode @@ -403,8 +403,7 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa int intValue = (int) (lengthStep * 10); int intStep = (int) (step * 10); int correctIntStep = intValue - (intValue % intStep); - float result = correctIntStep / 10f; - return result; + return correctIntStep / 10f; } public Integer getTotalNumber() { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModelCache.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModelCache.java index b9e3281..832c50a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModelCache.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModelCache.java @@ -59,9 +59,9 @@ public class SpeciesFrequencyUIModelCache implements Serializable { * * @since 3.10 */ - protected final Map<Integer, MutableInt> nbOfRowsByLengthStep = new TreeMap<Integer, MutableInt>(); + protected final Map<Integer, MutableInt> nbOfRowsByLengthStep = new TreeMap<>(); - private final Map<Float, SpeciesFrequencyRowModel> rowCache = new TreeMap<Float, SpeciesFrequencyRowModel>(); + private final Map<Float, SpeciesFrequencyRowModel> rowCache = new TreeMap<>(); public void loadCache(List<SpeciesFrequencyRowModel> rows) { @@ -98,8 +98,7 @@ public class SpeciesFrequencyUIModelCache implements Serializable { public int numberOfRows(float lengthStep) { MutableInt mutableInt = getNbRowsByLengthStep(lengthStep); - int result = mutableInt.intValue(); - return result; + return mutableInt.intValue(); } public void incNumberOfRows(float lengthStep) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/AddSpeciesFrequencyLengthStepCaracteristicAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/AddSpeciesFrequencyLengthStepCaracteristicAction.java index 8cdb3f8..350a377 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/AddSpeciesFrequencyLengthStepCaracteristicAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/AddSpeciesFrequencyLengthStepCaracteristicAction.java @@ -69,7 +69,7 @@ public class AddSpeciesFrequencyLengthStepCaracteristicAction extends AbstractAc // open a dialog to select it - BeanFilterableComboBox<Caracteristic> editor = new BeanFilterableComboBox<Caracteristic>(); + BeanFilterableComboBox<Caracteristic> editor = new BeanFilterableComboBox<>(); editor.setBeanType(Caracteristic.class); editor.setShowReset(true); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchRowModel.java index 6980500..a0e8cb8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchRowModel.java @@ -73,9 +73,9 @@ public class SplitSpeciesBatchRowModel super(null, null); } - public SampleCategoryModelEntry getCategorytype() { - return category.getCategoryDef(); - } +// public SampleCategoryModelEntry getCategorytype() { +// return category.getCategoryDef(); +// } public void setCategoryType(SampleCategoryModelEntry categoryType) { category.setCategoryDef(categoryType); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java index 71a4c99..daa06ad 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java @@ -22,7 +22,6 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.split; * #L% */ -import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -345,12 +344,7 @@ public class SplitSpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<Spli model.setBatch(batch); // add existing rows - Map<Serializable, SplitSpeciesBatchRowModel> rowsByValue = Maps.uniqueIndex(model.getRows(), new Function<SplitSpeciesBatchRowModel, Serializable>() { - @Override - public Serializable apply(SplitSpeciesBatchRowModel input) { - return input.getCategoryValue(); - } - }); + Map<Serializable, SplitSpeciesBatchRowModel> rowsByValue = Maps.uniqueIndex(model.getRows(), SplitSpeciesBatchRowModel::getCategoryValue); for (SpeciesBatchRowModel row : rows) { SampleCategory<?> sampleCategory = row.getSampleCategoryById(sampleCategoryId); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicRowModel.java index 2914ec2..83e9c38 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicRowModel.java @@ -48,11 +48,11 @@ public abstract class AbstractCaracteristicRowModel<RM extends AbstractCaracteri super(null, null); } - public AbstractCaracteristicRowModel(Caracteristic key, Serializable value) { - this(); - this.key = key; - this.value = value; - } +// public AbstractCaracteristicRowModel(Caracteristic key, Serializable value) { +// this(); +// this.key = key; +// this.value = value; +// } public Caracteristic getKey() { return key; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIModel.java index 1b37362..38f0264 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/AbstractCaracteristicTabUIModel.java @@ -24,13 +24,12 @@ package fr.ifremer.tutti.ui.swing.content.operation.fishing; */ import com.google.common.base.Predicates; -import com.google.common.collect.Iterables; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; -import org.nuiton.jaxx.application.swing.tab.TabContentModel; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel; +import org.nuiton.jaxx.application.swing.tab.TabContentModel; import java.io.Serializable; import java.util.List; @@ -102,8 +101,7 @@ public abstract class AbstractCaracteristicTabUIModel<RM extends AbstractTuttiBe @Override public boolean isEmpty() { - return caracteristicMap == null - || Iterables.all(caracteristicMap.values(), Predicates.isNull()); + return caracteristicMap == null || caracteristicMap.values().stream().allMatch(Predicates.isNull()::apply); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIHandler.java index bf859b2..9a79009 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUIHandler.java @@ -22,13 +22,8 @@ package fr.ifremer.tutti.ui.swing.content.operation.fishing; * #L% */ -import com.google.common.base.Function; -import com.google.common.base.Predicate; -import com.google.common.collect.Collections2; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRow; -import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocols; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.service.DecoratorService; @@ -38,8 +33,6 @@ import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; -import java.util.ArrayList; -import java.util.Collection; import java.util.List; /** diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTableModel.java index df029dc..697006d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTableModel.java @@ -53,8 +53,7 @@ public class GearUseFeatureTableModel extends AbstractApplicationTableModel<Gear @Override public GearUseFeatureRowModel createNewRow() { - GearUseFeatureRowModel result = new GearUseFeatureRowModel(); - return result; + return new GearUseFeatureRowModel(); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIHandler.java index 6f77d9c..98975fb 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUIHandler.java @@ -22,13 +22,8 @@ package fr.ifremer.tutti.ui.swing.content.operation.fishing; * #L% */ -import com.google.common.base.Function; -import com.google.common.base.Predicate; -import com.google.common.collect.Collections2; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; -import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRow; -import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicType; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocols; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.service.DecoratorService; @@ -38,8 +33,6 @@ import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; -import java.util.ArrayList; -import java.util.Collection; import java.util.List; /** diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTableModel.java index 70c8cda..223ffa1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTableModel.java @@ -53,8 +53,7 @@ public class VesselUseFeatureTableModel extends AbstractApplicationTableModel<Ve @Override public VesselUseFeatureRowModel createNewRow() { - VesselUseFeatureRowModel result = new VesselUseFeatureRowModel(); - return result; + return new VesselUseFeatureRowModel(); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/DeleteFishingOperationAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/DeleteFishingOperationAction.java index b5f0c23..f542e13 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/DeleteFishingOperationAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/DeleteFishingOperationAction.java @@ -74,7 +74,7 @@ public class DeleteFishingOperationAction extends LongActionSupport<FishingOpera log.info("Will delete fishingOperation: " + fishingOperation); } - getContext().getPersistenceService().deleteFishingOperation(fishingOperation.getId()); + getContext().getPersistenceService().deleteFishingOperation(fishingOperation.getIdAsInt()); FishingOperationsUIModel model = getModel(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/EditFishingOperationAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/EditFishingOperationAction.java index 0d9fb66..88e8b3a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/EditFishingOperationAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/EditFishingOperationAction.java @@ -40,9 +40,6 @@ import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.service.PersistenceService; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; -import fr.ifremer.tutti.ui.swing.content.operation.catches.actions.ComputeBatchWeightsAction; -import fr.ifremer.tutti.ui.swing.content.operation.catches.actions.SaveCatchBatchAction; import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUI; import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.EditFishingOperationUIModel; @@ -53,9 +50,11 @@ import fr.ifremer.tutti.ui.swing.content.operation.SecondaryVesselTypeEnum; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; +import fr.ifremer.tutti.ui.swing.content.operation.catches.actions.SaveCatchBatchAction; import fr.ifremer.tutti.ui.swing.content.operation.fishing.GearUseFeatureTabUI; import fr.ifremer.tutti.ui.swing.content.operation.fishing.VesselUseFeatureTabUI; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; +import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -112,12 +111,12 @@ public class EditFishingOperationAction extends LongActionSupport<FishingOperati */ protected SaveFishingOperationAction saveFishingOperationAction; - /** - * Delegate action to compute the weight of the operations. - * - * @since 1.1 - */ - protected ComputeBatchWeightsAction computeBatchWeightsAction; +// /** +// * Delegate action to compute the weight of the operations. +// * +// * @since 1.1 +// */ +// protected ComputeBatchWeightsAction computeBatchWeightsAction; /** * Delegate action to save catch batch. @@ -201,7 +200,7 @@ public class EditFishingOperationAction extends LongActionSupport<FishingOperati public void setFishingOperation(FishingOperation fishingOperation) { this.fishingOperation = fishingOperation; - getDataContext().setFishingOperationId(fishingOperation != null ? fishingOperation.getId() : null); + getDataContext().setFishingOperationId(fishingOperation != null ? fishingOperation.getIdAsInt() : null); } public void setCheckPreviousEdit(boolean checkPreviousEdit) { @@ -230,12 +229,12 @@ public class EditFishingOperationAction extends LongActionSupport<FishingOperati return saveCatchBatchAction; } - protected ComputeBatchWeightsAction getComputeBatchWeightsAction() { - if (computeBatchWeightsAction == null) { - computeBatchWeightsAction = new ComputeBatchWeightsAction(getUI().getCatchesTabContent().getHandler()); - } - return computeBatchWeightsAction; - } +// protected ComputeBatchWeightsAction getComputeBatchWeightsAction() { +// if (computeBatchWeightsAction == null) { +// computeBatchWeightsAction = new ComputeBatchWeightsAction(getUI().getCatchesTabContent().getHandler()); +// } +// return computeBatchWeightsAction; +// } @Override public boolean prepareAction() { @@ -435,14 +434,11 @@ public class EditFishingOperationAction extends LongActionSupport<FishingOperati fishingOperationTabContent.getModel().setModify(false); SwingUtilities.invokeLater( - new Runnable() { - @Override - public void run() { + () -> { - JComponent componentToFocus = fishingOperationTabContent.getHandler().getComponentToFocus(); - componentToFocus.requestFocusInWindow(); + JComponent componentToFocus = fishingOperationTabContent.getHandler().getComponentToFocus(); + componentToFocus.requestFocusInWindow(); - } } ); @@ -450,13 +446,13 @@ public class EditFishingOperationAction extends LongActionSupport<FishingOperati } - public void displayValidationErrors() { - if (CollectionUtils.isNotEmpty(errorMessages)) { - for (String errorMessage : errorMessages) { - getContext().getErrorHelper().showErrorDialog(errorMessage, null); - } - } - } +// public void displayValidationErrors() { +// if (CollectionUtils.isNotEmpty(errorMessages)) { +// for (String errorMessage : errorMessages) { +// getContext().getErrorHelper().showErrorDialog(errorMessage, null); +// } +// } +// } public void loadFishingOperation(FishingOperation bean) { @@ -478,8 +474,7 @@ public class EditFishingOperationAction extends LongActionSupport<FishingOperati editFishingOperationUIModel.fromEntity( FishingOperations.newFishingOperation()); - editFishingOperationUIModel.setFishingOperation(bean); - + editFishingOperationUIModel.setFishingOperation(null); editFishingOperationUIModel.setAllSecondaryVessel(null); editFishingOperationUIModel.setFishingSecondaryVessel(null); editFishingOperationUIModel.setScientificSecondaryVessel(null); @@ -507,8 +502,8 @@ public class EditFishingOperationAction extends LongActionSupport<FishingOperati for (Gear gear : cruise.getGear()) { CaracteristicMap caracteristics = persistenceService.getGearCaracteristics( - cruise.getId(), - gear.getId(), + cruise.getIdAsInt(), + gear.getIdAsInt(), gear.getRankOrder()); Gear toKeep = GearWithOriginalRankOrders.newGearWithOriginalRankOrder(gear); @@ -598,7 +593,7 @@ public class EditFishingOperationAction extends LongActionSupport<FishingOperati Set<Vessel> vesselSet = Sets.newHashSet(); for (FishingOperation operation : fishingOperation) { - List<Vessel> secondaryVessel = persistenceService.getFishingOperationSecondaryVessel(operation.getId()); + List<Vessel> secondaryVessel = persistenceService.getFishingOperationSecondaryVessel(operation.getIdAsInt()); if (CollectionUtils.isNotEmpty(secondaryVessel)) { vesselSet.addAll(secondaryVessel); } @@ -647,7 +642,7 @@ public class EditFishingOperationAction extends LongActionSupport<FishingOperati boolean catchEnabled; - String operationId = bean == null ? null : bean.getId(); + Integer operationId = bean == null ? null : bean.getIdAsInt(); ProgressionModel progressionModel = getProgressionModel(); if (progressionModel == null) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/ImportFishingOperationCaracteristicsFromColumnFileAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/ImportFishingOperationCaracteristicsFromColumnFileAction.java index f3f0396..db18fec 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/ImportFishingOperationCaracteristicsFromColumnFileAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/actions/ImportFishingOperationCaracteristicsFromColumnFileAction.java @@ -105,14 +105,14 @@ public class ImportFishingOperationCaracteristicsFromColumnFileAction extends Lo } catch (ImportFromColumnFileInvalidRowException error) { // matching row is not valid - ImportFromColumnFileInvalidRowException importFromColumnFileInvalidRowException = (ImportFromColumnFileInvalidRowException) error; errorMessage = ""; - for (AbstractImportErrorInfo<FishingOperation> errorInfo : importFromColumnFileInvalidRowException.getErrors()) { + for (AbstractImportErrorInfo<FishingOperation> errorInfo : error.getErrors()) { + Throwable errorInfoCause = errorInfo.getCause(); if (log.isErrorEnabled()) { - log.error(errorInfo.getCause().getLocalizedMessage()); + log.error(errorInfoCause.getLocalizedMessage()); } - errorMessage += "<li>" + errorInfo.getCause().getLocalizedMessage().replaceAll("\\s+", " ") + "</li>"; + errorMessage += "<li>" + errorInfoCause.getLocalizedMessage().replaceAll("\\s+", " ") + "</li>"; } } catch (ImportFromColumnFileFishingOperationNotFoundException error) { @@ -120,8 +120,7 @@ public class ImportFishingOperationCaracteristicsFromColumnFileAction extends Lo errorMessage = "<li>" + t("tutti.editFishingOperation.action.importColumns.operationNotFound") + "</li>"; } catch (ImportFromColumnFileMissingHeaderException error) { - ImportFromColumnFileMissingHeaderException importFromColumnFileMissingHeaderException = (ImportFromColumnFileMissingHeaderException) error; - errorMessage = t("tutti.editFishingOperation.action.importColumns.missingHeader", importFromColumnFileMissingHeaderException.getImportColumn()); + errorMessage = t("tutti.editFishingOperation.action.importColumns.missingHeader", error.getImportColumn()); } if (errorMessage != null) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java index 7f8c0ec..ebe1506 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java @@ -125,14 +125,13 @@ public class EditProgramUIHandler extends AbstractTuttiUIHandler<EditProgramUIMo @Override public boolean quitUI() { - boolean result = quitScreen( + return quitScreen( getModel().isValid(), getModel().isModify(), t("tutti.editProgram.askCancelEditBeforeLeaving.cancelSaveProgram"), t("tutti.editProgram.askSaveBeforeLeaving.saveProgram"), ui.getSaveButton().getAction() ); - return result; } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolCaracteristicsRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolCaracteristicsRowModel.java index 821a96a..b35a356 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolCaracteristicsRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolCaracteristicsRowModel.java @@ -69,7 +69,7 @@ public class EditProtocolCaracteristicsRowModel extends AbstractTuttiBeanUIModel public EditProtocolCaracteristicsRowModel(Collection<Caracteristic> caracteristics) { super(fromBeanBinder, toBeanBinder); - caracteristicMap = caracteristics != null ? TuttiEntities.splitById(caracteristics) : new HashMap<String, Caracteristic>(); + caracteristicMap = caracteristics != null ? TuttiEntities.splitById(caracteristics) : new HashMap<>(); } public Caracteristic getPsfm() { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java index d66c7c4..d6be705 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java @@ -67,9 +67,9 @@ public class EditProtocolSpeciesRowModel extends AbstractTuttiBeanUIModel<Specie protected boolean weightEnabled; - protected boolean countIfNoFrequencyEnabled; - - protected boolean calcifySampleEnabled; +// protected boolean countIfNoFrequencyEnabled; +// +// protected boolean calcifySampleEnabled; protected List<Integer> mandatorySampleCategoryId; @@ -201,8 +201,7 @@ public class EditProtocolSpeciesRowModel extends AbstractTuttiBeanUIModel<Specie @Override public Integer getMandatorySampleCategoryId(int index) { - Integer o = getChild(mandatorySampleCategoryId, index); - return o; + return getChild(mandatorySampleCategoryId, index); } @Override @@ -227,26 +226,22 @@ public class EditProtocolSpeciesRowModel extends AbstractTuttiBeanUIModel<Specie @Override public boolean removeMandatorySampleCategoryId(Integer mandatorySampleCategoryId) { - boolean removed = getMandatorySampleCategoryId().remove(mandatorySampleCategoryId); - return removed; + return getMandatorySampleCategoryId().remove(mandatorySampleCategoryId); } @Override public boolean removeAllMandatorySampleCategoryId(Collection<Integer> mandatorySampleCategoryId) { - boolean removed = getMandatorySampleCategoryId().removeAll(mandatorySampleCategoryId); - return removed; + return getMandatorySampleCategoryId().removeAll(mandatorySampleCategoryId); } @Override public boolean containsMandatorySampleCategoryId(Integer mandatorySampleCategoryId) { - boolean contains = getMandatorySampleCategoryId().contains(mandatorySampleCategoryId); - return contains; + return getMandatorySampleCategoryId().contains(mandatorySampleCategoryId); } @Override public boolean containsAllMandatorySampleCategoryId(Collection<Integer> mandatorySampleCategoryId) { - boolean contains = getMandatorySampleCategoryId().containsAll(mandatorySampleCategoryId); - return contains; + return getMandatorySampleCategoryId().containsAll(mandatorySampleCategoryId); } @Override @@ -358,8 +353,7 @@ public class EditProtocolSpeciesRowModel extends AbstractTuttiBeanUIModel<Specie @Override public CalcifiedPiecesSamplingDefinition getCalcifiedPiecesSamplingDefinition(int index) { - CalcifiedPiecesSamplingDefinition o = getChild(calcifiedPiecesSamplingDefinition, index); - return o; + return getChild(calcifiedPiecesSamplingDefinition, index); } @Override @@ -384,26 +378,22 @@ public class EditProtocolSpeciesRowModel extends AbstractTuttiBeanUIModel<Specie @Override public boolean removeCalcifiedPiecesSamplingDefinition(CalcifiedPiecesSamplingDefinition calcifiedPiecesSamplingDefinition) { - boolean removed = getCalcifiedPiecesSamplingDefinition().remove(calcifiedPiecesSamplingDefinition); - return removed; + return getCalcifiedPiecesSamplingDefinition().remove(calcifiedPiecesSamplingDefinition); } @Override public boolean removeAllCalcifiedPiecesSamplingDefinition(Collection<CalcifiedPiecesSamplingDefinition> calcifiedPiecesSamplingDefinition) { - boolean removed = getCalcifiedPiecesSamplingDefinition().removeAll(calcifiedPiecesSamplingDefinition); - return removed; + return getCalcifiedPiecesSamplingDefinition().removeAll(calcifiedPiecesSamplingDefinition); } @Override public boolean containsCalcifiedPiecesSamplingDefinition(CalcifiedPiecesSamplingDefinition calcifiedPiecesSamplingDefinition) { - boolean contains = getCalcifiedPiecesSamplingDefinition().contains(calcifiedPiecesSamplingDefinition); - return contains; + return getCalcifiedPiecesSamplingDefinition().contains(calcifiedPiecesSamplingDefinition); } @Override public boolean containsAllCalcifiedPiecesSamplingDefinition(Collection<CalcifiedPiecesSamplingDefinition> calcifiedPiecesSamplingDefinition) { - boolean contains = getCalcifiedPiecesSamplingDefinition().containsAll(calcifiedPiecesSamplingDefinition); - return contains; + return getCalcifiedPiecesSamplingDefinition().containsAll(calcifiedPiecesSamplingDefinition); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java index 204ee60..4619101 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java @@ -29,8 +29,6 @@ import org.jdesktop.swingx.table.TableColumnModelExt; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -105,30 +103,25 @@ public class EditProtocolSpeciesTableModel extends AbstractApplicationTableModel result.setValid(true); result.addPropertyChangeListener(EditProtocolSpeciesRowModel.PROPERTY_LENGTH_STEP_PMFM, - new PropertyChangeListener() { + evt -> { - @Override - public void propertyChange(PropertyChangeEvent evt) { + if (evt.getNewValue() == null) { - if (evt.getNewValue() == null) { + EditProtocolSpeciesRowModel rowModel = (EditProtocolSpeciesRowModel) evt.getSource(); + rowModel.setRtpMale(null); + rowModel.setRtpFemale(null); + rowModel.setRtpUndefined(null); - EditProtocolSpeciesRowModel rowModel = (EditProtocolSpeciesRowModel) evt.getSource(); - rowModel.setRtpMale(null); - rowModel.setRtpFemale(null); - rowModel.setRtpUndefined(null); + } - } - - } - }); + }); return result; } @Override public EditProtocolSpeciesRowModel createNewRow() { - EditProtocolSpeciesRowModel result = newRow(sampleCategoryModel); - return result; + return newRow(sampleCategoryModel); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java index 4bf660f..d1fb51e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java @@ -1022,14 +1022,13 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI @Override public boolean quitUI() { - boolean result = quitScreen( + return quitScreen( getModel().isValid(), getModel().isModify(), t("tutti.editProtocol.askCancelEditBeforeLeaving.cancelSaveProtocol"), t("tutti.editProtocol.askSaveBeforeLeaving.saveProtocol"), ui.getSaveButton().getAction() ); - return result; } //------------------------------------------------------------------------// diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java index ed745c5..b6f4df7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java @@ -22,7 +22,6 @@ package fr.ifremer.tutti.ui.swing.content.protocol; * #L% */ -import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -159,17 +158,17 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, protected Map<String, Caracteristic> allCaracteristic; protected Map<Caracteristic, EditProtocolCaracteristicsRowModel> caracteristicMappingRows = - new HashMap<Caracteristic, EditProtocolCaracteristicsRowModel>(); + new HashMap<>(); protected List<EditProtocolOperationFieldsRowModel> operationFieldMappingRows = - new ArrayList<EditProtocolOperationFieldsRowModel>(); + new ArrayList<>(); /** * Number of rows for each column * * @since 3.10 */ - protected Map<String, MutableInt> numberOfRowsByColumn = new HashMap<String, MutableInt>(); + protected Map<String, MutableInt> numberOfRowsByColumn = new HashMap<>(); protected List<EditProtocolSpeciesRowModel> speciesRow; @@ -217,7 +216,7 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, toBeanBinder.copyExcluding(this, result, PROPERTY_ZONE); Collection<EditProtocolCaracteristicsRowModel> protocolCaracteristicMappingRows = getCaracteristicMappingRows(); - List<CaracteristicMappingRow> caracteristicMappingRows = new ArrayList<CaracteristicMappingRow>(); + List<CaracteristicMappingRow> caracteristicMappingRows = new ArrayList<>(); for (EditProtocolCaracteristicsRowModel row : protocolCaracteristicMappingRows) { if (row.isValid()) { caracteristicMappingRows.add(row.toEntity()); @@ -226,7 +225,7 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, result.setCaracteristicMapping(caracteristicMappingRows); List<EditProtocolOperationFieldsRowModel> protocolOperationFieldMappingRows = getOperationFieldMappingRows(); - List<OperationFieldMappingRow> operationFieldMappingRows = new ArrayList<OperationFieldMappingRow>(); + List<OperationFieldMappingRow> operationFieldMappingRows = new ArrayList<>(); for (EditProtocolOperationFieldsRowModel row : protocolOperationFieldMappingRows) { if (StringUtils.isNotBlank(row.getField()) && StringUtils.isNotBlank(row.getImportColumn()) && row.isValid()) { @@ -308,15 +307,8 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, } public void setCaracteristicMappingRows(List<EditProtocolCaracteristicsRowModel> caracteristicMappingRows) { - this.caracteristicMappingRows = new HashMap<Caracteristic, EditProtocolCaracteristicsRowModel>( - Maps.uniqueIndex(caracteristicMappingRows, - new Function<EditProtocolCaracteristicsRowModel, Caracteristic>() { - - @Override - public Caracteristic apply(EditProtocolCaracteristicsRowModel editProtocolCaracteristicsRowModel) { - return editProtocolCaracteristicsRowModel.getPsfm(); - } - }) + this.caracteristicMappingRows = new HashMap<>( + Maps.uniqueIndex(caracteristicMappingRows, EditProtocolCaracteristicsRowModel::getPsfm) ); firePropertyChange(PROPERTY_CARACTERISTIC_MAPPING_ROWS, null, caracteristicMappingRows); } @@ -1068,7 +1060,7 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, } public void resetNumbersOfRows() { - numberOfRowsByColumn = new HashMap<String, MutableInt>(); + numberOfRowsByColumn = new HashMap<>(); } public int incNumberOfRows(String column) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/MandatorySampleCategoryColumnIdentifier.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/MandatorySampleCategoryColumnIdentifier.java index c9e8799..4764313 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/MandatorySampleCategoryColumnIdentifier.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/MandatorySampleCategoryColumnIdentifier.java @@ -54,8 +54,7 @@ public class MandatorySampleCategoryColumnIdentifier extends ColumnIdentifier<Ed @Override public Object getValue(EditProtocolSpeciesRowModel entry) { - boolean result = entry.containsMandatorySampleCategoryId(sampleCategoryId); - return result; + return entry.containsMandatorySampleCategoryId(sampleCategoryId); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolBenthosAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolBenthosAction.java index a42f463..e768660 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolBenthosAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolBenthosAction.java @@ -26,16 +26,18 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.service.protocol.ProtocolImportExportService; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolSpeciesRowModel; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUI; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIHandler; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIModel; +import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; +import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import java.io.File; import java.util.List; +import java.util.stream.Collectors; import static org.nuiton.i18n.I18n.t; @@ -95,11 +97,11 @@ public class ExportProtocolBenthosAction extends LongActionSupport<EditProtocolU // build benthos protocol to export List<SpeciesProtocol> protocols = Lists.newArrayList(); - for (EditProtocolSpeciesRowModel row : model.getBenthosRow()) { - if (row.isValid()) { - protocols.add(row.toEntity()); - } - } + protocols.addAll(model.getBenthosRow() + .stream() + .filter(AbstractTuttiBeanUIModel::isValid) + .map(EditProtocolSpeciesRowModel::toEntity) + .collect(Collectors.toList())); // import ProtocolImportExportService service = diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolSpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolSpeciesAction.java index f2026da..35978db 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolSpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolSpeciesAction.java @@ -26,6 +26,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.service.protocol.ProtocolImportExportService; +import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolSpeciesRowModel; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUI; @@ -36,6 +37,7 @@ import org.apache.commons.logging.LogFactory; import java.io.File; import java.util.List; +import java.util.stream.Collectors; import static org.nuiton.i18n.I18n.t; @@ -95,11 +97,11 @@ public class ExportProtocolSpeciesAction extends LongActionSupport<EditProtocolU // build species protocol to export List<SpeciesProtocol> protocols = Lists.newArrayList(); - for (EditProtocolSpeciesRowModel row : model.getSpeciesRow()) { - if (row.isValid()) { - protocols.add(row.toEntity()); - } - } + protocols.addAll(model.getSpeciesRow() + .stream() + .filter(AbstractTuttiBeanUIModel::isValid) + .map(EditProtocolSpeciesRowModel::toEntity) + .collect(Collectors.toList())); ProtocolImportExportService service = getContext().getTuttiProtocolImportExportService(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportPupitriAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportPupitriAction.java index b4cad95..8a1fafe 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportPupitriAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportPupitriAction.java @@ -26,11 +26,11 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.pupitri.PupitriExportService; -import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; -import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolSpeciesRowModel; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUI; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIHandler; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIModel; +import fr.ifremer.tutti.ui.swing.util.AbstractTuttiBeanUIModel; +import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -94,13 +94,11 @@ public class ExportPupitriAction extends LongActionSupport<EditProtocolUIModel, // build species protocol to export List<Species> speciesList = Lists.newArrayList(); - for (EditProtocolSpeciesRowModel row : model.getSpeciesRow()) { - if (row.isValid()) { - Species species = row.getSpecies(); - species.setSurveyCode(row.getSpeciesSurveyCode()); - speciesList.add(species); - } - } + model.getSpeciesRow().stream().filter(AbstractTuttiBeanUIModel::isValid).forEach(row -> { + Species species = row.getSpecies(); + species.setSurveyCode(row.getSpeciesSurveyCode()); + speciesList.add(species); + }); // do Export PupitriExportService service = getContext().getPupitriExportService(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ImportProtocolBenthosAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ImportProtocolBenthosAction.java index e543045..b987bb3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ImportProtocolBenthosAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ImportProtocolBenthosAction.java @@ -152,7 +152,7 @@ public class ImportProtocolBenthosAction extends LongActionSupport<EditProtocolU if (!notImportedBenthos.isEmpty()) { StringBuilder sb = new StringBuilder(); for (Species sp : notImportedBenthos) { - sb.append("<li>" + decorate(sp, DecoratorService.FROM_PROTOCOL) + "</li>"); + sb.append("<li>").append(decorate(sp, DecoratorService.FROM_PROTOCOL)).append("</li>"); } displayWarningMessage( t("tutti.editProtocol.action.importProtocolBenthos.speciesInSpecies.title"), diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ImportProtocolSpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ImportProtocolSpeciesAction.java index b17f66a..eea1d86 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ImportProtocolSpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ImportProtocolSpeciesAction.java @@ -152,7 +152,7 @@ public class ImportProtocolSpeciesAction extends LongActionSupport<EditProtocolU if (!notImportedSpecies.isEmpty()) { StringBuilder sb = new StringBuilder(); for (Species sp : notImportedSpecies) { - sb.append("<li>" + decorate(sp, DecoratorService.FROM_PROTOCOL) + "</li>"); + sb.append("<li>").append(decorate(sp, DecoratorService.FROM_PROTOCOL)).append("</li>"); } displayWarningMessage( t("tutti.editProtocol.action.importProtocolSpecies.speciesInBenthos.title"), diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/RemoveCaracteristicMappingAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/RemoveCaracteristicMappingAction.java index 5fa92bf..0da04fa 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/RemoveCaracteristicMappingAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/RemoveCaracteristicMappingAction.java @@ -80,7 +80,7 @@ public class RemoveCaracteristicMappingAction extends LongActionSupport<EditProt removedCarateristics = Sets.newHashSet(); removedRows = Sets.newHashSet(); - removedRowIndexes = new ArrayList<Integer>(); + removedRowIndexes = new ArrayList<>(); for (Integer rowIndex : SwingUtil.getSelectedModelRows(table)) { @@ -116,9 +116,7 @@ public class RemoveCaracteristicMappingAction extends LongActionSupport<EditProt EditProtocolCaracteristicsTableModel tableModel = (EditProtocolCaracteristicsTableModel) table.getModel(); - for (Integer rowIndex : removedRowIndexes) { - tableModel.removeRow(rowIndex); - } + removedRowIndexes.forEach(tableModel::removeRow); // clear table selection table.clearSelection(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/MinSizePopupUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/MinSizePopupUIHandler.java index 05d4976..4dfc83e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/MinSizePopupUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/MinSizePopupUIHandler.java @@ -25,11 +25,8 @@ package fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import jaxx.runtime.SwingUtil; import jaxx.runtime.validator.swing.SwingValidator; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import javax.swing.JComponent; - import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; @@ -41,9 +38,6 @@ import static org.nuiton.i18n.I18n.t; */ public class MinSizePopupUIHandler extends AbstractTuttiUIHandler<MinSizePopupUIModel, MinSizePopupUI> { - /** Logger. */ - private static final Log log = LogFactory.getLog(MinSizePopupUIHandler.class); - @Override public void afterInit(MinSizePopupUI ui) { initUI(ui); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/DeleteRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/DeleteRowAction.java index 8e940b3..372fc3b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/DeleteRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/DeleteRowAction.java @@ -31,8 +31,6 @@ import fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.Calcif import fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.CalcifiedPiecesSamplingEditorTableModel; import fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.CalcifiedPiecesSamplingEditorUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import javax.swing.JOptionPane; @@ -46,9 +44,6 @@ import static org.nuiton.i18n.I18n.t; */ public class DeleteRowAction extends SimpleActionSupport<CalcifiedPiecesSamplingEditorUI> { - /** Logger. */ - private static final Log log = LogFactory.getLog(DeleteRowAction.class); - public DeleteRowAction(CalcifiedPiecesSamplingEditorUI ui) { super(ui); } @@ -68,8 +63,7 @@ public class DeleteRowAction extends SimpleActionSupport<CalcifiedPiecesSampling if (row.getMinSize() > 0) { EditProtocolSpeciesRowModel speciesToDelete = row.getProtocolSpecies(); - String decoratedSpecies = ui.getHandler().getDecorator(Species.class, null).toString(speciesToDelete.getSpecies()); - String decoratedRow = decoratedSpecies; + String decoratedRow = ui.getHandler().getDecorator(Species.class, null).toString(speciesToDelete.getSpecies()); if (row.getMaturity() != null) { decoratedRow += " (" + ui.getHandler().getDecorator(Boolean.class, DecoratorService.MATURITY).toString(row.getMaturity()) + ")"; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/DeleteSpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/DeleteSpeciesAction.java index 1c06273..535822f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/DeleteSpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/DeleteSpeciesAction.java @@ -31,8 +31,6 @@ import fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.Calcif import fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.CalcifiedPiecesSamplingEditorTableModel; import fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.CalcifiedPiecesSamplingEditorUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import javax.swing.JOptionPane; @@ -48,9 +46,6 @@ import static org.nuiton.i18n.I18n.t; */ public class DeleteSpeciesAction extends SimpleActionSupport<CalcifiedPiecesSamplingEditorUI> { - /** Logger. */ - private static final Log log = LogFactory.getLog(DeleteSpeciesAction.class); - public DeleteSpeciesAction(CalcifiedPiecesSamplingEditorUI ui) { super(ui); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/ExportProtocolCpsAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/ExportProtocolCpsAction.java index 2e97311..0d41801 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/ExportProtocolCpsAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/ExportProtocolCpsAction.java @@ -51,8 +51,7 @@ public class ExportProtocolCpsAction extends LongActionSupport<EditProtocolUIMod CalcifiedPiecesSamplingEditorUIHandler> { /** Logger. */ - private static final Log log = - LogFactory.getLog(ExportProtocolCpsAction.class); + private static final Log log = LogFactory.getLog(ExportProtocolCpsAction.class); private File file; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/ImportProtocolCpsAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/ImportProtocolCpsAction.java index a6cc75f..22d6556 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/ImportProtocolCpsAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/ImportProtocolCpsAction.java @@ -58,8 +58,7 @@ import static org.nuiton.i18n.I18n.t; public class ImportProtocolCpsAction extends LongActionSupport<EditProtocolUIModel, CalcifiedPiecesSamplingEditorUI, CalcifiedPiecesSamplingEditorUIHandler> { /** Logger. */ - private static final Log log = - LogFactory.getLog(ImportProtocolCpsAction.class); + private static final Log log = LogFactory.getLog(ImportProtocolCpsAction.class); private File file; @@ -159,7 +158,7 @@ public class ImportProtocolCpsAction extends LongActionSupport<EditProtocolUIMod if (!notImportedSpecies.isEmpty()) { StringBuilder sb = new StringBuilder(); for (Species sp : notImportedSpecies) { - sb.append("<li>" + decorate(sp, DecoratorService.FROM_PROTOCOL) + "</li>"); + sb.append("<li>").append(decorate(sp, DecoratorService.FROM_PROTOCOL)).append("</li>"); } displayWarningMessage( t("tutti.editProtocol.action.importProtocolCps.speciesNotImported.title"), diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/SplitSpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/SplitSpeciesAction.java index ff6c960..d666f6f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/SplitSpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/SplitSpeciesAction.java @@ -29,8 +29,6 @@ import fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.Calcif import fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.CalcifiedPiecesSamplingEditorUI; import fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.MinSizePopupUI; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import java.util.List; @@ -41,9 +39,6 @@ import java.util.List; */ public class SplitSpeciesAction extends SimpleActionSupport<CalcifiedPiecesSamplingEditorUI> { - /** Logger. */ - private static final Log log = LogFactory.getLog(SplitSpeciesAction.class); - public SplitSpeciesAction(CalcifiedPiecesSamplingEditorUI ui) { super(ui); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpButton.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpButton.java index 1fba689..5509afd 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpButton.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpButton.java @@ -27,13 +27,9 @@ package fr.ifremer.tutti.ui.swing.content.protocol.rtp; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolSpeciesTableModel; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUI; import jaxx.runtime.SwingUtil; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import javax.swing.JToggleButton; import javax.swing.RowSorter; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; @@ -46,9 +42,6 @@ import static org.nuiton.i18n.I18n.t; */ public class RtpButton extends JToggleButton { - /** Logger. */ - private static final Log log = LogFactory.getLog(RtpButton.class); - private static final long serialVersionUID = 1L; protected final RtpEditorUI popup; @@ -80,20 +73,16 @@ public class RtpButton extends JToggleButton { } }); - addActionListener(new ActionListener() { - - @Override - public void actionPerformed(ActionEvent e) { - if (isSelected()) { - if (!popup.isVisible()) { - SwingUtil.center(ui.getHandler().getContext().getMainUI(), popup); - popup.openEditor(); - } + addActionListener(e -> { + if (isSelected()) { + if (!popup.isVisible()) { + SwingUtil.center(ui.getHandler().getContext().getMainUI(), popup); + popup.openEditor(); } + } // else { // popup.closeEditor(); // } - } }); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpCellRenderer.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpCellRenderer.java index 9233a23..6f067f6 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpCellRenderer.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpCellRenderer.java @@ -27,8 +27,6 @@ package fr.ifremer.tutti.ui.swing.content.protocol.rtp; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolSpeciesRowModel; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolSpeciesTableModel; import jaxx.runtime.SwingUtil; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import javax.swing.JComponent; import javax.swing.JTable; @@ -47,9 +45,6 @@ import static org.nuiton.i18n.I18n.t; */ public class RtpCellRenderer extends DefaultTableCellRenderer { - /** Logger. */ - private static final Log log = LogFactory.getLog(RtpCellRenderer.class); - public static final String TEXT_PATTERN = "<html><body>%s</body></html>"; private static final long serialVersionUID = 1L; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIHandler.java index 95ba647..a802e4f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/rtp/RtpEditorUIHandler.java @@ -37,8 +37,6 @@ import javax.swing.JComponent; import javax.swing.JOptionPane; import javax.swing.RowSorter; import java.awt.Component; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import static org.nuiton.i18n.I18n.t; @@ -81,22 +79,18 @@ public class RtpEditorUIHandler extends AbstractTuttiUIHandler<RtpEditorUIModel, listModelIsModify(model); listenValidatorValid(ui.getValidator(), model); - model.addPropertyChangeListener(RtpEditorUIModel.PROPERTY_ROW, new PropertyChangeListener() { + model.addPropertyChangeListener(RtpEditorUIModel.PROPERTY_ROW, evt -> { + EditProtocolSpeciesRowModel rowModel = getModel().getRowModel(); - @Override - public void propertyChange(PropertyChangeEvent evt) { - EditProtocolSpeciesRowModel rowModel = getModel().getRowModel(); + Species species = rowModel.getSpecies(); - Species species = rowModel.getSpecies(); + String decorate = decorate(species); - String decorate = decorate(species); - - if (log.isInfoEnabled()) { - log.info("Edit RTP for species: " + decorate); - } - - getUI().getBodyPanel().setTitle(t("tutti.rtpEdit.title", decorate)); + if (log.isInfoEnabled()) { + log.info("Edit RTP for species: " + decorate); } + + getUI().getBodyPanel().setTitle(t("tutti.rtpEdit.title", decorate)); }); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/AddStratasAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/AddStratasAction.java index a319ca0..e4c8e1b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/AddStratasAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/AddStratasAction.java @@ -33,8 +33,6 @@ import fr.ifremer.tutti.ui.swing.content.protocol.zones.tree.StrataNode; import fr.ifremer.tutti.ui.swing.content.protocol.zones.tree.SubStrataNode; import fr.ifremer.tutti.ui.swing.content.protocol.zones.tree.ZoneNode; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import javax.swing.JTree; import javax.swing.tree.TreePath; @@ -49,9 +47,6 @@ import java.util.stream.Collectors; */ public class AddStratasAction extends SimpleActionSupport<ZoneEditorUI> { - /** Logger. */ - private static final Log log = LogFactory.getLog(AddStratasAction.class); - public AddStratasAction(ZoneEditorUI zoneEditorUI) { super(zoneEditorUI); setEnabled(false); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/CreateZoneAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/CreateZoneAction.java index 7c559be..12fd8ad 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/CreateZoneAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/CreateZoneAction.java @@ -30,8 +30,6 @@ import fr.ifremer.tutti.ui.swing.content.protocol.zones.tree.ZoneNode; import fr.ifremer.tutti.ui.swing.content.protocol.zones.tree.ZonesTreeModel; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import javax.swing.JOptionPane; import javax.swing.JTree; @@ -45,9 +43,6 @@ import static org.nuiton.i18n.I18n.t; */ public class CreateZoneAction extends SimpleActionSupport<ZoneEditorUI> { - /** Logger. */ - private static final Log log = LogFactory.getLog(CreateZoneAction.class); - public CreateZoneAction(ZoneEditorUI zoneEditorUI) { super(zoneEditorUI); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/DeleteZoneAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/DeleteZoneAction.java index e8c70d1..30db550 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/DeleteZoneAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/DeleteZoneAction.java @@ -28,8 +28,6 @@ import fr.ifremer.tutti.persistence.entities.protocol.Zone; import fr.ifremer.tutti.ui.swing.content.protocol.zones.ZoneEditorUI; import fr.ifremer.tutti.ui.swing.content.protocol.zones.tree.ZoneNode; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import javax.swing.JOptionPane; import javax.swing.JTree; @@ -43,9 +41,6 @@ import static org.nuiton.i18n.I18n.t; */ public class DeleteZoneAction extends SimpleActionSupport<ZoneEditorUI> { - /** Logger. */ - private static final Log log = LogFactory.getLog(DeleteZoneAction.class); - public DeleteZoneAction(ZoneEditorUI zoneEditorUI) { super(zoneEditorUI); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/RenameZoneAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/RenameZoneAction.java index 01e1e32..49587e4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/RenameZoneAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/RenameZoneAction.java @@ -29,8 +29,6 @@ import fr.ifremer.tutti.ui.swing.content.protocol.zones.ZoneEditorUI; import fr.ifremer.tutti.ui.swing.content.protocol.zones.tree.ZoneNode; import fr.ifremer.tutti.ui.swing.util.actions.SimpleActionSupport; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import javax.swing.JOptionPane; import javax.swing.JTree; @@ -44,9 +42,6 @@ import static org.nuiton.i18n.I18n.t; */ public class RenameZoneAction extends SimpleActionSupport<ZoneEditorUI> { - /** Logger. */ - private static final Log log = LogFactory.getLog(RenameZoneAction.class); - public RenameZoneAction(ZoneEditorUI zoneEditorUI) { super(zoneEditorUI); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/AbstractZoneEditorTreeModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/AbstractZoneEditorTreeModel.java index a5aad35..8135eb0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/AbstractZoneEditorTreeModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/AbstractZoneEditorTreeModel.java @@ -24,9 +24,6 @@ package fr.ifremer.tutti.ui.swing.content.protocol.zones.tree; * #L% */ -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import javax.swing.tree.DefaultTreeModel; /** @@ -35,9 +32,6 @@ import javax.swing.tree.DefaultTreeModel; */ public abstract class AbstractZoneEditorTreeModel extends DefaultTreeModel { - /** Logger. */ - private static final Log log = LogFactory.getLog(AbstractZoneEditorTreeModel.class); - public AbstractZoneEditorTreeModel(String rootLabel) { super(new ZoneEditorNode(rootLabel)); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StratasTreeModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StratasTreeModel.java index c44d108..9129e3f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StratasTreeModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/StratasTreeModel.java @@ -27,8 +27,6 @@ package fr.ifremer.tutti.ui.swing.content.protocol.zones.tree; import com.google.common.base.Preconditions; import fr.ifremer.tutti.ui.swing.content.protocol.zones.models.StrataUIModel; import fr.ifremer.tutti.ui.swing.content.protocol.zones.models.SubStrataUIModel; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import javax.swing.tree.DefaultMutableTreeNode; import java.util.Collection; @@ -43,9 +41,6 @@ import static org.nuiton.i18n.I18n.t; */ public class StratasTreeModel extends AbstractZoneEditorTreeModel { - /** Logger. */ - private static final Log log = LogFactory.getLog(StratasTreeModel.class); - public StratasTreeModel() { super(t("tutti.zoneEditor.availableStratas.root.label")); } @@ -66,7 +61,7 @@ public class StratasTreeModel extends AbstractZoneEditorTreeModel { } } - nodesToRemove.forEach(strataNode ->removeNodeFromParent(strataNode)); + nodesToRemove.forEach(this::removeNodeFromParent); } public void addStratas(Collection<StrataUIModel> stratasToAdd) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorNode.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorNode.java index 97c9daa..44f0c3b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorNode.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorNode.java @@ -24,9 +24,6 @@ package fr.ifremer.tutti.ui.swing.content.protocol.zones.tree; * #L% */ -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import javax.swing.tree.DefaultMutableTreeNode; import java.util.ArrayList; import java.util.Collections; @@ -38,9 +35,6 @@ import java.util.List; */ public class ZoneEditorNode extends DefaultMutableTreeNode implements Comparable { - /** Logger. */ - private static final Log log = LogFactory.getLog(ZoneEditorNode.class); - public ZoneEditorNode(String label) { super(label); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorTreeCellRenderer.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorTreeCellRenderer.java index c97fd63..1edf7e9 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorTreeCellRenderer.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZoneEditorTreeCellRenderer.java @@ -25,8 +25,6 @@ package fr.ifremer.tutti.ui.swing.content.protocol.zones.tree; */ import jaxx.runtime.SwingUtil; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import javax.swing.JTree; import javax.swing.tree.DefaultTreeCellRenderer; @@ -38,9 +36,6 @@ import java.awt.Component; */ public class ZoneEditorTreeCellRenderer extends DefaultTreeCellRenderer { - /** Logger. */ - private static final Log log = LogFactory.getLog(ZoneEditorTreeCellRenderer.class); - @Override public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZonesTreeModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZonesTreeModel.java index c4bee59..9be292a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZonesTreeModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/ZonesTreeModel.java @@ -70,7 +70,7 @@ public class ZonesTreeModel extends AbstractZoneEditorTreeModel { } } - nodesToRemove.forEach(zoneNode ->removeNodeFromParent(zoneNode)); + nodesToRemove.forEach(this::removeNodeFromParent); } public void addZones(Collection<ZoneUIModel> zonesToAdd) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryGearAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryGearAction.java index 88619af..10d3188 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryGearAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryGearAction.java @@ -47,11 +47,10 @@ public class ImportTemporaryGearAction extends ImportTemporaryActionSupport<Gear @Override protected File chooseImportFile() { - File file = chooseFile( + return chooseFile( t("tutti.manageTemporaryReferential.title.choose.importTemporaryGearFile"), t("tutti.manageTemporaryReferential.action.chooseReferentialGearFile.import"), "^.*\\.csv", t("tutti.common.file.csv")); - return file; } @@ -59,8 +58,7 @@ public class ImportTemporaryGearAction extends ImportTemporaryActionSupport<Gear protected ReferentialImportResult<Gear> doImport(File file) { ReferentialTemporaryGearService service = getContext().getReferentialTemporaryGearService(); - ReferentialImportResult<Gear> importResult = service.importTemporaryGear(file); - return importResult; + return service.importTemporaryGear(file); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryPersonAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryPersonAction.java index 116b7fe..d308f30 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryPersonAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryPersonAction.java @@ -46,11 +46,10 @@ public class ImportTemporaryPersonAction extends ImportTemporaryActionSupport<Pe @Override protected File chooseImportFile() { - File file = chooseFile( + return chooseFile( t("tutti.manageTemporaryReferential.title.choose.importTemporaryPersonFile"), t("tutti.manageTemporaryReferential.action.chooseReferentialPersonFile.import"), "^.*\\.csv", t("tutti.common.file.csv")); - return file; } @@ -58,8 +57,7 @@ public class ImportTemporaryPersonAction extends ImportTemporaryActionSupport<Pe protected ReferentialImportResult<Person> doImport(File file) { ReferentialTemporaryPersonService service = getContext().getReferentialTemporaryPersonService(); - ReferentialImportResult<Person> importResult = service.importTemporaryPerson(file); - return importResult; + return service.importTemporaryPerson(file); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporarySpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporarySpeciesAction.java index a7565b0..1b96ca7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporarySpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporarySpeciesAction.java @@ -47,11 +47,10 @@ public class ImportTemporarySpeciesAction extends ImportTemporaryActionSupport<S @Override protected File chooseImportFile() { - File file = chooseFile( + return chooseFile( t("tutti.manageTemporaryReferential.title.choose.importTemporarySpeciesFile"), t("tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile.import"), "^.*\\.csv", t("tutti.common.file.csv")); - return file; } @@ -59,8 +58,7 @@ public class ImportTemporarySpeciesAction extends ImportTemporaryActionSupport<S protected ReferentialImportResult<Species> doImport(File file) { ReferentialTemporarySpeciesService service = getContext().getReferentialTemporarySpeciesService(); - ReferentialImportResult<Species> result = service.importTemporarySpecies(file); - return result; + return service.importTemporarySpecies(file); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryVesselAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryVesselAction.java index 71a1ce5..23e377d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryVesselAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/ImportTemporaryVesselAction.java @@ -47,11 +47,10 @@ public class ImportTemporaryVesselAction extends ImportTemporaryActionSupport<Ve @Override protected File chooseImportFile() { - File file = chooseFile( + return chooseFile( t("tutti.manageTemporaryReferential.title.choose.importTemporaryVesselFile"), t("tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import"), "^.*\\.csv", t("tutti.common.file.csv")); - return file; } @@ -59,8 +58,7 @@ public class ImportTemporaryVesselAction extends ImportTemporaryActionSupport<Ve protected ReferentialImportResult<Vessel> doImport(File file) { ReferentialTemporaryVesselService service = getContext().getReferentialTemporaryVesselService(); - ReferentialImportResult<Vessel> result = service.importTemporaryVessel(file); - return result; + return service.importTemporaryVessel(file); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporaryGearUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporaryGearUIAction.java index 6d2c283..a10b2a2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporaryGearUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporaryGearUIAction.java @@ -71,8 +71,7 @@ public class OpenReplaceTemporaryGearUIAction extends AbstractOpenReplaceTempora @Override protected List<Gear> getTargetList(PersistenceService persistenceService) { - List<Gear> targetList = Lists.newArrayList(persistenceService.getAllGear()); - return targetList; + return Lists.newArrayList(persistenceService.getAllGear()); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporaryPersonUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporaryPersonUIAction.java index 9f8e2cd..04dddf5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporaryPersonUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporaryPersonUIAction.java @@ -71,8 +71,7 @@ public class OpenReplaceTemporaryPersonUIAction extends AbstractOpenReplaceTempo @Override protected List<Person> getTargetList(PersistenceService persistenceService) { - List<Person> targetList = Lists.newArrayList(persistenceService.getAllPerson()); - return targetList; + return Lists.newArrayList(persistenceService.getAllPerson()); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporarySpeciesUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporarySpeciesUIAction.java index 2645fbc..b5901f4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporarySpeciesUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporarySpeciesUIAction.java @@ -71,8 +71,7 @@ public class OpenReplaceTemporarySpeciesUIAction extends AbstractOpenReplaceTemp @Override protected List<Species> getTargetList(PersistenceService persistenceService) { - List<Species> targetList = Lists.newArrayList(persistenceService.getAllReferentSpecies()); - return targetList; + return Lists.newArrayList(persistenceService.getAllReferentSpecies()); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporaryVesselUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporaryVesselUIAction.java index 9228c29..625c940 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporaryVesselUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/actions/OpenReplaceTemporaryVesselUIAction.java @@ -71,8 +71,7 @@ public class OpenReplaceTemporaryVesselUIAction extends AbstractOpenReplaceTempo @Override protected List<Vessel> getTargetList(PersistenceService persistenceService) { - List<Vessel> targetList = Lists.newArrayList(persistenceService.getAllVessel()); - return targetList; + return Lists.newArrayList(persistenceService.getAllVessel()); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java index eb3cb8a..5917bdb 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIHandler.java @@ -64,7 +64,7 @@ public class ReportUIHandler extends AbstractTuttiUIHandler<ReportUIModel, Repor model.setProgramId(programId); // set cruiseId - String cruiseId = getDataContext().getCruiseId(); + Integer cruiseId = getDataContext().getCruiseId(); model.setCruiseId(cruiseId); // get all report availables diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel.java index 48163ca..1e2ecce 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/ReportUIModel.java @@ -65,7 +65,7 @@ public class ReportUIModel extends AbstractTuttiBeanUIModel<ReportGenerationRequ protected String programId; - protected String cruiseId; + protected Integer cruiseId; protected FishingOperation fishingOperation; @@ -109,16 +109,16 @@ public class ReportUIModel extends AbstractTuttiBeanUIModel<ReportGenerationRequ this.programId = programId; } - public String getCruiseId() { + public Integer getCruiseId() { return cruiseId; } - public void setCruiseId(String cruiseId) { + public void setCruiseId(Integer cruiseId) { this.cruiseId = cruiseId; } - public String getFishingOperationId() { - return fishingOperation == null ? null : fishingOperation.getId(); + public Integer getFishingOperationId() { + return fishingOperation == null ? null : fishingOperation.getIdAsInt(); } public FishingOperation getFishingOperation() { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/ValidateCruiseUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/ValidateCruiseUIHandler.java index 69bc78e..bb2c7f9 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/ValidateCruiseUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/ValidateCruiseUIHandler.java @@ -84,8 +84,8 @@ public class ValidateCruiseUIHandler extends AbstractTuttiUIHandler<ValidateCrui ApplicationActionUIModel actionUIModel = getContext().getActionUI().getModel(); actionUIModel.setProgressionModel(progressionModel); - String cruiseId = getDataContext().getCruiseId(); - List<String> operationIds = getPersistenceService().getAllFishingOperationIds(cruiseId); + Integer cruiseId = getDataContext().getCruiseId(); + List<Integer> operationIds = getPersistenceService().getAllFishingOperationIds(cruiseId); progressionModel.setTotal(2 * operationIds.size() + 2); NuitonValidatorResult cruiseValidatorResult = getValidateCruiseOperationsService().validateCruise(progressionModel, cruiseId); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/ValidateCruiseUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/ValidateCruiseUIModel.java index fc9bb31..11eccf6 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/ValidateCruiseUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/ValidateCruiseUIModel.java @@ -55,7 +55,7 @@ public class ValidateCruiseUIModel extends AbstractSerializableBean { protected FishingOperation selectedFishingOperation; - protected final LinkedHashMap<FishingOperation, NuitonValidatorResult> validator = new LinkedHashMap<FishingOperation, NuitonValidatorResult>(); + protected final LinkedHashMap<FishingOperation, NuitonValidatorResult> validator = new LinkedHashMap<>(); protected NuitonValidatorResult cruiseValidatorResult; @@ -91,7 +91,7 @@ public class ValidateCruiseUIModel extends AbstractSerializableBean { } public Map<FishingOperation, NuitonValidatorResult> getValidator() { - return new HashMap<FishingOperation, NuitonValidatorResult>(validator); + return new HashMap<>(validator); } public Set<FishingOperation> getFishingOperations() { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/actions/SaveCruiseToReadyToSynchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/actions/SaveCruiseToReadyToSynchAction.java index 855823a..34a0216 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/actions/SaveCruiseToReadyToSynchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/actions/SaveCruiseToReadyToSynchAction.java @@ -65,7 +65,7 @@ public class SaveCruiseToReadyToSynchAction extends LongActionSupport<ValidateCr } PersistenceService persistenceService = getContext().getPersistenceService(); - int fishingOperationCount = persistenceService.getFishingOperationCount(getModel().getCruise().getId()); + int fishingOperationCount = persistenceService.getFishingOperationCount(getModel().getCruise().getIdAsInt()); createProgressionModelIfRequired(fishingOperationCount + 1); return doAction; @@ -81,9 +81,9 @@ public class SaveCruiseToReadyToSynchAction extends LongActionSupport<ValidateCr ProgressionModel progressionModel = getProgressionModel(); - List<String> allFishingOperation = persistenceService.getAllFishingOperationIds(getModel().getCruise().getId()); + List<Integer> allFishingOperation = persistenceService.getAllFishingOperationIds(getModel().getCruise().getIdAsInt()); - for (String fishingOperationId : allFishingOperation) { + for (Integer fishingOperationId : allFishingOperation) { if (log.isInfoEnabled()) { log.info("Recompute sample ratios for operation " + fishingOperationId); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/tree/MessageTreeNode.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/tree/MessageTreeNode.java index b6f0469..3149a45 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/tree/MessageTreeNode.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/tree/MessageTreeNode.java @@ -46,8 +46,8 @@ public class MessageTreeNode extends TuttiMessageNodeSupport<String> { this.scope = scope; } - public NuitonValidatorScope getScope() { - return scope; - } +// public NuitonValidatorScope getScope() { +// return scope; +// } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/update/Updates.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/update/Updates.java index 992b7df..bbe2978 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/update/Updates.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/update/Updates.java @@ -50,9 +50,8 @@ public class Updates { String updateDataUrl = config.getUpdateDataUrl(); File dataDirectory = config.getDataDirectory(); Map<String, ApplicationInfo> dbVersions = up.getVersions(updateDataUrl, dataDirectory); - ApplicationInfo applicationInfo = dbVersions.get(UpdateModule.db.name()); - return applicationInfo; + return dbVersions.get(UpdateModule.db.name()); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/update/module/DbModuleUpdater.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/update/module/DbModuleUpdater.java index 96731d6..dc9d10c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/update/module/DbModuleUpdater.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/update/module/DbModuleUpdater.java @@ -43,8 +43,6 @@ import org.nuiton.jaxx.application.type.ApplicationProgressionModel; import org.nuiton.updater.ApplicationInfo; import org.nuiton.updater.ApplicationUpdater; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.io.File; import java.io.IOException; @@ -230,8 +228,7 @@ public class DbModuleUpdater extends ModuleUpdaterSupport { File[] sources = info.destDir.listFiles(); Preconditions.checkNotNull(sources, "Downloaded db must have at least on directory, see " + info.destDir); Preconditions.checkState(sources.length == 1, "Downloaded db should contains one directory at " + info.destDir); - File result = sources[0]; - return result; + return sources[0]; } protected File getDbDirectoryCopy(File source) { @@ -265,12 +262,7 @@ public class DbModuleUpdater extends ModuleUpdaterSupport { public DelegateProgressionModel(fr.ifremer.adagio.core.type.ProgressionModel progressionModel) { this.progressionModel = progressionModel; - this.progressionModel.addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - firePropertyChange(evt.getPropertyName(), evt.getOldValue(), evt.getNewValue()); - } - }); + this.progressionModel.addPropertyChangeListener(evt -> firePropertyChange(evt.getPropertyName(), evt.getOldValue(), evt.getNewValue())); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java index 7b8aa6c..c4629fa 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java @@ -48,14 +48,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.JXTitledPanel; -import org.jdesktop.swingx.decorator.ComponentAdapter; import org.jdesktop.swingx.decorator.FontHighlighter; import org.jdesktop.swingx.decorator.HighlightPredicate; import org.jdesktop.swingx.decorator.Highlighter; import org.jdesktop.swingx.table.TableColumnExt; import org.nuiton.decorator.Decorator; import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; -import org.nuiton.jaxx.application.swing.action.ApplicationActionUI; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.nuiton.jaxx.application.swing.util.ActionListCellRenderer; @@ -71,16 +69,12 @@ import javax.swing.JLabel; import javax.swing.JTable; import javax.swing.JTextField; import javax.swing.border.LineBorder; -import javax.swing.event.TableModelEvent; -import javax.swing.event.TableModelListener; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumnModel; import java.awt.Color; import java.awt.Component; import java.awt.Font; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.beans.PropertyChangeEvent; @@ -140,9 +134,8 @@ public abstract class AbstractTuttiUIHandler<M, UI extends TuttiUI<M, ?>> extend @Override public Component getTopestUI() { Component result; - ApplicationActionUI actionUI = getContext().getActionUI(); -// if (actionUI.isVisible()) { - result = actionUI; + // if (actionUI.isVisible()) { + result = getContext().getActionUI(); // } else { // result = getContext().getMainUI(); // } @@ -202,20 +195,17 @@ public abstract class AbstractTuttiUIHandler<M, UI extends TuttiUI<M, ?>> extend protected void addHighlighters(final JXTable table) { HighlightPredicate notSelectedPredicate = new HighlightPredicate.NotHighlightPredicate(HighlightPredicate.IS_SELECTED); - HighlightPredicate rowIsInvalidPredicate = new HighlightPredicate() { - @Override - public boolean isHighlighted(Component renderer, ComponentAdapter adapter) { - - boolean result = false; - if (adapter.isEditable()) { - AbstractApplicationTableModel model = (AbstractApplicationTableModel) table.getModel(); - int viewRow = adapter.row; - int modelRow = adapter.convertRowIndexToModel(viewRow); - AbstractTuttiBeanUIModel row = (AbstractTuttiBeanUIModel) model.getEntry(modelRow); - result = !row.isValid(); - } - return result; + HighlightPredicate rowIsInvalidPredicate = (renderer, adapter) -> { + + boolean result = false; + if (adapter.isEditable()) { + AbstractApplicationTableModel model = (AbstractApplicationTableModel) table.getModel(); + int viewRow = adapter.row; + int modelRow = adapter.convertRowIndexToModel(viewRow); + AbstractTuttiBeanUIModel row = (AbstractTuttiBeanUIModel) model.getEntry(modelRow); + result = !row.isValid(); } + return result; }; HighlightPredicate rowIsValidPredicate = new HighlightPredicate.NotHighlightPredicate(rowIsInvalidPredicate); @@ -295,13 +285,10 @@ public abstract class AbstractTuttiUIHandler<M, UI extends TuttiUI<M, ?>> extend } protected void listenModelModifiy(AbstractTuttiBeanUIModel model) { - model.addPropertyChangeListener(AbstractTuttiBeanUIModel.PROPERTY_MODIFY, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - Boolean modify = (Boolean) evt.getNewValue(); - if (modify != null && modify) { - ((AbstractTuttiBeanUIModel) getModel()).setModify(true); - } + model.addPropertyChangeListener(AbstractTuttiBeanUIModel.PROPERTY_MODIFY, evt -> { + Boolean modify = (Boolean) evt.getNewValue(); + if (modify != null && modify) { + ((AbstractTuttiBeanUIModel) getModel()).setModify(true); } }); } @@ -338,12 +325,9 @@ public abstract class AbstractTuttiUIHandler<M, UI extends TuttiUI<M, ?>> extend comboBox.setRenderer(new ActionListCellRenderer()); comboBox.setModel(new DefaultComboBoxModel(comboboxActions.toArray())); - comboBox.addPropertyChangeListener("enabled", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - JComboBox source = (JComboBox) evt.getSource(); - source.setFocusable((Boolean) evt.getNewValue()); - } + comboBox.addPropertyChangeListener("enabled", evt -> { + JComboBox source = (JComboBox) evt.getSource(); + source.setFocusable((Boolean) evt.getNewValue()); }); comboBox.addMouseListener(new MouseAdapter() { @Override @@ -379,26 +363,22 @@ public abstract class AbstractTuttiUIHandler<M, UI extends TuttiUI<M, ?>> extend } }); - comboBox.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { + comboBox.addActionListener(e -> { - JComboBox source = (JComboBox) e.getSource(); - Boolean canEdit = (Boolean) source.getClientProperty("_canEdit_"); - if (canEdit == null || canEdit) { - - JButton selectedAction = (JButton) source.getSelectedItem(); - // hide popup before performing the action, otherwise, if the action - // opens a popup, the user must click a first time to hide the combobox - // popup to then interact with the popup opened by the action - // (see http://forge.codelutin.com/issues/2032) - source.setSelectedIndex(0); - source.hidePopup(); - getContext().getActionEngine().runAction(selectedAction); + JComboBox source = (JComboBox) e.getSource(); + Boolean canEdit = (Boolean) source.getClientProperty("_canEdit_"); + if (canEdit == null || canEdit) { - } - } + JButton selectedAction = (JButton) source.getSelectedItem(); + // hide popup before performing the action, otherwise, if the action + // opens a popup, the user must click a first time to hide the combobox + // popup to then interact with the popup opened by the action + // (see http://forge.codelutin.com/issues/2032) + source.setSelectedIndex(0); + source.hidePopup(); + getContext().getActionEngine().runAction(selectedAction); + } }); } } @@ -554,31 +534,25 @@ public abstract class AbstractTuttiUIHandler<M, UI extends TuttiUI<M, ?>> extend protected void listenValidatorValid(SimpleBeanValidator validator, final AbstractTuttiBeanUIModel model) { - validator.addPropertyChangeListener(SimpleBeanValidator.VALID_PROPERTY, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (log.isDebugEnabled()) { - log.debug("Model [" + model + - "] pass to valid state [" + - evt.getNewValue() + "]"); - } - model.setValid((Boolean) evt.getNewValue()); + validator.addPropertyChangeListener(SimpleBeanValidator.VALID_PROPERTY, evt -> { + if (log.isDebugEnabled()) { + log.debug("Model [" + model + + "] pass to valid state [" + + evt.getNewValue() + "]"); } + model.setValid((Boolean) evt.getNewValue()); }); } protected void listenValidationTableHasNoFatalError(final SimpleBeanValidator validator, final AbstractTuttiBeanUIModel model) { - getContext().getMainUI().getValidatorMessageWidget().addTableModelListener(new TableModelListener() { - @Override - public void tableChanged(TableModelEvent e) { - boolean valid = !validator.hasFatalErrors(); - if (log.isDebugEnabled()) { - log.debug("Model [" + model + - "] pass to valid state [" + valid + "]"); - } - model.setValid(valid); + getContext().getMainUI().getValidatorMessageWidget().addTableModelListener(e -> { + boolean valid = !validator.hasFatalErrors(); + if (log.isDebugEnabled()) { + log.debug("Model [" + model + + "] pass to valid state [" + valid + "]"); } + model.setValid(valid); }); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java index d8df4f1..6de60a3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java @@ -233,15 +233,13 @@ public final class TuttiUIUtil extends ApplicationUIUtil { //FIXME move to jaxx public static void collapseTree(final JTree tree) { - SwingUtilities.invokeLater(new Runnable() { - public void run() { - int i = 0; - - while(i < tree.getRowCount()) { - tree.collapseRow(i++); - } + SwingUtilities.invokeLater(() -> { + int i = 0; + while(i < tree.getRowCount()) { + tree.collapseRow(i++); } + }); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/actions/SimpleActionSupport.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/actions/SimpleActionSupport.java index 2f2f08a..822cfdd 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/actions/SimpleActionSupport.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/actions/SimpleActionSupport.java @@ -58,17 +58,7 @@ public abstract class SimpleActionSupport<UI extends JAXXObject> extends Abstrac if (invokeLater) { - SwingUtilities.invokeLater( - new Runnable() { - - @Override - public void run() { - - onActionPerformed(ui); - - } - } - ); + SwingUtilities.invokeLater(() -> onActionPerformed(ui)); } else { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/ButtonAttachment.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/ButtonAttachment.java index cb43f12..a18c751 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/ButtonAttachment.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/ButtonAttachment.java @@ -37,7 +37,6 @@ import java.awt.event.HierarchyBoundsAdapter; import java.awt.event.HierarchyEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; @@ -60,7 +59,7 @@ public class ButtonAttachment extends JToggleButton { private transient PropertyChangeListener listenAttachmentsChanged; - protected Point popupPosition = null; +// protected Point popupPosition = null; protected boolean popupMoving; @@ -93,7 +92,7 @@ public class ButtonAttachment extends JToggleButton { addChangeListener(new ChangeListener() { @Override public void stateChanged(ChangeEvent e) { - if (isSelected()) { + if (ButtonAttachment.this.isSelected()) { if (!popup.isVisible()) { popup.openEditor(ButtonAttachment.this); } @@ -165,14 +164,11 @@ public class ButtonAttachment extends JToggleButton { protected PropertyChangeListener getListenAttachmentsChanged() { if (listenAttachmentsChanged == null) { - listenAttachmentsChanged = new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { + listenAttachmentsChanged = evt -> { // List<Attachment> attachment = (List<Attachment>) evt.getNewValue(); // setText(getButtonText(attachment)); - if (!popup.isVisible()) { - init(); - } + if (!popup.isVisible()) { + init(); } }; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java index 105a56a..ff27c94 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java @@ -260,8 +260,7 @@ public class CaracteristicMapCellComponent extends DefaultTableCellRenderer { Preconditions.checkNotNull(editRow, "No editRow found in editor."); - Object result = editRow.getCaracteristics(); - return result; + return editRow.getCaracteristics(); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorTableModel.java index 5622d73..0a1551d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorTableModel.java @@ -53,7 +53,6 @@ public class CaracteristicMapEditorTableModel extends AbstractApplicationTableMo @Override public CaracteristicMapEditorRowModel createNewRow() { - CaracteristicMapEditorRowModel result = new CaracteristicMapEditorRowModel(); - return result; + return new CaracteristicMapEditorRowModel(); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueEditor.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueEditor.java index 4def3eb..497976f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueEditor.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicValueEditor.java @@ -128,9 +128,8 @@ public class CaracteristicValueEditor extends AbstractCellEditor implements Tabl } } - Component result = editor.getTableCellEditorComponent( + return editor.getTableCellEditorComponent( table, value, isSelected, row, column); - return result; } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java index 625bbe8..9291543 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataEditorHandler.java @@ -32,7 +32,6 @@ import javax.swing.JTextField; import java.awt.Color; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; -import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.text.DecimalFormat; @@ -46,31 +45,23 @@ public class ComputableDataEditorHandler extends NumberEditorHandler { @Override public void init() { - final PropertyChangeListener l = new PropertyChangeListener() { - - public void propertyChange(PropertyChangeEvent evt) { - setComputedTextIfNullModel(); - } - }; + final PropertyChangeListener l = evt -> setComputedTextIfNullModel(); ComputableData computableData = (ComputableData) ui.getModel().getBean(); if (computableData != null) { computableData.addPropertyChangeListener(l); } - ui.getModel().addPropertyChangeListener(NumberEditorModel.PROPERTY_BEAN, new PropertyChangeListener() { - - public void propertyChange(PropertyChangeEvent evt) { + ui.getModel().addPropertyChangeListener(NumberEditorModel.PROPERTY_BEAN, evt -> { - ComputableData oldComputableData = (ComputableData) evt.getOldValue(); - if (oldComputableData != null) { - oldComputableData.removePropertyChangeListener(ComputableData.PROPERTY_COMPUTED_DATA, l); - } + ComputableData oldComputableData = (ComputableData) evt.getOldValue(); + if (oldComputableData != null) { + oldComputableData.removePropertyChangeListener(ComputableData.PROPERTY_COMPUTED_DATA, l); + } - ComputableData newComputableData = (ComputableData) evt.getNewValue(); - if (newComputableData != null) { - newComputableData.removePropertyChangeListener(ComputableData.PROPERTY_COMPUTED_DATA, l); - newComputableData.addPropertyChangeListener(ComputableData.PROPERTY_COMPUTED_DATA, l); - } + ComputableData newComputableData = (ComputableData) evt.getNewValue(); + if (newComputableData != null) { + newComputableData.removePropertyChangeListener(ComputableData.PROPERTY_COMPUTED_DATA, l); + newComputableData.addPropertyChangeListener(ComputableData.PROPERTY_COMPUTED_DATA, l); } }); @@ -94,12 +85,7 @@ public class ComputableDataEditorHandler extends NumberEditorHandler { }); ui.addPropertyChangeListener(ComputableDataEditor.PROPERTY_DECIMAL_NUMBER, - new PropertyChangeListener() { - - public void propertyChange(PropertyChangeEvent evt) { - decimalNumber = (Integer) evt.getNewValue(); - } - }); + evt -> decimalNumber = (Integer) evt.getNewValue()); decimalNumber = ((ComputableDataEditor) ui).getDecimalNumber(); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataTableCell.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataTableCell.java index 5616a09..b67b3b2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataTableCell.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/computable/ComputableDataTableCell.java @@ -136,11 +136,9 @@ public class ComputableDataTableCell extends DefaultTableCellRenderer { @Override public void focusGained(FocusEvent e) { - SwingUtilities.invokeLater(new Runnable() { - public void run() { - numberEditor.getTextField().requestFocus(); - numberEditor.getTextField().selectAll(); - } + SwingUtilities.invokeLater(() -> { + numberEditor.getTextField().requestFocus(); + numberEditor.getTextField().selectAll(); }); } @@ -150,11 +148,9 @@ public class ComputableDataTableCell extends DefaultTableCellRenderer { @Override public void ancestorAdded(AncestorEvent event) { - SwingUtilities.invokeLater(new Runnable() { - public void run() { - numberEditor.getTextField().requestFocus(); - numberEditor.getTextField().selectAll(); - } + SwingUtilities.invokeLater(() -> { + numberEditor.getTextField().requestFocus(); + numberEditor.getTextField().selectAll(); }); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiLocationTableCell.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiLocationTableCell.java index c342966..c9b8e93 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiLocationTableCell.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiLocationTableCell.java @@ -83,7 +83,7 @@ public class TuttiLocationTableCell { protected TuttiLocationTableCellEditor() { super(new JComboBox()); - final BeanFilterableComboBox<TuttiLocation> component = new BeanFilterableComboBox<TuttiLocation>(); + final BeanFilterableComboBox<TuttiLocation> component = new BeanFilterableComboBox<>(); component.setI18nPrefix("tutti.property."); component.setShowReset(true); component.setBeanType(TuttiLocation.class); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java index 4f42005..4879b1b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/VesselTableCell.java @@ -82,7 +82,7 @@ public class VesselTableCell { protected VesselTableCellEditor() { super(new JComboBox()); - final BeanFilterableComboBox<Vessel> component = new BeanFilterableComboBox<Vessel>(); + final BeanFilterableComboBox<Vessel> component = new BeanFilterableComboBox<>(); component.setI18nPrefix("tutti.property."); component.setShowReset(true); component.setBeanType(Vessel.class); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java index bcec17c..6f150b2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUIHandler.java @@ -31,8 +31,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import javax.swing.JComponent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; /** * @author Kevin Morin - kmorin@codelutin.com @@ -68,12 +66,7 @@ public class SelectSpeciesUIHandler extends AbstractTuttiUIHandler<SelectSpecies getModel().addPropertyChangeListener( SelectSpeciesUIModel.PROPERTY_SPECIES, - new PropertyChangeListener() { - - public void propertyChange(PropertyChangeEvent evt) { - SelectSpeciesUIHandler.this.ui.getSpeciesCombo().getHandler().sortData(); - } - }); + evt -> SelectSpeciesUIHandler.this.ui.getSpeciesCombo().getHandler().sortData()); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java index c51b03f..2338b6e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableUIHandler.java @@ -130,7 +130,7 @@ public abstract class AbstractTuttiTableUIHandler<R extends AbstractTuttiBeanUIM protected AbstractTuttiTableUIHandler(String... properties) { - rowMonitor = new TuttiBeanMonitor<R>(properties); + rowMonitor = new TuttiBeanMonitor<>(properties); // listen when bean is changed rowMonitor.addPropertyChangeListener(TuttiBeanMonitor.PROPERTY_BEAN, new PropertyChangeListener() { @@ -162,8 +162,8 @@ public abstract class AbstractTuttiTableUIHandler<R extends AbstractTuttiBeanUIM if (log.isDebugEnabled()) { log.debug("row [" + rowIndex + "] property " + - propertyName + " changed from " + oldValue + - " to " + newValue); + propertyName + " changed from " + oldValue + + " to " + newValue); } onRowModified(rowIndex, row, propertyName, @@ -261,12 +261,7 @@ public abstract class AbstractTuttiTableUIHandler<R extends AbstractTuttiBeanUIM addHighlighters(table); // when model data change let's propagate it table model - getModel().addPropertyChangeListener(AbstractTuttiTableUIModel.PROPERTY_ROWS, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - onModelRowsChanged((List<R>) evt.getNewValue()); - } - }); + getModel().addPropertyChangeListener(AbstractTuttiTableUIModel.PROPERTY_ROWS, evt -> onModelRowsChanged((List<R>) evt.getNewValue())); // always scroll to selected row SwingUtil.scrollToTableSelection(getTable()); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicColumnIdentifier.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicColumnIdentifier.java index 2993f69..e7bd910 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicColumnIdentifier.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/CaracteristicColumnIdentifier.java @@ -64,8 +64,7 @@ public class CaracteristicColumnIdentifier<R> extends ColumnIdentifier<R> { @Override public Object getValue(R entry) { CaracteristicMap map = (CaracteristicMap) super.getValue(entry); - Serializable result = map.get(caracteristic); - return result; + return map.get(caracteristic); } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit ef6e38657a9c3413e70997150db3a72e1c6a55e1 Merge: d65d8e3 7560d97 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Feb 27 08:24:35 2016 +0100 Fixes #8023 Merge branch 'feature/8023' into develop .../ichtyometer/interactive/CommandEngine.java | 6 +- .../tutti/ichtyometer/tool/FeedReaderTool.java | 49 +- .../tutti/ichtyometer/tool/SendCommandTool.java | 37 +- .../java/fr/ifremer/tutti/ichtyometer/BigFins.java | 19 +- .../tutti/ichtyometer/feed/FeedReaderTest.java | 9 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 68 +-- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 2 +- .../tutti/persistence/TuttiPersistence.java | 4 +- .../tutti/persistence/TuttiPersistenceImpl.java | 133 +++--- .../persistence/TuttiPersistenceNoDbImpl.java | 93 ++-- .../persistence/dao/TaxonNameDaoTuttiImpl.java | 9 +- .../tutti/persistence/entities/TuttiEntities.java | 35 +- .../tutti/persistence/entities/data/Cruises.java | 16 +- .../entities/data/FishingOperations.java | 9 +- .../tutti/persistence/entities/data/Programs.java | 17 +- .../persistence/entities/data/SampleCategory.java | 2 +- .../entities/data/SampleCategoryModel.java | 3 +- .../entities/data/SpeciesAbleBatchs.java | 3 +- .../persistence/entities/data/SpeciesBatchs.java | 8 +- .../entities/protocol/SpeciesProtocols.java | 8 +- .../entities/protocol/TuttiProtocols.java | 18 +- .../entities/protocol/v1/TuttiProtocolBean1.java | 75 +-- .../entities/protocol/v2/TuttiProtocolBean2.java | 102 ++-- .../entities/protocol/v3/SpeciesProtocolBean3.java | 34 +- .../entities/protocol/v3/TuttiProtocolBean3.java | 136 ++---- .../persistence/entities/referential/Gears.java | 44 +- .../persistence/entities/referential/Persons.java | 14 +- .../persistence/entities/referential/Speciess.java | 76 +-- .../entities/referential/TaxonCache.java | 6 +- .../entities/referential/TaxonCaches.java | 12 +- .../entities/referential/TuttiLocations.java | 32 +- .../persistence/entities/referential/Vessels.java | 52 +-- .../tutti/persistence/model/DataModelSupport.java | 5 + .../persistence/model/OperationDataModel.java | 11 +- .../service/AbstractPersistenceService.java | 62 ++- .../service/AccidentalBatchPersistenceService.java | 6 +- .../AccidentalBatchPersistenceServiceImpl.java | 8 +- .../service/AttachmentPersistenceServiceImpl.java | 10 +- .../service/BenthosBatchPersistenceService.java | 21 +- .../BenthosBatchPersistenceServiceImpl.java | 40 +- .../service/CatchBatchPersistenceService.java | 8 +- .../service/CatchBatchPersistenceServiceImpl.java | 16 +- .../service/CruisePersistenceService.java | 6 +- .../service/CruisePersistenceServiceImpl.java | 40 +- .../FishingOperationPersistenceService.java | 12 +- .../FishingOperationPersistenceServiceImpl.java | 66 ++- ...dividualObservationBatchPersistenceService.java | 14 +- ...dualObservationBatchPersistenceServiceImpl.java | 137 ++++-- .../MarineLitterBatchPersistenceService.java | 6 +- .../MarineLitterBatchPersistenceServiceImpl.java | 14 +- .../service/ProgramPersistenceServiceImpl.java | 16 +- .../service/ProtocolPersistenceServiceImpl.java | 11 +- .../service/SpeciesBatchPersistenceService.java | 21 +- .../SpeciesBatchPersistenceServiceImpl.java | 46 +- .../service/TechnicalPersistenceServiceImpl.java | 3 +- .../service/TuttiPersistenceServiceLocator.java | 6 +- .../CaracteristicPersistenceServiceImpl.java | 42 +- .../referential/GearPersistenceServiceImpl.java | 6 +- .../ObjectTypePersistenceServiceImpl.java | 3 +- .../referential/PersonPersistenceServiceImpl.java | 6 +- .../ReferentialPersistenceServiceSupport.java | 6 +- .../referential/SpeciesPersistenceServiceImpl.java | 3 +- .../service/util/BatchPersistenceHelper.java | 73 ++- .../persistence/service/util/BatchTreeHelper.java | 3 +- .../service/util/MeasurementPersistenceHelper.java | 3 +- .../tutti/persistence/test/DatabaseFixtures.java | 21 +- .../main/java/fr/ifremer/tutti/util/Numbers.java | 3 +- .../main/java/fr/ifremer/tutti/util/Weights.java | 3 +- .../src/main/resources/queries-failsafe.hbm.xml | 21 +- .../src/main/xmi/tutti-persistence.zargo | Bin 62284 -> 62341 bytes .../config/TuttiPersistenceConfigTest.java | 3 +- ...AccidentalBatchPersistenceServiceWriteTest.java | 60 ++- .../BenthosBatchPersistenceServiceReadTest.java | 10 +- .../BenthosBatchPersistenceServiceWriteTest.java | 46 +- .../CatchBatchPersistenceServiceReadTest.java | 2 +- .../CatchBatchPersistenceServiceWriteTest.java | 18 +- .../service/CruisePersistenceServiceReadTest.java | 2 +- .../service/CruisePersistenceServiceWriteTest.java | 6 +- ...hingOperationPersistenceServiceAno4995Test.java | 5 +- ...ishingOperationPersistenceServiceWriteTest.java | 16 +- ...bservationBatchPersistenceServiceWriteTest.java | 50 +- ...rineLitterBatchPersistenceServiceWriteTest.java | 16 +- .../SpeciesBatchPersistenceServiceReadTest.java | 10 +- .../SpeciesBatchPersistenceServiceWriteTest.java | 42 +- .../tutti/service/AbstractTuttiService.java | 37 +- .../fr/ifremer/tutti/service/DecoratorService.java | 7 +- .../ifremer/tutti/service/PersistenceService.java | 131 +++--- .../fr/ifremer/tutti/service/TuttiDataContext.java | 96 ++-- .../fr/ifremer/tutti/service/TuttiDecorator.java | 8 +- .../ifremer/tutti/service/TuttiServiceContext.java | 6 +- .../ifremer/tutti/service/ValidationService.java | 54 +-- .../tutti/service/bigfin/BigfinImportContext.java | 37 +- .../tutti/service/bigfin/BigfinImportService.java | 33 +- .../service/bigfin/csv/BigfinDataRowModel.java | 3 +- .../fr/ifremer/tutti/service/bigfin/signs/Sex.java | 8 +- .../ifremer/tutti/service/bigfin/signs/Size.java | 8 +- .../tutti/service/bigfin/signs/VracHorsVrac.java | 8 +- .../catches/ValidateCruiseOperationsService.java | 34 +- .../service/catches/WeightCleaningService.java | 50 +- .../service/catches/WeightComputingService.java | 13 +- .../catches/multipost/AttachmentRowModel.java | 9 +- .../catches/multipost/MultiPostExportService.java | 18 +- .../catches/multipost/MultiPostImportService.java | 512 ++++++++++----------- .../csv/AbstractTuttiImportExportModel.java | 4 +- .../service/csv/AbstractTuttiImportModel.java | 4 +- .../fr/ifremer/tutti/service/csv/CsvComsumer.java | 6 +- .../tutti/service/csv/GearParserFormatter.java | 3 +- .../tutti/service/csv/HarbourParserFormatter.java | 3 +- .../service/csv/IntegerListParserFormatter.java | 9 +- .../fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 29 +- .../tutti/service/csv/VesselParserFormatter.java | 3 +- .../tutti/service/export/ExportBatchEntry.java | 3 +- .../tutti/service/export/ExportCatchContext.java | 28 +- .../export/pdf/CatchesPdfExportService.java | 13 +- .../sumatra/CatchesSumatraExportService.java | 16 +- .../ToConfirmReportFishingOperationData.java | 2 +- .../toconfirmreport/ToConfirmReportService.java | 21 +- .../genericformat/GenericFormatArchive.java | 13 +- .../GenericFormatCheckDataService.java | 14 +- .../genericformat/GenericFormatContextSupport.java | 57 +-- .../genericformat/GenericFormatExportContext.java | 21 +- .../GenericFormatExportOperationContext.java | 10 +- .../genericformat/GenericFormatExportService.java | 25 +- .../GenericFormatImportCruiseContext.java | 18 +- .../GenericFormatImportOperationContext.java | 13 +- .../genericformat/GenericFormatImportService.java | 60 +-- .../GenericFormatImportValidationHelper.java | 9 +- .../genericformat/GenericFormatResultSupport.java | 3 +- .../GenericFormatValidateFileContext.java | 60 ++- .../GenericformatImportPersistenceHelper.java | 39 +- .../consumer/CruiseNotValidException.java | 3 +- .../consumer/CsvConsumerForCatch.java | 10 +- .../FishingOperationNotValidException.java | 3 +- .../genericformat/csv/AccidentalCatchModel.java | 3 +- .../service/genericformat/csv/AttachmentModel.java | 3 +- .../service/genericformat/csv/CatchModel.java | 12 +- .../tutti/service/genericformat/csv/CatchRow.java | 3 +- .../genericformat/csv/GearCaracteristicModel.java | 3 +- .../csv/IndividualObservationModel.java | 3 +- .../genericformat/csv/MarineLitterModel.java | 3 +- .../service/genericformat/csv/OperationModel.java | 3 +- .../service/genericformat/csv/ParameterModel.java | 3 +- .../genericformat/csv/SpeciesExportModel.java | 3 +- .../service/genericformat/csv/SurveyModel.java | 3 +- .../exportactions/CreateCatchBatchRowsAction.java | 3 +- .../ExportGearCaracteristicAction.java | 2 +- .../exportactions/LoadDataAction.java | 4 +- .../importactions/DoCheckWeightAction.java | 18 +- .../importactions/DoCleanWeightAction.java | 18 +- .../importactions/ImportAccidentalCatchAction.java | 2 +- .../importactions/ImportCatchAction.java | 16 +- .../ImportGearCaracteristicAction.java | 25 +- .../ImportIndividualObservationAction.java | 2 +- .../importactions/ImportMarineLitterAction.java | 2 +- .../importactions/ImportOperationAction.java | 55 ++- .../importactions/ImportParameterAction.java | 60 ++- .../ImportReferentialPersonAction.java | 1 - .../ImportReferentialVesselAction.java | 1 - .../importactions/ImportSurveyAction.java | 2 +- .../importactions/RestoreAfterImportAction.java | 14 +- .../importactions/RestoreAfterValidateAction.java | 62 +-- .../importactions/ValidateSurveyAction.java | 2 +- .../producer/CsvProducerForCatch.java | 4 +- .../producer/CsvProducerForSpecies.java | 8 +- .../FishingOperationImportService.java | 8 +- .../operationimport/ImportFromColumnFileModel.java | 67 ++- .../protocol/ProtocolImportExportService.java | 23 +- .../service/psionimport/PsionImportModel.java | 3 +- .../service/psionimport/PsionImportService.java | 8 +- .../service/pupitri/PupitriExportService.java | 10 +- .../service/pupitri/PupitriImportService.java | 8 +- .../service/pupitri/PupitriSpeciesContext.java | 3 +- .../tutti/service/pupitri/csv/CarrouselRow.java | 3 +- .../pupitri/report/PupitriImportReportModel.java | 6 +- .../referential/ReferentialImportRequest.java | 4 +- .../ReferentialTemporaryGearService.java | 6 +- .../ReferentialTemporaryPersonService.java | 6 +- .../ReferentialTemporarySpeciesService.java | 3 +- .../ReferentialTemporaryVesselService.java | 3 +- .../TuttiReferentialSynchronizeService.java | 3 +- .../tutti/service/referential/csv/PersonRow.java | 3 +- .../producer/CsvProducerForTemporaryGear.java | 10 +- .../producer/CsvProducerForTemporaryPerson.java | 10 +- .../producer/CsvProducerForTemporarySpecies.java | 10 +- .../producer/CsvProducerForTemporaryVessel.java | 10 +- .../service/report/ReportGenerationRequest.java | 12 +- .../service/report/ReportGenerationResult.java | 4 +- .../service/report/ReportGenerationService.java | 16 +- .../tutti/service/PersistenceServiceTest.java | 94 ++-- .../ifremer/tutti/service/ServiceDbResource.java | 49 +- .../service/bigfin/BigfinImportService2Test.java | 8 +- .../service/bigfin/BigfinImportServiceTest.java | 12 +- .../catches/WeightComputingServiceTest.java | 16 +- .../multipost/MultiPostExportServiceTest.java | 6 +- .../multipost/MultiPostImportServiceTest.java | 2 +- .../export/pdf/CatchesPdfExportServiceTest.java | 4 +- .../sumatra/CatchesSumatraExportServiceTest.java | 12 +- .../GenericFormatExportServiceAno5804Test.java | 10 +- .../GenericFormatExportServiceAno7992Test.java | 10 +- .../GenericFormatExportServiceTest.java | 10 +- .../psionimport/PsionImportServiceTest.java | 40 +- .../pupitri/PupitriImportServiceAno3898Test.java | 6 +- .../pupitri/PupitriImportServiceAno5032Test.java | 6 +- .../pupitri/PupitriImportServiceAno5079Test.java | 6 +- .../pupitri/PupitriImportServiceEvo5060Test.java | 6 +- .../pupitri/PupitriImportServiceEvo5062Test.java | 6 +- .../pupitri/PupitriImportServiceEvo6116Test.java | 6 +- .../pupitri/PupitriImportServiceEvo6149Test.java | 6 +- .../pupitri/PupitriImportServiceEvo6592Test.java | 6 +- .../service/pupitri/PupitriImportServiceTest.java | 10 +- .../pupitri/PupitryImportServiceTestSupport.java | 6 +- .../ReferentialTemporarySpeciesServiceTest.java | 2 +- .../report/ReportGenerationServiceTest.java | 4 +- .../tutti/ui/swing/updater/UpdateModule.java | 3 +- .../ui/swing/updater/UpdaterFileSystemPathes.java | 24 +- .../java/fr/ifremer/tutti/ui/swing/RunTutti.java | 7 +- .../ifremer/tutti/ui/swing/TuttiActionFactory.java | 3 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 35 +- .../content/actions/ConnectIchtyometerAction.java | 33 +- .../EditCatchesForSelectedCruiseAction.java | 23 +- .../OpenTemporaryReferentialScreenAction.java | 7 +- .../ui/swing/content/actions/ShowAboutAction.java | 48 +- .../category/EditSampleCategoryModelUIHandler.java | 27 +- .../actions/AddSampleCategoryRowAction.java | 11 +- .../swing/content/config/TuttiConfigUIHandler.java | 37 +- .../swing/content/cruise/EditCruiseUIHandler.java | 54 +-- .../cruise/GearCaracteristicsEditorTableModel.java | 3 +- .../cruise/GearCaracteristicsEditorUIHandler.java | 23 +- .../actions/EditGearCaracteristicsAction.java | 4 +- .../content/cruise/actions/SaveCruiseAction.java | 4 +- .../actions/ViewGearCaracteristicsAction.java | 4 +- .../ui/swing/content/db/DbManagerUIHandler.java | 34 +- .../genericformat/tree/ProgramSelectTreeNode.java | 5 +- .../swing/content/home/SelectCruiseUIHandler.java | 119 ++--- .../content/home/actions/CloneProtocolAction.java | 2 +- .../content/home/actions/EditCatchesAction.java | 23 +- .../content/home/actions/EditProtocolAction.java | 2 +- .../home/actions/ExportCruiseForSumatraAction.java | 2 +- .../home/actions/SendCruiseReportAction.java | 2 +- .../SpeciesToConfirmReportForCruiseAction.java | 2 +- .../operation/EditFishingOperationUIHandler.java | 200 ++++---- .../operation/EditFishingOperationUIModel.java | 3 +- .../operation/FishingOperationsUIHandler.java | 120 +++-- .../operation/FishingOperationsUIModel.java | 10 +- .../catches/AbstractTuttiBatchTableUIHandler.java | 44 +- .../content/operation/catches/CatchCustomTab.java | 13 +- .../operation/catches/EditCatchesSvgHandler.java | 330 ++++++------- .../operation/catches/EditCatchesUIHandler.java | 20 +- .../operation/catches/EditCatchesUIModel.java | 24 +- .../catches/MultiPostImportLogDialogHandler.java | 5 - .../catches/SampleCategoryColumnIdentifier.java | 15 +- .../operation/catches/SampleCategoryComponent.java | 26 +- .../catches/SpeciesAbleBatchRowHelper.java | 5 +- .../operation/catches/SpeciesBatchDecorator.java | 2 +- .../accidental/AccidentalBatchTableModel.java | 9 +- .../accidental/AccidentalBatchUIHandler.java | 5 +- .../actions/CancelEditCatchBatchAction.java | 12 +- .../catches/actions/CleanBatchWeightsAction.java | 4 +- .../catches/actions/ComputeBatchWeightsAction.java | 4 +- .../ExportFishingOperationForSumatraAction.java | 4 +- .../ExportFishingOperationReportAction.java | 2 +- .../actions/ExportMultiPostActionSupport.java | 3 +- .../actions/ExportMultiPostCatchAction.java | 3 +- .../actions/ImportMultiPostActionSupport.java | 3 +- .../actions/ImportMultiPostCatchAction.java | 6 +- .../catches/benthos/BenthosBatchRowModel.java | 17 +- .../catches/benthos/BenthosBatchUIHandler.java | 175 +++---- .../benthos/actions/CreateBenthosMelagAction.java | 10 +- .../actions/ImportMultiPostBenthosAction.java | 3 +- .../OpenEditBenthosBatchFrequencyUIAction.java | 5 - .../benthos/actions/RemoveBenthosBatchAction.java | 6 +- .../actions/RemoveBenthosSubBatchAction.java | 2 +- .../benthos/actions/RenameBenthosBatchAction.java | 2 +- .../benthos/create/CreateBenthosBatchUIModel.java | 6 +- .../CreateBenthosBatchAndFrequenciesAction.java | 1 - .../frequency/BenthosFrequencyCellComponent.java | 1 - .../frequency/BenthosFrequencyLogsTableModel.java | 3 +- .../frequency/BenthosFrequencyRowModel.java | 3 +- .../frequency/BenthosFrequencyTableModel.java | 108 ++--- .../frequency/BenthosFrequencyUIHandler.java | 92 ++-- .../benthos/frequency/BenthosFrequencyUIModel.java | 5 +- .../frequency/BenthosFrequencyUIModelCache.java | 7 +- ...thosFrequencyLengthStepCaracteristicAction.java | 2 +- .../benthos/split/SplitBenthosBatchRowModel.java | 6 +- .../benthos/split/SplitBenthosBatchUIHandler.java | 8 +- .../IndividualObservationBatchRowModel.java | 10 + .../IndividualObservationBatchUIHandler.java | 5 +- .../IndividualObservationBatchUIModel.java | 5 +- ...enCreateIndividualObservationBatchUIAction.java | 5 - .../RemoveAllIndividualObservationBatchAction.java | 2 +- .../RemoveIndividualObservationBatchAction.java | 2 +- .../CreateIndividualObservationBatchUIHandler.java | 114 ++--- .../marinelitter/MarineLitterBatchUIHandler.java | 5 +- .../actions/ImportMultiPostMarineLitterAction.java | 3 +- .../OpenCreateMarineLitterBatchUIAction.java | 5 - .../actions/RemoveMarineLitterBatchAction.java | 7 +- .../create/CreateMarineLitterBatchUIModel.java | 6 +- .../ImportPupitriMelagWeightPopupUIHandler.java | 5 - .../ImportPupitriMelagWeightPopupUIModel.java | 2 +- .../species/ImportPupitriPopupUIHandler.java | 18 +- .../catches/species/SpeciesBatchRowModel.java | 18 +- .../catches/species/SpeciesBatchUIHandler.java | 187 +++----- .../actions/ImportMultiPostSpeciesAction.java | 3 +- .../actions/OpenCreateSpeciesBatchUIAction.java | 5 - .../OpenEditSpeciesBatchFrequencyUIAction.java | 5 - .../species/actions/RemoveSpeciesBatchAction.java | 6 +- .../actions/RemoveSpeciesSubBatchAction.java | 2 +- .../species/actions/RenameSpeciesBatchAction.java | 2 +- .../species/create/CreateSpeciesBatchUIModel.java | 6 +- .../frequency/SpeciesFrequencyCellComponent.java | 1 - .../frequency/SpeciesFrequencyLogsTableModel.java | 3 +- .../frequency/SpeciesFrequencyRowModel.java | 3 +- .../frequency/SpeciesFrequencyTableModel.java | 108 ++--- .../frequency/SpeciesFrequencyUIHandler.java | 115 ++--- .../species/frequency/SpeciesFrequencyUIModel.java | 5 +- .../frequency/SpeciesFrequencyUIModelCache.java | 7 +- ...ciesFrequencyLengthStepCaracteristicAction.java | 2 +- .../species/split/SplitSpeciesBatchRowModel.java | 6 +- .../species/split/SplitSpeciesBatchUIHandler.java | 8 +- .../fishing/AbstractCaracteristicRowModel.java | 10 +- .../fishing/AbstractCaracteristicTabUIModel.java | 6 +- .../fishing/GearUseFeatureTabUIHandler.java | 7 - .../fishing/GearUseFeatureTableModel.java | 3 +- .../fishing/VesselUseFeatureTabUIHandler.java | 7 - .../fishing/VesselUseFeatureTableModel.java | 3 +- .../actions/DeleteFishingOperationAction.java | 2 +- .../actions/EditFishingOperationAction.java | 65 ++- ...perationCaracteristicsFromColumnFileAction.java | 11 +- .../content/program/EditProgramUIHandler.java | 3 +- .../EditProtocolCaracteristicsRowModel.java | 2 +- .../protocol/EditProtocolSpeciesRowModel.java | 36 +- .../protocol/EditProtocolSpeciesTableModel.java | 25 +- .../content/protocol/EditProtocolUIHandler.java | 3 +- .../content/protocol/EditProtocolUIModel.java | 24 +- .../MandatorySampleCategoryColumnIdentifier.java | 3 +- .../actions/ExportProtocolBenthosAction.java | 14 +- .../actions/ExportProtocolSpeciesAction.java | 12 +- .../protocol/actions/ExportPupitriAction.java | 16 +- .../actions/ImportProtocolBenthosAction.java | 2 +- .../actions/ImportProtocolSpeciesAction.java | 2 +- .../actions/RemoveCaracteristicMappingAction.java | 6 +- .../MinSizePopupUIHandler.java | 6 - .../actions/DeleteRowAction.java | 8 +- .../actions/DeleteSpeciesAction.java | 5 - .../actions/ExportProtocolCpsAction.java | 3 +- .../actions/ImportProtocolCpsAction.java | 5 +- .../actions/SplitSpeciesAction.java | 5 - .../ui/swing/content/protocol/rtp/RtpButton.java | 23 +- .../content/protocol/rtp/RtpCellRenderer.java | 5 - .../content/protocol/rtp/RtpEditorUIHandler.java | 22 +- .../protocol/zones/actions/AddStratasAction.java | 5 - .../protocol/zones/actions/CreateZoneAction.java | 5 - .../protocol/zones/actions/DeleteZoneAction.java | 5 - .../protocol/zones/actions/RenameZoneAction.java | 5 - .../zones/tree/AbstractZoneEditorTreeModel.java | 6 - .../protocol/zones/tree/StratasTreeModel.java | 7 +- .../protocol/zones/tree/ZoneEditorNode.java | 6 - .../zones/tree/ZoneEditorTreeCellRenderer.java | 5 - .../protocol/zones/tree/ZonesTreeModel.java | 2 +- .../actions/ImportTemporaryGearAction.java | 6 +- .../actions/ImportTemporaryPersonAction.java | 6 +- .../actions/ImportTemporarySpeciesAction.java | 6 +- .../actions/ImportTemporaryVesselAction.java | 6 +- .../actions/OpenReplaceTemporaryGearUIAction.java | 3 +- .../OpenReplaceTemporaryPersonUIAction.java | 3 +- .../OpenReplaceTemporarySpeciesUIAction.java | 3 +- .../OpenReplaceTemporaryVesselUIAction.java | 3 +- .../ui/swing/content/report/ReportUIHandler.java | 2 +- .../ui/swing/content/report/ReportUIModel.java | 10 +- .../validation/ValidateCruiseUIHandler.java | 4 +- .../content/validation/ValidateCruiseUIModel.java | 4 +- .../actions/SaveCruiseToReadyToSynchAction.java | 6 +- .../content/validation/tree/MessageTreeNode.java | 6 +- .../fr/ifremer/tutti/ui/swing/update/Updates.java | 3 +- .../ui/swing/update/module/DbModuleUpdater.java | 12 +- .../ui/swing/util/AbstractTuttiUIHandler.java | 114 ++--- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 12 +- .../ui/swing/util/actions/SimpleActionSupport.java | 12 +- .../ui/swing/util/attachment/ButtonAttachment.java | 14 +- .../CaracteristicMapCellComponent.java | 3 +- .../CaracteristicMapEditorTableModel.java | 3 +- .../caracteristics/CaracteristicValueEditor.java | 3 +- .../computable/ComputableDataEditorHandler.java | 36 +- .../util/computable/ComputableDataTableCell.java | 16 +- .../swing/util/editor/TuttiLocationTableCell.java | 2 +- .../ui/swing/util/editor/VesselTableCell.java | 2 +- .../swing/util/species/SelectSpeciesUIHandler.java | 9 +- .../util/table/AbstractTuttiTableUIHandler.java | 13 +- .../util/table/CaracteristicColumnIdentifier.java | 3 +- 389 files changed, 3214 insertions(+), 4756 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm