[Echobase-commits] 03/08: utilisation des nouveau helper d'entities

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit 2a331301d0436f43c416a9213a1fd7a0432e0363 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 21 17:16:17 2015 +0100 utilisation des nouveau helper d'entities --- .../service/importdata/AcousticImportService.java | 13 ++++----- .../service/importdata/CatchesImportService.java | 21 ++++++++------- .../service/importdata/CommonAllImportService.java | 4 +-- .../importdata/CommonTransectImportService.java | 7 ++--- .../importdata/CommonTransitImportService.java | 4 +-- .../service/importdata/OperationImportService.java | 19 ++++++++----- .../importdata/ResultsEsduCellImportService.java | 25 ++++++++++------- .../ResultsMapFishCellImportService.java | 19 ++++++++----- .../ResultsMapOtherCellImportService.java | 10 ++++--- .../importdata/ResultsRegionCellImportService.java | 31 +++++++++++++--------- .../importdata/ResultsVoyageImportService.java | 20 ++++++++------ .../importdata/AbstractImportDataServiceIT.java | 4 +-- 12 files changed, 106 insertions(+), 71 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportService.java index 4a7e008..878f9b8 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportService.java @@ -23,8 +23,6 @@ package fr.ifremer.echobase.services.service.importdata; import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ifremer.echobase.EchoBaseFunctions; -import fr.ifremer.echobase.EchoBasePredicates; import fr.ifremer.echobase.csv.EchoBaseCsvUtil; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; @@ -35,9 +33,12 @@ import fr.ifremer.echobase.entities.data.Transect; import fr.ifremer.echobase.entities.data.Transit; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.AcousticInstrument; +import fr.ifremer.echobase.entities.references.AcousticInstruments; import fr.ifremer.echobase.entities.references.CellType; import fr.ifremer.echobase.entities.references.CellTypeImpl; import fr.ifremer.echobase.entities.references.DataMetadata; +import fr.ifremer.echobase.entities.references.DataMetadatas; +import fr.ifremer.echobase.entities.references.DataQualities; import fr.ifremer.echobase.entities.references.DataQuality; import fr.ifremer.echobase.entities.references.Vessel; import fr.ifremer.echobase.io.InputFile; @@ -144,13 +145,13 @@ public class AcousticImportService extends AbstractImportDataService<AcousticImp Map<String, AcousticInstrument> instrumentsById = persistenceService.getEntitiesMap(AcousticInstrument.class, - EchoBaseFunctions.ACOUSTIC_INSTRUMENT_ID); + AcousticInstruments.ACOUSTIC_INSTRUMENT_ID); Map<String, DataMetadata> dataMetadatasByName = persistenceService.getEntitiesMap( - DataMetadata.class, EchoBaseFunctions.DATA_METADATA_NAME); + DataMetadata.class, DataMetadatas.DATA_METADATA_NAME); Map<String, DataQuality> dataQualityMap = persistenceService.getEntitiesMap( - DataQuality.class, EchoBaseFunctions.DATA_QUALITY_NAME); + DataQuality.class, DataQualities.DATA_QUALITY_NAME); AcousticImportModel csvModel = new AcousticImportModel( getCsvSeparator(), instrumentsById, dataQualityMap); @@ -220,7 +221,7 @@ public class AcousticImportService extends AbstractImportDataService<AcousticImp AcousticInstrument instrument = row.getAcousticInstrument(); boolean isME70 = - EchoBasePredicates.IS_ACOUSTIC_INSTRUMENT_ME70.apply(instrument); + AcousticInstruments.IS_ACOUSTIC_INSTRUMENT_ME70.apply(instrument); if (dataAcquisition == null || !instrument.equals(dataAcquisition.getAcousticInstrument())) { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportService.java index 57aa7a8..3a97890 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportService.java @@ -23,21 +23,24 @@ package fr.ifremer.echobase.services.service.importdata; import com.google.common.base.Preconditions; import com.google.common.collect.Collections2; import com.google.common.collect.Maps; -import fr.ifremer.echobase.EchoBaseFunctions; -import fr.ifremer.echobase.EchoBasePredicates; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; import fr.ifremer.echobase.entities.data.Operation; import fr.ifremer.echobase.entities.data.Sample; import fr.ifremer.echobase.entities.data.SampleData; import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.data.Operations; import fr.ifremer.echobase.entities.references.SampleDataType; import fr.ifremer.echobase.entities.references.SampleDataTypeImpl; +import fr.ifremer.echobase.entities.references.SampleDataTypes; import fr.ifremer.echobase.entities.references.SampleType; import fr.ifremer.echobase.entities.references.SampleTypeImpl; +import fr.ifremer.echobase.entities.references.SexCategories; import fr.ifremer.echobase.entities.references.SexCategory; +import fr.ifremer.echobase.entities.references.SizeCategories; import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.entities.references.Species; +import fr.ifremer.echobase.entities.references.Species2; import fr.ifremer.echobase.entities.references.SpeciesCategory; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.service.importdata.csv.BiometrySampleImportModel; @@ -82,15 +85,15 @@ public class CatchesImportService extends AbstractImportDataService<CatchesImpor // split them by operation Id Map<String, Operation> operationMap = Maps.uniqueIndex( - operations, EchoBaseFunctions.OPERATION_ID); + operations, Operations.OPERATION_ID); Map<String, Species> speciesMap = persistenceService.getEntitiesMap( Species.class, - EchoBaseFunctions.SPECIES_BARACOUDA_CODE); + Species2.SPECIES_BARACOUDA_CODE); Map<String, SizeCategory> sizeCategoryMap = persistenceService.getEntitiesMap( SizeCategory.class, - EchoBaseFunctions.SIZE_CATEGORY_NAME); + SizeCategories.SIZE_CATEGORY_NAME); InputFile inputFile; @@ -114,7 +117,7 @@ public class CatchesImportService extends AbstractImportDataService<CatchesImpor Collection<Operation> operationWithTotalOrUnsortedSample = Collections2.filter( operations, - EchoBasePredicates.OPERATION_WITH_TOTAL_OR_UNSORTED_SAMPLE); + Operations.OPERATION_WITH_TOTAL_OR_UNSORTED_SAMPLE); inputFile = configuration.getSubSampleFile(); if (inputFile.hasFile()) { @@ -196,7 +199,7 @@ public class CatchesImportService extends AbstractImportDataService<CatchesImpor SampleType sampleType; - if (EchoBasePredicates.IS_HORS_VRAC.apply(sizeCategory)) { + if (SizeCategories.IS_HORS_VRAC.apply(sizeCategory)) { // hors vrac case sampleType = sampleTypeUnsorted; @@ -294,7 +297,7 @@ public class CatchesImportService extends AbstractImportDataService<CatchesImpor Map<String, SexCategory> sexCategoryMap = persistenceService.getEntitiesMap( SexCategory.class, - EchoBaseFunctions.SEX_CATEGORY_NAME); + SexCategories.SEX_CATEGORY_NAME); EchoBaseCsvFileImportResult importResult = newImportResult(inputFile); @@ -420,7 +423,7 @@ public class CatchesImportService extends AbstractImportDataService<CatchesImpor Map<String, SampleDataType> sampleDataTypeMap = persistenceService.getEntitiesMap( SampleDataType.class, - EchoBaseFunctions.SAMPLE_DATA_TYPE_NAME); + SampleDataTypes.SAMPLE_DATA_TYPE_NAME); EchoBaseCsvFileImportResult importResult = newImportResult(inputFile); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportService.java index 3b3cd2e..fa45965 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportService.java @@ -20,9 +20,9 @@ */ package fr.ifremer.echobase.services.service.importdata; -import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.references.Vessel; +import fr.ifremer.echobase.entities.references.Vessels; import javax.inject.Inject; import java.util.Map; @@ -50,7 +50,7 @@ public class CommonAllImportService extends AbstractImportDataService<CommonImpo // get usable vessels Map<String, Vessel> vesselMap = persistenceService.getEntitiesMap( - Vessel.class, EchoBaseFunctions.VESSEL_NAME); + Vessel.class, Vessels.VESSEL_NAME); EchoBaseCsvFileImportResult importResult; diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportService.java index 358d337..58f3800 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportService.java @@ -21,13 +21,14 @@ package fr.ifremer.echobase.services.service.importdata; import com.google.common.collect.Maps; -import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; import fr.ifremer.echobase.entities.data.Transect; import fr.ifremer.echobase.entities.data.Transit; import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.data.Voyages; import fr.ifremer.echobase.entities.references.Vessel; +import fr.ifremer.echobase.entities.references.Vessels; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.service.importdata.csv.TransectImportModel; import fr.ifremer.echobase.services.service.importdata.csv.TransectImportRow; @@ -62,7 +63,7 @@ public class CommonTransectImportService extends AbstractImportDataService<Commo // get usable vessels Map<String, Vessel> vesselMap = persistenceService.getEntitiesMap( - Vessel.class, EchoBaseFunctions.VESSEL_NAME); + Vessel.class, Vessels.VESSEL_NAME); EchoBaseCsvFileImportResult importResult; @@ -90,7 +91,7 @@ public class CommonTransectImportService extends AbstractImportDataService<Commo // restrict voyage to use to this voyage Map<String, Voyage> voyageMap = Maps.uniqueIndex( - Arrays.asList(voyage), EchoBaseFunctions.VOYAGE_NAME); + Arrays.asList(voyage), Voyages.VOYAGE_NAME); String datum = configuration.getDatum(); String license = configuration.getTransectLicence(); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportService.java index 71cfe62..7e71d76 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportService.java @@ -22,11 +22,11 @@ package fr.ifremer.echobase.services.service.importdata; */ import com.google.common.collect.Maps; -import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; import fr.ifremer.echobase.entities.data.Transit; import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.data.Voyages; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.service.importdata.csv.TransitImportModel; import fr.ifremer.echobase.services.service.importdata.csv.TransitImportRow; @@ -79,7 +79,7 @@ public class CommonTransitImportService extends AbstractImportDataService<Common // restrict voyage to use to this voyage Map<String, Voyage> voyageMap = Maps.uniqueIndex( - Arrays.asList(voyage), EchoBaseFunctions.VOYAGE_NAME); + Arrays.asList(voyage), Voyages.VOYAGE_NAME); String relatedActivity = configuration.getTransitRelatedActivity(); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/OperationImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/OperationImportService.java index 6f90a22..6941a55 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/OperationImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/OperationImportService.java @@ -21,20 +21,25 @@ package fr.ifremer.echobase.services.service.importdata; import com.google.common.collect.Maps; -import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; import fr.ifremer.echobase.entities.data.GearMetadataValue; import fr.ifremer.echobase.entities.data.Operation; import fr.ifremer.echobase.entities.data.OperationMetadataValue; +import fr.ifremer.echobase.entities.data.Operations; import fr.ifremer.echobase.entities.data.Transect; import fr.ifremer.echobase.entities.data.Transit; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.DepthStratum; +import fr.ifremer.echobase.entities.references.DepthStratums; import fr.ifremer.echobase.entities.references.Gear; import fr.ifremer.echobase.entities.references.GearMetadata; +import fr.ifremer.echobase.entities.references.GearMetadatas; +import fr.ifremer.echobase.entities.references.Gears; import fr.ifremer.echobase.entities.references.OperationMetadata; +import fr.ifremer.echobase.entities.references.OperationMetadatas; import fr.ifremer.echobase.entities.references.Vessel; +import fr.ifremer.echobase.entities.references.Vessels; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.service.importdata.csv.GearMetadataValueImportModel; import fr.ifremer.echobase.services.service.importdata.csv.GearMetadataValueImportRow; @@ -75,11 +80,11 @@ public class OperationImportService extends AbstractImportDataService<OperationI // get usable vessels from the voyage by their name Map<String, Vessel> vesselMap = Maps.uniqueIndex( - voyage.getAllVessels(), EchoBaseFunctions.VESSEL_NAME); + voyage.getAllVessels(), Vessels.VESSEL_NAME); // get usable gears by their casino gear name Map<String, Gear> gearMap = persistenceService.getEntitiesMap( - Gear.class, EchoBaseFunctions.GEAR_CASINO_GEAR_NAME); + Gear.class, Gears.GEAR_CASINO_GEAR_NAME); EchoBaseCsvFileImportResult importResult; @@ -94,7 +99,7 @@ public class OperationImportService extends AbstractImportDataService<OperationI // split them by operation Id Map<String, Operation> operationMap = Maps.uniqueIndex( - operations, EchoBaseFunctions.OPERATION_ID); + operations, Operations.OPERATION_ID); importResult = importOperationMetadataFile(configuration, vesselMap, @@ -125,7 +130,7 @@ public class OperationImportService extends AbstractImportDataService<OperationI EchoBaseCsvFileImportResult importResult = newImportResult(inputFile); Map<String, DepthStratum> depthStratumMap = persistenceService.getEntitiesMap( - DepthStratum.class, EchoBaseFunctions.DEPTH_STRATUM_ID); + DepthStratum.class, DepthStratums.DEPTH_STRATUM_ID); OperationImportModel csvModel = new OperationImportModel(getCsvSeparator(), @@ -187,7 +192,7 @@ public class OperationImportService extends AbstractImportDataService<OperationI Map<String, OperationMetadata> operationMetadatasByName = persistenceService.getEntitiesMap(OperationMetadata.class, - EchoBaseFunctions.OPERATION_METADATA_NAME); + OperationMetadatas.OPERATION_METADATA_NAME); OperationMetadataValueImportModel csvModel = new OperationMetadataValueImportModel(getCsvSeparator(), @@ -240,7 +245,7 @@ public class OperationImportService extends AbstractImportDataService<OperationI Map<String, GearMetadata> gearMetadatasByType = persistenceService.getEntitiesMap(GearMetadata.class, - EchoBaseFunctions.GEAR_METADATA_NAME); + GearMetadatas.GEAR_METADATA_NAME); GearMetadataValueImportModel csvModel = new GearMetadataValueImportModel(getCsvSeparator(), diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportService.java index b04e6af..e0d6212 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportService.java @@ -21,19 +21,26 @@ package fr.ifremer.echobase.services.service.importdata; import com.google.common.collect.Maps; -import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Cell; +import fr.ifremer.echobase.entities.data.Cells; import fr.ifremer.echobase.entities.data.DataProcessing; import fr.ifremer.echobase.entities.data.Echotype; +import fr.ifremer.echobase.entities.data.Echotypes; import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.data.Voyages; +import fr.ifremer.echobase.entities.references.AgeCategories; import fr.ifremer.echobase.entities.references.AgeCategory; import fr.ifremer.echobase.entities.references.DataMetadata; +import fr.ifremer.echobase.entities.references.DataMetadatas; +import fr.ifremer.echobase.entities.references.DataQualities; import fr.ifremer.echobase.entities.references.DataQuality; +import fr.ifremer.echobase.entities.references.SizeCategories; import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.entities.references.Species; +import fr.ifremer.echobase.entities.references.Species2; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.service.importdata.csv.EsduResultByEchotypeAndSpeciesCategoryImportModel; import fr.ifremer.echobase.services.service.importdata.csv.EsduResultByEchotypeAndSpeciesCategoryImportRow; @@ -72,21 +79,21 @@ public class ResultsEsduCellImportService extends AbstractImportDataService<Resu EchoBaseUser user) throws ImportException { Map<String, Species> speciesMap = persistenceService.getEntitiesMap( - Species.class, EchoBaseFunctions.SPECIES_BARACOUDA_CODE); + Species.class, Species2.SPECIES_BARACOUDA_CODE); Map<String, SizeCategory> sizeCategoryMap = Maps.newTreeMap(); sizeCategoryMap.putAll(persistenceService.getEntitiesMap( - SizeCategory.class, EchoBaseFunctions.SIZE_CATEGORY_NAME)); + SizeCategory.class, SizeCategories.SIZE_CATEGORY_NAME)); Map<String, AgeCategory> ageCategoryMap = Maps.newTreeMap(); ageCategoryMap.putAll(persistenceService.getEntitiesMap( - AgeCategory.class, EchoBaseFunctions.AGE_CATEGORY_NAME)); + AgeCategory.class, AgeCategories.AGE_CATEGORY_NAME)); Map<String, DataMetadata> dataMetadataMap = persistenceService.getEntitiesMap( - DataMetadata.class, EchoBaseFunctions.DATA_METADATA_NAME); + DataMetadata.class, DataMetadatas.DATA_METADATA_NAME); Map<String, DataQuality> dataQualityMap = persistenceService.getEntitiesMap( - DataQuality.class, EchoBaseFunctions.DATA_QUALITY_NAME); + DataQuality.class, DataQualities.DATA_QUALITY_NAME); // get selected voyage Voyage voyage = persistenceService.getVoyage( @@ -98,15 +105,15 @@ public class ResultsEsduCellImportService extends AbstractImportDataService<Resu // authorize only the selected voyage to be imported Map<String, Voyage> voyageMap = Maps.uniqueIndex(Arrays.asList( - voyage), EchoBaseFunctions.VOYAGE_NAME); + voyage), Voyages.VOYAGE_NAME); // get esdu cells usables Map<String, Cell> esduCellMap = Maps.uniqueIndex( - dataProcessing.getCell(), EchoBaseFunctions.CELL_BY_NAME); + dataProcessing.getCell(), Cells.CELL_BY_NAME); // index all echotypes of this voyage Map<String, Echotype> echotypeMap = Maps.uniqueIndex( - voyage.getEchotype(), EchoBaseFunctions.ECHOTYPE_NAME); + voyage.getEchotype(), Echotypes.ECHOTYPE_NAME); InputFile inputFile; EchoBaseCsvFileImportResult importResult; diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportService.java index 754cd20..46961c5 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportService.java @@ -21,20 +21,25 @@ package fr.ifremer.echobase.services.service.importdata; import com.google.common.collect.Maps; -import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.data.Voyages; +import fr.ifremer.echobase.entities.references.AgeCategories; import fr.ifremer.echobase.entities.references.AgeCategory; import fr.ifremer.echobase.entities.references.CellType; import fr.ifremer.echobase.entities.references.CellTypeImpl; import fr.ifremer.echobase.entities.references.DataMetadata; import fr.ifremer.echobase.entities.references.DataMetadataImpl; +import fr.ifremer.echobase.entities.references.DataMetadatas; +import fr.ifremer.echobase.entities.references.DataQualities; import fr.ifremer.echobase.entities.references.DataQuality; +import fr.ifremer.echobase.entities.references.SizeCategories; import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.entities.references.Species; +import fr.ifremer.echobase.entities.references.Species2; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.service.importdata.csv.MapCellImportModel; import fr.ifremer.echobase.services.service.importdata.csv.MapCellImportRow; @@ -104,24 +109,24 @@ public class ResultsMapFishCellImportService extends AbstractImportDataService<R // authorize only the selected voyage to be imported Map<String, Voyage> voyageMap = Maps.uniqueIndex(Arrays.asList( - voyage), EchoBaseFunctions.VOYAGE_NAME); + voyage), Voyages.VOYAGE_NAME); Map<String, Species> speciesMap = persistenceService.getEntitiesMap( - Species.class, EchoBaseFunctions.SPECIES_BARACOUDA_CODE); + Species.class, Species2.SPECIES_BARACOUDA_CODE); Map<String, SizeCategory> sizeCategoryMap = Maps.newTreeMap(); sizeCategoryMap.putAll(persistenceService.getEntitiesMap( - SizeCategory.class, EchoBaseFunctions.SIZE_CATEGORY_NAME)); + SizeCategory.class, SizeCategories.SIZE_CATEGORY_NAME)); Map<String, AgeCategory> ageCategoryMap = Maps.newTreeMap(); ageCategoryMap.putAll(persistenceService.getEntitiesMap( - AgeCategory.class, EchoBaseFunctions.AGE_CATEGORY_NAME)); + AgeCategory.class, AgeCategories.AGE_CATEGORY_NAME)); Map<String, DataMetadata> dataMetadataMap = persistenceService.getEntitiesMap( - DataMetadata.class, EchoBaseFunctions.DATA_METADATA_NAME); + DataMetadata.class, DataMetadatas.DATA_METADATA_NAME); Map<String, DataQuality> dataQualityMap = persistenceService.getEntitiesMap( - DataQuality.class, EchoBaseFunctions.DATA_QUALITY_NAME); + DataQuality.class, DataQualities.DATA_QUALITY_NAME); // first get header of file to detect which results to import String[] header = CsvReaders.getHeader(inputFile.getFile(), diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportService.java index f89d858..0b654c4 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportService.java @@ -22,15 +22,17 @@ package fr.ifremer.echobase.services.service.importdata; */ import com.google.common.collect.Maps; -import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.data.Voyages; import fr.ifremer.echobase.entities.references.CellType; import fr.ifremer.echobase.entities.references.CellTypeImpl; import fr.ifremer.echobase.entities.references.DataMetadata; import fr.ifremer.echobase.entities.references.DataMetadataImpl; +import fr.ifremer.echobase.entities.references.DataMetadatas; +import fr.ifremer.echobase.entities.references.DataQualities; import fr.ifremer.echobase.entities.references.DataQuality; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.service.importdata.csv.MapCellImportModel; @@ -100,13 +102,13 @@ public class ResultsMapOtherCellImportService extends AbstractImportDataService< // authorize only the selected voyage to be imported Map<String, Voyage> voyageMap = Maps.uniqueIndex(Arrays.asList( - voyage), EchoBaseFunctions.VOYAGE_NAME); + voyage), Voyages.VOYAGE_NAME); Map<String, DataMetadata> dataMetadataMap = persistenceService.getEntitiesMap( - DataMetadata.class, EchoBaseFunctions.DATA_METADATA_NAME); + DataMetadata.class, DataMetadatas.DATA_METADATA_NAME); Map<String, DataQuality> dataQualityMap = persistenceService.getEntitiesMap( - DataQuality.class, EchoBaseFunctions.DATA_QUALITY_NAME); + DataQuality.class, DataQualities.DATA_QUALITY_NAME); // first get header of file to detect which results to import String[] header = CsvReaders.getHeader(inputFile.getFile(), diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportService.java index dd258d9..75cd81d 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportService.java @@ -21,19 +21,26 @@ package fr.ifremer.echobase.services.service.importdata; import com.google.common.collect.Maps; -import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Cell; +import fr.ifremer.echobase.entities.data.Cells; import fr.ifremer.echobase.entities.data.Echotype; +import fr.ifremer.echobase.entities.data.Echotypes; import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.data.Voyages; import fr.ifremer.echobase.entities.references.CellType; +import fr.ifremer.echobase.entities.references.CellTypes; import fr.ifremer.echobase.entities.references.DataMetadata; import fr.ifremer.echobase.entities.references.DataMetadataImpl; +import fr.ifremer.echobase.entities.references.DataMetadatas; +import fr.ifremer.echobase.entities.references.DataQualities; import fr.ifremer.echobase.entities.references.DataQuality; +import fr.ifremer.echobase.entities.references.SizeCategories; import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.entities.references.Species; +import fr.ifremer.echobase.entities.references.Species2; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.service.importdata.csv.RegionCellAssociationImportModel; import fr.ifremer.echobase.services.service.importdata.csv.RegionCellAssociationImportRow; @@ -74,7 +81,7 @@ public class ResultsRegionCellImportService extends AbstractImportDataService<Re configuration.getVoyageId()); Map<String, DataQuality> dataQualityMap = persistenceService.getEntitiesMap( - DataQuality.class, EchoBaseFunctions.DATA_QUALITY_NAME); + DataQuality.class, DataQualities.DATA_QUALITY_NAME); EchoBaseCsvFileImportResult importResult; @@ -103,12 +110,12 @@ public class ResultsRegionCellImportService extends AbstractImportDataService<Re // authorize only the selected voyage to be imported Map<String, Voyage> voyageMap = Maps.uniqueIndex(Arrays.asList( - voyage), EchoBaseFunctions.VOYAGE_NAME); + voyage), Voyages.VOYAGE_NAME); // authorize only to use region* cell types Map<String, CellType> cellTypeMap = Maps.uniqueIndex( allCellTypes, - EchoBaseFunctions.CELL_TYPE_ID); + CellTypes.CELL_TYPE_ID); RegionCellImportModel csvModel = new RegionCellImportModel( getCsvSeparator(), @@ -181,10 +188,10 @@ public class ResultsRegionCellImportService extends AbstractImportDataService<Re // authorize only the selected voyage to be imported Map<String, Voyage> voyageMap = Maps.uniqueIndex(Arrays.asList( - voyage), EchoBaseFunctions.VOYAGE_NAME); + voyage), Voyages.VOYAGE_NAME); Map<String, Cell> regionsMap = Maps.uniqueIndex( - voyage.getRegionCells(), EchoBaseFunctions.CELL_BY_NAME); + voyage.getRegionCells(), Cells.CELL_BY_NAME); RegionCellAssociationImportModel csvModel = new RegionCellAssociationImportModel( getCsvSeparator(), @@ -233,25 +240,25 @@ public class ResultsRegionCellImportService extends AbstractImportDataService<Re // authorize only the selected voyage to be imported Map<String, Voyage> voyageMap = Maps.uniqueIndex(Arrays.asList( - voyage), EchoBaseFunctions.VOYAGE_NAME); + voyage), Voyages.VOYAGE_NAME); // index regions of the voyage Map<String, Cell> regionsMap = Maps.uniqueIndex( - voyage.getRegionCells(), EchoBaseFunctions.CELL_BY_NAME); + voyage.getRegionCells(), Cells.CELL_BY_NAME); // index all echotypes of thi voyage Map<String, Echotype> echotypeMap = Maps.uniqueIndex( - voyage.getEchotype(), EchoBaseFunctions.ECHOTYPE_NAME); + voyage.getEchotype(), Echotypes.ECHOTYPE_NAME); Map<String, Species> speciesMap = persistenceService.getEntitiesMap( - Species.class, EchoBaseFunctions.SPECIES_BARACOUDA_CODE); + Species.class, Species2.SPECIES_BARACOUDA_CODE); Map<String, SizeCategory> sizeCategoryMap = Maps.newTreeMap(); sizeCategoryMap.putAll(persistenceService.getEntitiesMap( - SizeCategory.class, EchoBaseFunctions.SIZE_CATEGORY_NAME)); + SizeCategory.class, SizeCategories.SIZE_CATEGORY_NAME)); Map<String, DataMetadata> dataMetadataMap = persistenceService.getEntitiesMap( - DataMetadata.class, EchoBaseFunctions.DATA_METADATA_NAME); + DataMetadata.class, DataMetadatas.DATA_METADATA_NAME); // first get header of file to detect which results to import String[] header = CsvReaders.getHeader(inputFile.getFile(), diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportService.java index 3dd07d5..d30c53f 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportService.java @@ -23,19 +23,23 @@ package fr.ifremer.echobase.services.service.importdata; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; -import fr.ifremer.echobase.EchoBaseFunctions; -import fr.ifremer.echobase.EchoBasePredicates; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; import fr.ifremer.echobase.entities.data.Echotype; +import fr.ifremer.echobase.entities.data.Echotypes; import fr.ifremer.echobase.entities.data.LengthAgeKey; import fr.ifremer.echobase.entities.data.LengthWeightKey; import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.data.Voyages; import fr.ifremer.echobase.entities.references.DepthStratum; +import fr.ifremer.echobase.entities.references.DepthStratums; +import fr.ifremer.echobase.entities.references.SizeCategories; import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.entities.references.Species; +import fr.ifremer.echobase.entities.references.Species2; import fr.ifremer.echobase.entities.references.SpeciesCategory; import fr.ifremer.echobase.entities.references.Strata; +import fr.ifremer.echobase.entities.references.Stratas; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.service.importdata.csv.EchotypeImportModel; import fr.ifremer.echobase.services.service.importdata.csv.EchotypeImportRow; @@ -71,10 +75,10 @@ public class ResultsVoyageImportService extends AbstractImportDataService<Result Map<String, Species> speciesMap = persistenceService.getEntitiesMap( Species.class, - EchoBaseFunctions.SPECIES_BARACOUDA_CODE); + Species2.SPECIES_BARACOUDA_CODE); Map<String, Strata> strataMap = persistenceService.getEntitiesMap( - Strata.class, EchoBaseFunctions.STRATA_BY_NAME); + Strata.class, Stratas.STRATA_BY_NAME); // get selected voyage Voyage voyage = persistenceService.getVoyage( @@ -82,7 +86,7 @@ public class ResultsVoyageImportService extends AbstractImportDataService<Result // authorize only the selected voyage to be imported Map<String, Voyage> voyageMap = Maps.uniqueIndex(Arrays.asList( - voyage), EchoBaseFunctions.VOYAGE_NAME); + voyage), Voyages.VOYAGE_NAME); InputFile inputFile; @@ -144,7 +148,7 @@ public class ResultsVoyageImportService extends AbstractImportDataService<Result Map<String, SizeCategory> sizeCategoryMap = persistenceService.getEntitiesMap( SizeCategory.class, - EchoBaseFunctions.SIZE_CATEGORY_NAME); + SizeCategories.SIZE_CATEGORY_NAME); LengthWeightKeyImportModel csvModel = new LengthWeightKeyImportModel( getCsvSeparator(), @@ -266,7 +270,7 @@ public class ResultsVoyageImportService extends AbstractImportDataService<Result Map<String, DepthStratum> depthStratumMap = persistenceService.getEntitiesMap( DepthStratum.class, - EchoBaseFunctions.DEPTH_STRATUM_ID); + DepthStratums.DEPTH_STRATUM_ID); EchotypeImportModel csvModel = new EchotypeImportModel( getCsvSeparator(), @@ -299,7 +303,7 @@ public class ResultsVoyageImportService extends AbstractImportDataService<Result Collection<Echotype> echotypes = voyage.getEchotype(); Predicate<Echotype> predicate = - EchoBasePredicates.newEchotypeByNamePredicate( + Echotypes.newEchotypeByNamePredicate( echotypeName); echotype = Iterables.find(echotypes, predicate, null); diff --git a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataServiceIT.java b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataServiceIT.java index 026f292..0852c93 100644 --- a/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataServiceIT.java +++ b/echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataServiceIT.java @@ -22,11 +22,11 @@ package fr.ifremer.echobase.services.service.importdata; import com.google.common.collect.Collections2; import com.google.common.collect.Sets; -import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.csv.EchoBaseCsvUtil; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.CellTopiaDao; +import fr.ifremer.echobase.entities.data.Cells; import fr.ifremer.echobase.entities.data.Data; import fr.ifremer.echobase.entities.data.DataAcquisition; import fr.ifremer.echobase.entities.data.DataProcessing; @@ -208,7 +208,7 @@ public abstract class AbstractImportDataServiceIT extends EchoBaseTestServiceSup cellsNames = Sets.newHashSet(); } else { cellsNames = Sets.newHashSet(Collections2.transform( - dataProcessing.getCell(), EchoBaseFunctions.CELL_BY_NAME)); + dataProcessing.getCell(), Cells.CELL_BY_NAME)); } ResultEdsuImportMockImportModel csvModel = new ResultEdsuImportMockImportModel( -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.