[Echobase-commits] 01/03: Rename voyage region import data classes

This is an automated email from the git hooks/post-receive script. New commit to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 3055fcc9cfc866aa352d0036e6681ec780df8d0c Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 4 17:00:07 2016 +0200 Rename voyage region import data classes --- ...VoyageResultsRegionAssociationImportAction.java | 20 ++--- .../actions/VoyageResultsRegionImportAction.java | 20 ++--- .../VoyageResultsRegionResultsImportAction.java | 26 +++--- ...chotypeAndSpeciesCategoryImportExportModel.java | 4 +- .../csv/EsduResultByEchotypeImportExportModel.java | 4 +- ...ltBySpeciesAndAgeCategoryImportExportModel.java | 4 +- ...tBySpeciesAndSizeCategoryImportExportModel.java | 4 +- .../RegionCellAssociationImportExportModel.java | 68 --------------- .../csv/RegionCellImportExportModel.java | 71 ---------------- .../csv/RegionCellResultImportExportModel.java | 96 ---------------------- ...ultsRegionCellAssociationImportExportModel.java | 68 +++++++++++++++ ...yageResultsRegionCellAssociationImportRow.java} | 10 +-- .../VoyageResultsRegionCellImportExportModel.java | 71 ++++++++++++++++ ....java => VoyageResultsRegionCellImportRow.java} | 10 +-- ...geResultsRegionCellResultImportExportModel.java | 96 ++++++++++++++++++++++ ...=> VoyageResultsRegionCellResultImportRow.java} | 8 +- 16 files changed, 290 insertions(+), 290 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionAssociationImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionAssociationImportAction.java index 675c085..1bae3d6 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionAssociationImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionAssociationImportAction.java @@ -7,8 +7,8 @@ import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.service.importdata.ImportDataFileResult; import fr.ifremer.echobase.services.service.importdata.contexts.VoyageResultsImportDataContext; -import fr.ifremer.echobase.services.service.importdata.csv.RegionCellAssociationImportExportModel; -import fr.ifremer.echobase.services.service.importdata.csv.RegionCellAssociationImportRow; +import fr.ifremer.echobase.services.service.importdata.csv.VoyageResultsRegionCellAssociationImportExportModel; +import fr.ifremer.echobase.services.service.importdata.csv.VoyageResultsRegionCellAssociationImportRow; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.csv.Import; @@ -22,7 +22,7 @@ import java.util.Map; * @author Tony Chemit - chemit@codelutin.com * @since 4.0 */ -public class VoyageResultsRegionAssociationImportAction extends VoyageResultsImportDataActionSupport<RegionCellAssociationImportRow> { +public class VoyageResultsRegionAssociationImportAction extends VoyageResultsImportDataActionSupport<VoyageResultsRegionCellAssociationImportRow> { /** Logger. */ private static final Log log = LogFactory.getLog(VoyageResultsRegionAssociationImportAction.class); @@ -32,13 +32,13 @@ public class VoyageResultsRegionAssociationImportAction extends VoyageResultsImp } @Override - protected RegionCellAssociationImportExportModel createCsvImportModel(VoyageResultsImportDataContext importDataContext) { - return RegionCellAssociationImportExportModel.forImport(importDataContext); + protected VoyageResultsRegionCellAssociationImportExportModel createCsvImportModel(VoyageResultsImportDataContext importDataContext) { + return VoyageResultsRegionCellAssociationImportExportModel.forImport(importDataContext); } @Override - protected RegionCellAssociationImportExportModel createCsvExportModel(VoyageResultsImportDataContext importDataContext) { - return RegionCellAssociationImportExportModel.forExport(importDataContext); + protected VoyageResultsRegionCellAssociationImportExportModel createCsvExportModel(VoyageResultsImportDataContext importDataContext) { + return VoyageResultsRegionCellAssociationImportExportModel.forExport(importDataContext); } private final Map<String, String> esduCellDataIdToRegionCellId = new LinkedHashMap<>(); @@ -50,11 +50,11 @@ public class VoyageResultsRegionAssociationImportAction extends VoyageResultsImp log.info("Starts import of Region cells association from file " + inputFile.getFileName()); } - try (Import<RegionCellAssociationImportRow> importer = open()) { + try (Import<VoyageResultsRegionCellAssociationImportRow> importer = open()) { incrementsProgress(); int rowNumber = 0; - for (RegionCellAssociationImportRow row : importer) { + for (VoyageResultsRegionCellAssociationImportRow row : importer) { doFlushTransaction(++rowNumber); @@ -96,7 +96,7 @@ public class VoyageResultsRegionAssociationImportAction extends VoyageResultsImp Cell regionCell = persistenceService.getCell(regionCellId); Preconditions.checkNotNull(regionCell); - RegionCellAssociationImportRow row = RegionCellAssociationImportRow.of(voyage, regionCell, esduCell); + VoyageResultsRegionCellAssociationImportRow row = VoyageResultsRegionCellAssociationImportRow.of(voyage, regionCell, esduCell); addImportedRow(result, row); } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionImportAction.java index e021356..684001b 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionImportAction.java @@ -14,8 +14,8 @@ import fr.ifremer.echobase.entities.references.DataQuality; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.service.importdata.ImportDataFileResult; import fr.ifremer.echobase.services.service.importdata.contexts.VoyageResultsImportDataContext; -import fr.ifremer.echobase.services.service.importdata.csv.RegionCellImportExportModel; -import fr.ifremer.echobase.services.service.importdata.csv.RegionCellImportRow; +import fr.ifremer.echobase.services.service.importdata.csv.VoyageResultsRegionCellImportExportModel; +import fr.ifremer.echobase.services.service.importdata.csv.VoyageResultsRegionCellImportRow; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.csv.Import; @@ -29,7 +29,7 @@ import java.util.TreeMap; * @author Tony Chemit - chemit@codelutin.com * @since 4.0 */ -public class VoyageResultsRegionImportAction extends VoyageResultsImportDataActionSupport<RegionCellImportRow> { +public class VoyageResultsRegionImportAction extends VoyageResultsImportDataActionSupport<VoyageResultsRegionCellImportRow> { /** Logger. */ private static final Log log = LogFactory.getLog(VoyageResultsRegionImportAction.class); @@ -39,13 +39,13 @@ public class VoyageResultsRegionImportAction extends VoyageResultsImportDataActi } @Override - protected RegionCellImportExportModel createCsvImportModel(VoyageResultsImportDataContext importDataContext) { - return RegionCellImportExportModel.forImport(importDataContext); + protected VoyageResultsRegionCellImportExportModel createCsvImportModel(VoyageResultsImportDataContext importDataContext) { + return VoyageResultsRegionCellImportExportModel.forImport(importDataContext); } @Override - protected RegionCellImportExportModel createCsvExportModel(VoyageResultsImportDataContext importDataContext) { - return RegionCellImportExportModel.forExport(importDataContext); + protected VoyageResultsRegionCellImportExportModel createCsvExportModel(VoyageResultsImportDataContext importDataContext) { + return VoyageResultsRegionCellImportExportModel.forExport(importDataContext); } private final Map<String, String> cellDataCoordinateIdToCellId = new TreeMap<>(); @@ -61,13 +61,13 @@ public class VoyageResultsRegionImportAction extends VoyageResultsImportDataActi } Voyage voyage = importDataContext.getVoyage(); - try (Import<RegionCellImportRow> importer = open()) { + try (Import<VoyageResultsRegionCellImportRow> importer = open()) { Cell cell = null; incrementsProgress(); int rowNumber = 0; - for (RegionCellImportRow row : importer) { + for (VoyageResultsRegionCellImportRow row : importer) { doFlushTransaction(++rowNumber); @@ -155,7 +155,7 @@ public class VoyageResultsRegionImportAction extends VoyageResultsImportDataActi String surfaceDataValue = optionalSurfaceData.get().getDataValue(); Preconditions.checkNotNull(coordinateData); - RegionCellImportRow row = RegionCellImportRow.of(voyage, cell, coordinateData, Float.valueOf(surfaceDataValue)); + VoyageResultsRegionCellImportRow row = VoyageResultsRegionCellImportRow.of(voyage, cell, coordinateData, Float.valueOf(surfaceDataValue)); addImportedRow(result, row); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionResultsImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionResultsImportAction.java index be8dd7a..6536bc1 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionResultsImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionResultsImportAction.java @@ -10,8 +10,8 @@ import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.service.importdata.ImportDataFileResult; import fr.ifremer.echobase.services.service.importdata.ResultCategoryCache; import fr.ifremer.echobase.services.service.importdata.contexts.VoyageResultsImportDataContext; -import fr.ifremer.echobase.services.service.importdata.csv.RegionCellResultImportExportModel; -import fr.ifremer.echobase.services.service.importdata.csv.RegionCellResultImportRow; +import fr.ifremer.echobase.services.service.importdata.csv.VoyageResultsRegionCellResultImportExportModel; +import fr.ifremer.echobase.services.service.importdata.csv.VoyageResultsRegionCellResultImportRow; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.csv.Import; @@ -27,7 +27,7 @@ import java.util.TreeMap; * @author Tony Chemit - chemit@codelutin.com * @since 4.0 */ -public class VoyageResultsRegionResultsImportAction extends VoyageResultsImportDataActionSupport<RegionCellResultImportRow> { +public class VoyageResultsRegionResultsImportAction extends VoyageResultsImportDataActionSupport<VoyageResultsRegionCellResultImportRow> { /** Logger. */ private static final Log log = LogFactory.getLog(VoyageResultsRegionResultsImportAction.class); @@ -36,17 +36,17 @@ public class VoyageResultsRegionResultsImportAction extends VoyageResultsImportD public VoyageResultsRegionResultsImportAction(VoyageResultsImportDataContext importDataContext) { super(importDataContext, importDataContext.getConfiguration().getRegionResultFile()); - metas = importDataContext.getMetas(getInputFile(), RegionCellResultImportExportModel.COLUMN_NAMES_TO_EXCLUDE); + metas = importDataContext.getMetas(getInputFile(), VoyageResultsRegionCellResultImportExportModel.COLUMN_NAMES_TO_EXCLUDE); } @Override - protected RegionCellResultImportExportModel createCsvImportModel(VoyageResultsImportDataContext importDataContext) { - return RegionCellResultImportExportModel.forImport(importDataContext, metas); + protected VoyageResultsRegionCellResultImportExportModel createCsvImportModel(VoyageResultsImportDataContext importDataContext) { + return VoyageResultsRegionCellResultImportExportModel.forImport(importDataContext, metas); } @Override - protected RegionCellResultImportExportModel createCsvExportModel(VoyageResultsImportDataContext importDataContext) { - return RegionCellResultImportExportModel.forExport(importDataContext, metas); + protected VoyageResultsRegionCellResultImportExportModel createCsvExportModel(VoyageResultsImportDataContext importDataContext) { + return VoyageResultsRegionCellResultImportExportModel.forExport(importDataContext, metas); } @@ -63,11 +63,11 @@ public class VoyageResultsRegionResultsImportAction extends VoyageResultsImportD ResultCategoryCache resultCategoryCache = importDataContext.getResultCategoryCache(); - try (Import<RegionCellResultImportRow> importer = open()) { + try (Import<VoyageResultsRegionCellResultImportRow> importer = open()) { incrementsProgress(); int rowNumber = 0; - for (RegionCellResultImportRow row : importer) { + for (VoyageResultsRegionCellResultImportRow row : importer) { doFlushTransaction(++rowNumber); @@ -117,7 +117,7 @@ public class VoyageResultsRegionResultsImportAction extends VoyageResultsImportD if (log.isInfoEnabled()) { log.info("Cell has changed, flushing " + cellResults.size() + " results for cell: " + cell + " with category " + lastCategory); } - RegionCellResultImportRow row = RegionCellResultImportRow.of(voyage, cell, lastCategory, cellResults); + VoyageResultsRegionCellResultImportRow row = VoyageResultsRegionCellResultImportRow.of(voyage, cell, lastCategory, cellResults); addImportedRow(result, row); @@ -151,7 +151,7 @@ public class VoyageResultsRegionResultsImportAction extends VoyageResultsImportD log.info("Cell result category has changed, flushing " + cellResults.size() + " results for cell: " + cell + " with category " + lastCategory); } - RegionCellResultImportRow row = RegionCellResultImportRow.of(voyage, cell, lastCategory, cellResults); + VoyageResultsRegionCellResultImportRow row = VoyageResultsRegionCellResultImportRow.of(voyage, cell, lastCategory, cellResults); addImportedRow(result, row); @@ -180,7 +180,7 @@ public class VoyageResultsRegionResultsImportAction extends VoyageResultsImportD // flush last cell Cell cell = persistenceService.getCell(lastCellId); - RegionCellResultImportRow row = RegionCellResultImportRow.of(voyage, cell, lastCategory, cellResults); + VoyageResultsRegionCellResultImportRow row = VoyageResultsRegionCellResultImportRow.of(voyage, cell, lastCategory, cellResults); addImportedRow(result, row); } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportExportModel.java index eb31871..de07a4f 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportExportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportExportModel.java @@ -57,7 +57,7 @@ public class EsduResultByEchotypeAndSpeciesCategoryImportExportModel extends Ech List<DataMetadata> dataMetadatas) { EsduResultByEchotypeAndSpeciesCategoryImportExportModel model = new EsduResultByEchotypeAndSpeciesCategoryImportExportModel(importDataContext.getCsvSeparator()); - model.newForeignKeyColumn(RegionCellImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, importDataContext.getVoyagesByName()); + model.newForeignKeyColumn(EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, importDataContext.getVoyagesByName()); model.newForeignKeyColumn(EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_ECHOTYPE, Echotype.class, Echotype.PROPERTY_NAME, importDataContext.getVoyageEchotypesByName()); model.newForeignKeyColumn(Species.PROPERTY_BARACOUDA_CODE, EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, importDataContext.getSpeciesByBaracoudaCode()); model.newForeignKeyColumn(EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, importDataContext.getSizeCategoriesByName()); @@ -79,7 +79,7 @@ public class EsduResultByEchotypeAndSpeciesCategoryImportExportModel extends Ech List<DataMetadata> dataMetadatas) { EsduResultByEchotypeAndSpeciesCategoryImportExportModel model = new EsduResultByEchotypeAndSpeciesCategoryImportExportModel(importDataContext.getCsvSeparator()); - model.newColumnForExport(RegionCellImportRow.PROPERTY_VOYAGE, EchoBaseCsvUtil.VOYAGE_FORMATTER); + model.newColumnForExport(EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_VOYAGE, EchoBaseCsvUtil.VOYAGE_FORMATTER); model.newColumnForExport(EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_ECHOTYPE, EchoBaseCsvUtil.ECHOTYPE_FORMATTER); model.newColumnForExport(Species.PROPERTY_BARACOUDA_CODE, EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_SPECIES, EchoBaseCsvUtil.SPECIES_FORMATTER); model.newColumnForExport(EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_SIZE_CATEGORY, EchoBaseCsvUtil.SIZE_CATEGORY_FORMATTER); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeImportExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeImportExportModel.java index 71a53a4..c44fdf7 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeImportExportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeImportExportModel.java @@ -53,7 +53,7 @@ public class EsduResultByEchotypeImportExportModel extends EchoBaseImportExportM List<DataMetadata> dataMetadatas) { EsduResultByEchotypeImportExportModel model = new EsduResultByEchotypeImportExportModel(importDataContext.getCsvSeparator()); - model.newForeignKeyColumn(RegionCellImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, importDataContext.getVoyagesByName()); + model.newForeignKeyColumn(EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, importDataContext.getVoyagesByName()); model.newForeignKeyColumn(EsduResultByEchotypeImportRow.PROPERTY_ECHOTYPE, Echotype.class, Echotype.PROPERTY_NAME, importDataContext.getVoyageEchotypesByName()); model.newMandatoryColumn(EchoBaseCsvUtil.CELL_NAME, EsduResultByEchotypeImportRow.PROPERTY_CELL, importDataContext.getCellValueParser()); model.newForeignKeyColumn(EsduResultByEchotypeImportRow.PROPERTY_DATA_QUALITY, DataQuality.class, DataQuality.PROPERTY_QUALITY_DATA_FLAG_VALUES, importDataContext.getDataQualitiesByName()); @@ -73,7 +73,7 @@ public class EsduResultByEchotypeImportExportModel extends EchoBaseImportExportM List<DataMetadata> dataMetadatas) { EsduResultByEchotypeImportExportModel model = new EsduResultByEchotypeImportExportModel(importDataContext.getCsvSeparator()); - model.newColumnForExport(RegionCellImportRow.PROPERTY_VOYAGE, EchoBaseCsvUtil.VOYAGE_FORMATTER); + model.newColumnForExport(EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_VOYAGE, EchoBaseCsvUtil.VOYAGE_FORMATTER); model.newColumnForExport(EsduResultByEchotypeImportRow.PROPERTY_ECHOTYPE, EchoBaseCsvUtil.ECHOTYPE_FORMATTER); model.newColumnForExport(EchoBaseCsvUtil.CELL_NAME, EsduResultByEchotypeImportRow.PROPERTY_CELL, importDataContext.getCellValueFormatter()); model.newColumnForExport(EsduResultByEchotypeImportRow.PROPERTY_DATA_QUALITY, EchoBaseCsvUtil.DATA_QUALITY_FORMATTER); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportExportModel.java index 97e9877..6b9eb38 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportExportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportExportModel.java @@ -55,7 +55,7 @@ public class EsduResultBySpeciesAndAgeCategoryImportExportModel extends EchoBase List<DataMetadata> dataMetadatas) { EsduResultBySpeciesAndAgeCategoryImportExportModel model = new EsduResultBySpeciesAndAgeCategoryImportExportModel(importDataContext.getCsvSeparator()); - model.newForeignKeyColumn(RegionCellImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, importDataContext.getVoyagesByName()); + model.newForeignKeyColumn(EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, importDataContext.getVoyagesByName()); model.newMandatoryColumn(EchoBaseCsvUtil.CELL_NAME, EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_CELL, importDataContext.getCellValueParser()); model.newMandatoryColumn(EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_AGE_CATEGORY); model.newMandatoryColumn(EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_AGE_CATEGORY_MEANING); @@ -77,7 +77,7 @@ public class EsduResultBySpeciesAndAgeCategoryImportExportModel extends EchoBase List<DataMetadata> dataMetadatas) { EsduResultBySpeciesAndAgeCategoryImportExportModel model = new EsduResultBySpeciesAndAgeCategoryImportExportModel(importDataContext.getCsvSeparator()); - model.newColumnForExport(RegionCellImportRow.PROPERTY_VOYAGE, EchoBaseCsvUtil.VOYAGE_FORMATTER); + model.newColumnForExport(EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_VOYAGE, EchoBaseCsvUtil.VOYAGE_FORMATTER); model.newColumnForExport(EchoBaseCsvUtil.CELL_NAME, EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_CELL, importDataContext.getCellValueFormatter()); model.newColumnForExport(EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_AGE_CATEGORY); model.newColumnForExport(EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_AGE_CATEGORY_MEANING); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportExportModel.java index 88977da..e1dcc52 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportExportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportExportModel.java @@ -55,7 +55,7 @@ public class EsduResultBySpeciesAndSizeCategoryImportExportModel extends EchoBas List<DataMetadata> dataMetadatas) { EsduResultBySpeciesAndSizeCategoryImportExportModel model = new EsduResultBySpeciesAndSizeCategoryImportExportModel(importDataContext.getCsvSeparator()); - model.newForeignKeyColumn(RegionCellImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, importDataContext.getVoyagesByName()); + model.newForeignKeyColumn(EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, importDataContext.getVoyagesByName()); model.newMandatoryColumn(EchoBaseCsvUtil.CELL_NAME, EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_CELL, importDataContext.getCellValueParser()); model.newMandatoryColumn(EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_SIZE_CATEGORY); model.newMandatoryColumn(EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_SIZE_CATEGORY_MEANING); @@ -77,7 +77,7 @@ public class EsduResultBySpeciesAndSizeCategoryImportExportModel extends EchoBas List<DataMetadata> dataMetadatas) { EsduResultBySpeciesAndSizeCategoryImportExportModel model = new EsduResultBySpeciesAndSizeCategoryImportExportModel(importDataContext.getCsvSeparator()); - model.newColumnForExport(RegionCellImportRow.PROPERTY_VOYAGE, EchoBaseCsvUtil.VOYAGE_FORMATTER); + model.newColumnForExport(EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_VOYAGE, EchoBaseCsvUtil.VOYAGE_FORMATTER); model.newColumnForExport(EchoBaseCsvUtil.CELL_NAME, EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_CELL, importDataContext.getCellValueFormatter()); model.newColumnForExport(EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_SIZE_CATEGORY); model.newColumnForExport(EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_SIZE_CATEGORY_MEANING); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellAssociationImportExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellAssociationImportExportModel.java deleted file mode 100644 index 93f6b71..0000000 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellAssociationImportExportModel.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * %% - * Copyright (C) 2011 - 2012 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.services.service.importdata.csv; - -import fr.ifremer.echobase.entities.data.Cell; -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.services.csv.EchoBaseCsvUtil; -import fr.ifremer.echobase.services.service.importdata.contexts.VoyageResultsImportDataContext; - -/** - * Model to import cells associations from region cells and esdu cells. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 0.3 - */ -public class RegionCellAssociationImportExportModel extends EchoBaseImportExportModelSupport<RegionCellAssociationImportRow> { - - public static final String HEADER_REGION_NAME = "regionName"; - public static final String HEADER_ESDU_NAME = "esduName"; - - - private RegionCellAssociationImportExportModel(char separator) { - super(separator); - } - - public static RegionCellAssociationImportExportModel forImport(VoyageResultsImportDataContext importDataContext) { - - RegionCellAssociationImportExportModel model = new RegionCellAssociationImportExportModel(importDataContext.getCsvSeparator()); - model.newForeignKeyColumn(RegionCellAssociationImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, importDataContext.getVoyagesByName()); - model.newForeignKeyColumn(HEADER_REGION_NAME, RegionCellAssociationImportRow.PROPERTY_REGION_CELL, Cell.class, Cell.PROPERTY_NAME, importDataContext.getVoyageRegionsByName()); - model.newMandatoryColumn(HEADER_ESDU_NAME, RegionCellAssociationImportRow.PROPERTY_ESDU_CELL, importDataContext.newCellValueParser()); - return model; - - } - - public static RegionCellAssociationImportExportModel forExport(VoyageResultsImportDataContext importDataContext) { - - RegionCellAssociationImportExportModel model = new RegionCellAssociationImportExportModel(importDataContext.getCsvSeparator()); - model.newColumnForExport(RegionCellAssociationImportRow.PROPERTY_VOYAGE, EchoBaseCsvUtil.VOYAGE_FORMATTER); - model.newColumnForExport(HEADER_REGION_NAME, RegionCellAssociationImportRow.PROPERTY_REGION_CELL, EchoBaseCsvUtil.CELL_FORMATTER); - model.newColumnForExport(HEADER_ESDU_NAME, RegionCellAssociationImportRow.PROPERTY_ESDU_CELL, importDataContext.newCellValueFormatter()); - return model; - - } - - @Override - public RegionCellAssociationImportRow newEmptyInstance() { - return new RegionCellAssociationImportRow(); - } -} diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportExportModel.java deleted file mode 100644 index f27cbaa..0000000 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportExportModel.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * %% - * Copyright (C) 2011 - 2012 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.services.service.importdata.csv; - -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.CellType; -import fr.ifremer.echobase.entities.references.DataQuality; -import fr.ifremer.echobase.services.csv.EchoBaseCsvUtil; -import fr.ifremer.echobase.services.service.importdata.contexts.VoyageResultsImportDataContext; - -/** - * Model to import cells (with type "region"). - * - * @author Tony Chemit - chemit@codelutin.com - * @since 0.3 - */ -public class RegionCellImportExportModel extends EchoBaseImportExportModelSupport<RegionCellImportRow> { - - private RegionCellImportExportModel(char separator) { - super(separator); - } - - public static RegionCellImportExportModel forImport(VoyageResultsImportDataContext importDataContext) { - - RegionCellImportExportModel model = new RegionCellImportExportModel(importDataContext.getCsvSeparator()); - model.newForeignKeyColumn(RegionCellImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, importDataContext.getVoyagesByName()); - model.newForeignKeyColumn(RegionCellImportRow.PROPERTY_CELL_TYPE, CellType.class, CellType.PROPERTY_ID, importDataContext.getRegionCellTypesById()); - model.newForeignKeyColumn(RegionCellImportRow.PROPERTY_DATA_QUALITY, DataQuality.class, DataQuality.PROPERTY_QUALITY_DATA_FLAG_VALUES, importDataContext.getDataQualitiesByName()); - model.newMandatoryColumn(RegionCellImportRow.PROPERTY_NAME); - model.newMandatoryColumn("regionEnvCoordinates", RegionCellImportRow.PROPERTY_DATA_COORDINATE); - model.newMandatoryColumn("surface", RegionCellImportRow.PROPERTY_DATA_SURFACE, EchoBaseCsvUtil.PRIMITIVE_FLOAT); - return model; - - } - - public static RegionCellImportExportModel forExport(VoyageResultsImportDataContext importDataContext) { - - RegionCellImportExportModel model = new RegionCellImportExportModel(importDataContext.getCsvSeparator()); - model.newColumnForExport(RegionCellImportRow.PROPERTY_VOYAGE, EchoBaseCsvUtil.VOYAGE_FORMATTER); - model.newColumnForExport(RegionCellImportRow.PROPERTY_CELL_TYPE, EchoBaseCsvUtil.CELL_TYPE_FORMATTER); - model.newColumnForExport(RegionCellImportRow.PROPERTY_DATA_QUALITY, EchoBaseCsvUtil.DATA_QUALITY_FORMATTER); - model.newColumnForExport(RegionCellImportRow.PROPERTY_NAME); - model.newColumnForExport("regionEnvCoordinates", RegionCellImportRow.PROPERTY_DATA_COORDINATE); - model.newColumnForExport("surface", RegionCellImportRow.PROPERTY_DATA_SURFACE, EchoBaseCsvUtil.PRIMITIVE_FLOAT); - return model; - - } - - @Override - public RegionCellImportRow newEmptyInstance() { - return new RegionCellImportRow(); - } -} diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellResultImportExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellResultImportExportModel.java deleted file mode 100644 index 7b7afd8..0000000 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellResultImportExportModel.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * %% - * Copyright (C) 2011 - 2012 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.services.service.importdata.csv; - -import fr.ifremer.echobase.entities.data.Cell; -import fr.ifremer.echobase.entities.data.Echotype; -import fr.ifremer.echobase.entities.data.Voyage; -import fr.ifremer.echobase.entities.references.DataMetadata; -import fr.ifremer.echobase.entities.references.DataQuality; -import fr.ifremer.echobase.entities.references.SizeCategory; -import fr.ifremer.echobase.entities.references.Species; -import fr.ifremer.echobase.services.csv.EchoBaseCsvUtil; -import fr.ifremer.echobase.services.service.importdata.contexts.VoyageResultsImportDataContext; - -import java.util.List; - -/** - * Model to import results of cell of type 'Region'. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 0.3 - */ -public class RegionCellResultImportExportModel extends EchoBaseImportExportModelSupport<RegionCellResultImportRow> { - - public static final String[] COLUMN_NAMES_TO_EXCLUDE = { - EchoBaseCsvUtil.CELL_NAME, - Species.PROPERTY_BARACOUDA_CODE, - RegionCellResultImportRow.PROPERTY_VOYAGE, - RegionCellResultImportRow.PROPERTY_SIZE_CATEGORY, - RegionCellResultImportRow.PROPERTY_ECHOTYPE, - RegionCellResultImportRow.PROPERTY_DATA_QUALITY - }; - - private RegionCellResultImportExportModel(char separator) { - super(separator); - } - - public static RegionCellResultImportExportModel forImport(VoyageResultsImportDataContext importDataContext, List<DataMetadata> dataMetadatas) { - - RegionCellResultImportExportModel model = new RegionCellResultImportExportModel(importDataContext.getCsvSeparator()); - model.newForeignKeyColumn(RegionCellResultImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, importDataContext.getVoyagesByName()); - model.newForeignKeyColumn(EchoBaseCsvUtil.CELL_NAME, RegionCellResultImportRow.PROPERTY_CELL, Cell.class, Cell.PROPERTY_NAME, importDataContext.getVoyageRegionsByName()); - model.newForeignKeyColumn(RegionCellResultImportRow.PROPERTY_ECHOTYPE, Echotype.class, Echotype.PROPERTY_NAME, importDataContext.getVoyageEchotypesByName()); - model.newForeignKeyColumn(Species.PROPERTY_BARACOUDA_CODE, RegionCellResultImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, importDataContext.getSpeciesByBaracoudaCode()); - model.newForeignKeyColumn(RegionCellResultImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, importDataContext.getSizeCategoriesByName()); - model.newForeignKeyColumn(RegionCellResultImportRow.PROPERTY_DATA_QUALITY, DataQuality.class, DataQuality.PROPERTY_QUALITY_DATA_FLAG_VALUES, importDataContext.getDataQualitiesByName()); - - for (DataMetadata metadata : dataMetadatas) { - model.newMandatoryColumn( - metadata.getName(), - EchoBaseCsvUtil.newResultValueParser(metadata, false), - EchoBaseCsvUtil.<RegionCellResultImportRow>newResultValueSetter()); - } - return model; - - } - - public static RegionCellResultImportExportModel forExport(VoyageResultsImportDataContext importDataContext, List<DataMetadata> dataMetadatas) { - - RegionCellResultImportExportModel model = new RegionCellResultImportExportModel(importDataContext.getCsvSeparator()); - model.newColumnForExport(RegionCellResultImportRow.PROPERTY_VOYAGE, EchoBaseCsvUtil.VOYAGE_FORMATTER); - model.newColumnForExport(EchoBaseCsvUtil.CELL_NAME, RegionCellResultImportRow.PROPERTY_CELL, EchoBaseCsvUtil.CELL_FORMATTER); - model.newColumnForExport(RegionCellResultImportRow.PROPERTY_ECHOTYPE, EchoBaseCsvUtil.ECHOTYPE_FORMATTER); - model.newColumnForExport(Species.PROPERTY_BARACOUDA_CODE, RegionCellResultImportRow.PROPERTY_SPECIES, EchoBaseCsvUtil.SPECIES_FORMATTER); - model.newColumnForExport(RegionCellResultImportRow.PROPERTY_SIZE_CATEGORY, EchoBaseCsvUtil.SIZE_CATEGORY_FORMATTER); - model.newColumnForExport(RegionCellResultImportRow.PROPERTY_DATA_QUALITY, EchoBaseCsvUtil.DATA_QUALITY_FORMATTER); - - addResultsColumns(model, dataMetadatas); - - return model; - - } - - @Override - public RegionCellResultImportRow newEmptyInstance() { - return new RegionCellResultImportRow(); - } -} diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellAssociationImportExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellAssociationImportExportModel.java new file mode 100644 index 0000000..2962618 --- /dev/null +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellAssociationImportExportModel.java @@ -0,0 +1,68 @@ +/* + * #%L + * EchoBase :: Services + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.services.service.importdata.csv; + +import fr.ifremer.echobase.entities.data.Cell; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.services.csv.EchoBaseCsvUtil; +import fr.ifremer.echobase.services.service.importdata.contexts.VoyageResultsImportDataContext; + +/** + * Model to import cells associations from region cells and esdu cells. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 0.3 + */ +public class VoyageResultsRegionCellAssociationImportExportModel extends EchoBaseImportExportModelSupport<VoyageResultsRegionCellAssociationImportRow> { + + public static final String HEADER_REGION_NAME = "regionName"; + public static final String HEADER_ESDU_NAME = "esduName"; + + + private VoyageResultsRegionCellAssociationImportExportModel(char separator) { + super(separator); + } + + public static VoyageResultsRegionCellAssociationImportExportModel forImport(VoyageResultsImportDataContext importDataContext) { + + VoyageResultsRegionCellAssociationImportExportModel model = new VoyageResultsRegionCellAssociationImportExportModel(importDataContext.getCsvSeparator()); + model.newForeignKeyColumn(VoyageResultsRegionCellAssociationImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, importDataContext.getVoyagesByName()); + model.newForeignKeyColumn(HEADER_REGION_NAME, VoyageResultsRegionCellAssociationImportRow.PROPERTY_REGION_CELL, Cell.class, Cell.PROPERTY_NAME, importDataContext.getVoyageRegionsByName()); + model.newMandatoryColumn(HEADER_ESDU_NAME, VoyageResultsRegionCellAssociationImportRow.PROPERTY_ESDU_CELL, importDataContext.newCellValueParser()); + return model; + + } + + public static VoyageResultsRegionCellAssociationImportExportModel forExport(VoyageResultsImportDataContext importDataContext) { + + VoyageResultsRegionCellAssociationImportExportModel model = new VoyageResultsRegionCellAssociationImportExportModel(importDataContext.getCsvSeparator()); + model.newColumnForExport(VoyageResultsRegionCellAssociationImportRow.PROPERTY_VOYAGE, EchoBaseCsvUtil.VOYAGE_FORMATTER); + model.newColumnForExport(HEADER_REGION_NAME, VoyageResultsRegionCellAssociationImportRow.PROPERTY_REGION_CELL, EchoBaseCsvUtil.CELL_FORMATTER); + model.newColumnForExport(HEADER_ESDU_NAME, VoyageResultsRegionCellAssociationImportRow.PROPERTY_ESDU_CELL, importDataContext.newCellValueFormatter()); + return model; + + } + + @Override + public VoyageResultsRegionCellAssociationImportRow newEmptyInstance() { + return new VoyageResultsRegionCellAssociationImportRow(); + } +} diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellAssociationImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellAssociationImportRow.java similarity index 81% rename from echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellAssociationImportRow.java rename to echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellAssociationImportRow.java index e2ebe59..3960510 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellAssociationImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellAssociationImportRow.java @@ -24,12 +24,12 @@ import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.Voyage; /** - * Bean used as a row for import of {@link RegionCellAssociationImportExportModel}. + * Bean used as a row for import of {@link VoyageResultsRegionCellAssociationImportExportModel}. * * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class RegionCellAssociationImportRow { +public class VoyageResultsRegionCellAssociationImportRow { public static final String PROPERTY_VOYAGE = "voyage"; public static final String PROPERTY_ESDU_CELL = "esduCell"; @@ -41,15 +41,15 @@ public class RegionCellAssociationImportRow { protected Cell regionCell; - public static RegionCellAssociationImportRow of(Voyage voyage, Cell regionCell, Cell esduCell) { - RegionCellAssociationImportRow row = new RegionCellAssociationImportRow(); + public static VoyageResultsRegionCellAssociationImportRow of(Voyage voyage, Cell regionCell, Cell esduCell) { + VoyageResultsRegionCellAssociationImportRow row = new VoyageResultsRegionCellAssociationImportRow(); row.setVoyage(voyage); row.setRegionCell(regionCell); row.setEsduCell(esduCell); return row; } - public RegionCellAssociationImportRow() { + public VoyageResultsRegionCellAssociationImportRow() { } public Voyage getVoyage() { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellImportExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellImportExportModel.java new file mode 100644 index 0000000..b2b0aef --- /dev/null +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellImportExportModel.java @@ -0,0 +1,71 @@ +/* + * #%L + * EchoBase :: Services + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.services.service.importdata.csv; + +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.CellType; +import fr.ifremer.echobase.entities.references.DataQuality; +import fr.ifremer.echobase.services.csv.EchoBaseCsvUtil; +import fr.ifremer.echobase.services.service.importdata.contexts.VoyageResultsImportDataContext; + +/** + * Model to import cells (with type "region"). + * + * @author Tony Chemit - chemit@codelutin.com + * @since 0.3 + */ +public class VoyageResultsRegionCellImportExportModel extends EchoBaseImportExportModelSupport<VoyageResultsRegionCellImportRow> { + + private VoyageResultsRegionCellImportExportModel(char separator) { + super(separator); + } + + public static VoyageResultsRegionCellImportExportModel forImport(VoyageResultsImportDataContext importDataContext) { + + VoyageResultsRegionCellImportExportModel model = new VoyageResultsRegionCellImportExportModel(importDataContext.getCsvSeparator()); + model.newForeignKeyColumn(VoyageResultsRegionCellImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, importDataContext.getVoyagesByName()); + model.newForeignKeyColumn(VoyageResultsRegionCellImportRow.PROPERTY_CELL_TYPE, CellType.class, CellType.PROPERTY_ID, importDataContext.getRegionCellTypesById()); + model.newForeignKeyColumn(VoyageResultsRegionCellImportRow.PROPERTY_DATA_QUALITY, DataQuality.class, DataQuality.PROPERTY_QUALITY_DATA_FLAG_VALUES, importDataContext.getDataQualitiesByName()); + model.newMandatoryColumn(VoyageResultsRegionCellImportRow.PROPERTY_NAME); + model.newMandatoryColumn("regionEnvCoordinates", VoyageResultsRegionCellImportRow.PROPERTY_DATA_COORDINATE); + model.newMandatoryColumn("surface", VoyageResultsRegionCellImportRow.PROPERTY_DATA_SURFACE, EchoBaseCsvUtil.PRIMITIVE_FLOAT); + return model; + + } + + public static VoyageResultsRegionCellImportExportModel forExport(VoyageResultsImportDataContext importDataContext) { + + VoyageResultsRegionCellImportExportModel model = new VoyageResultsRegionCellImportExportModel(importDataContext.getCsvSeparator()); + model.newColumnForExport(VoyageResultsRegionCellImportRow.PROPERTY_VOYAGE, EchoBaseCsvUtil.VOYAGE_FORMATTER); + model.newColumnForExport(VoyageResultsRegionCellImportRow.PROPERTY_CELL_TYPE, EchoBaseCsvUtil.CELL_TYPE_FORMATTER); + model.newColumnForExport(VoyageResultsRegionCellImportRow.PROPERTY_DATA_QUALITY, EchoBaseCsvUtil.DATA_QUALITY_FORMATTER); + model.newColumnForExport(VoyageResultsRegionCellImportRow.PROPERTY_NAME); + model.newColumnForExport("regionEnvCoordinates", VoyageResultsRegionCellImportRow.PROPERTY_DATA_COORDINATE); + model.newColumnForExport("surface", VoyageResultsRegionCellImportRow.PROPERTY_DATA_SURFACE, EchoBaseCsvUtil.PRIMITIVE_FLOAT); + return model; + + } + + @Override + public VoyageResultsRegionCellImportRow newEmptyInstance() { + return new VoyageResultsRegionCellImportRow(); + } +} diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellImportRow.java similarity index 88% rename from echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportRow.java rename to echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellImportRow.java index 2cacb38..8b16040 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellImportRow.java @@ -27,12 +27,12 @@ import fr.ifremer.echobase.entities.references.CellType; import fr.ifremer.echobase.entities.references.DataQuality; /** - * Bean used as a row for import of {@link RegionCellImportExportModel}. + * Bean used as a row for import of {@link VoyageResultsRegionCellImportExportModel}. * * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class RegionCellImportRow { +public class VoyageResultsRegionCellImportRow { public static final String PROPERTY_NAME = Cell.PROPERTY_NAME; @@ -58,7 +58,7 @@ public class RegionCellImportRow { protected float dataSurface; - public RegionCellImportRow() { + public VoyageResultsRegionCellImportRow() { } public Voyage getVoyage() { @@ -109,8 +109,8 @@ public class RegionCellImportRow { this.dataQuality = dataQuality; } - public static RegionCellImportRow of(Voyage voyage, Cell cell, Data coordinateData, float surfaceDataValue) { - RegionCellImportRow row = new RegionCellImportRow(); + public static VoyageResultsRegionCellImportRow of(Voyage voyage, Cell cell, Data coordinateData, float surfaceDataValue) { + VoyageResultsRegionCellImportRow row = new VoyageResultsRegionCellImportRow(); row.setVoyage(voyage); row.setName(cell.getName()); row.setCellType(cell.getCellType()); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellResultImportExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellResultImportExportModel.java new file mode 100644 index 0000000..4f7641f --- /dev/null +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellResultImportExportModel.java @@ -0,0 +1,96 @@ +/* + * #%L + * EchoBase :: Services + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.services.service.importdata.csv; + +import fr.ifremer.echobase.entities.data.Cell; +import fr.ifremer.echobase.entities.data.Echotype; +import fr.ifremer.echobase.entities.data.Voyage; +import fr.ifremer.echobase.entities.references.DataMetadata; +import fr.ifremer.echobase.entities.references.DataQuality; +import fr.ifremer.echobase.entities.references.SizeCategory; +import fr.ifremer.echobase.entities.references.Species; +import fr.ifremer.echobase.services.csv.EchoBaseCsvUtil; +import fr.ifremer.echobase.services.service.importdata.contexts.VoyageResultsImportDataContext; + +import java.util.List; + +/** + * Model to import results of cell of type 'Region'. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 0.3 + */ +public class VoyageResultsRegionCellResultImportExportModel extends EchoBaseImportExportModelSupport<VoyageResultsRegionCellResultImportRow> { + + public static final String[] COLUMN_NAMES_TO_EXCLUDE = { + EchoBaseCsvUtil.CELL_NAME, + Species.PROPERTY_BARACOUDA_CODE, + VoyageResultsRegionCellResultImportRow.PROPERTY_VOYAGE, + VoyageResultsRegionCellResultImportRow.PROPERTY_SIZE_CATEGORY, + VoyageResultsRegionCellResultImportRow.PROPERTY_ECHOTYPE, + VoyageResultsRegionCellResultImportRow.PROPERTY_DATA_QUALITY + }; + + private VoyageResultsRegionCellResultImportExportModel(char separator) { + super(separator); + } + + public static VoyageResultsRegionCellResultImportExportModel forImport(VoyageResultsImportDataContext importDataContext, List<DataMetadata> dataMetadatas) { + + VoyageResultsRegionCellResultImportExportModel model = new VoyageResultsRegionCellResultImportExportModel(importDataContext.getCsvSeparator()); + model.newForeignKeyColumn(VoyageResultsRegionCellResultImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, importDataContext.getVoyagesByName()); + model.newForeignKeyColumn(EchoBaseCsvUtil.CELL_NAME, VoyageResultsRegionCellResultImportRow.PROPERTY_CELL, Cell.class, Cell.PROPERTY_NAME, importDataContext.getVoyageRegionsByName()); + model.newForeignKeyColumn(VoyageResultsRegionCellResultImportRow.PROPERTY_ECHOTYPE, Echotype.class, Echotype.PROPERTY_NAME, importDataContext.getVoyageEchotypesByName()); + model.newForeignKeyColumn(Species.PROPERTY_BARACOUDA_CODE, VoyageResultsRegionCellResultImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, importDataContext.getSpeciesByBaracoudaCode()); + model.newForeignKeyColumn(VoyageResultsRegionCellResultImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, importDataContext.getSizeCategoriesByName()); + model.newForeignKeyColumn(VoyageResultsRegionCellResultImportRow.PROPERTY_DATA_QUALITY, DataQuality.class, DataQuality.PROPERTY_QUALITY_DATA_FLAG_VALUES, importDataContext.getDataQualitiesByName()); + + for (DataMetadata metadata : dataMetadatas) { + model.newMandatoryColumn( + metadata.getName(), + EchoBaseCsvUtil.newResultValueParser(metadata, false), + EchoBaseCsvUtil.<VoyageResultsRegionCellResultImportRow>newResultValueSetter()); + } + return model; + + } + + public static VoyageResultsRegionCellResultImportExportModel forExport(VoyageResultsImportDataContext importDataContext, List<DataMetadata> dataMetadatas) { + + VoyageResultsRegionCellResultImportExportModel model = new VoyageResultsRegionCellResultImportExportModel(importDataContext.getCsvSeparator()); + model.newColumnForExport(VoyageResultsRegionCellResultImportRow.PROPERTY_VOYAGE, EchoBaseCsvUtil.VOYAGE_FORMATTER); + model.newColumnForExport(EchoBaseCsvUtil.CELL_NAME, VoyageResultsRegionCellResultImportRow.PROPERTY_CELL, EchoBaseCsvUtil.CELL_FORMATTER); + model.newColumnForExport(VoyageResultsRegionCellResultImportRow.PROPERTY_ECHOTYPE, EchoBaseCsvUtil.ECHOTYPE_FORMATTER); + model.newColumnForExport(Species.PROPERTY_BARACOUDA_CODE, VoyageResultsRegionCellResultImportRow.PROPERTY_SPECIES, EchoBaseCsvUtil.SPECIES_FORMATTER); + model.newColumnForExport(VoyageResultsRegionCellResultImportRow.PROPERTY_SIZE_CATEGORY, EchoBaseCsvUtil.SIZE_CATEGORY_FORMATTER); + model.newColumnForExport(VoyageResultsRegionCellResultImportRow.PROPERTY_DATA_QUALITY, EchoBaseCsvUtil.DATA_QUALITY_FORMATTER); + + addResultsColumns(model, dataMetadatas); + + return model; + + } + + @Override + public VoyageResultsRegionCellResultImportRow newEmptyInstance() { + return new VoyageResultsRegionCellResultImportRow(); + } +} diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellResultImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellResultImportRow.java similarity index 90% rename from echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellResultImportRow.java rename to echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellResultImportRow.java index 6cbd0e9..65abf87 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellResultImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellResultImportRow.java @@ -35,12 +35,12 @@ import java.util.ArrayList; import java.util.List; /** - * Bean used as a row for import of {@link RegionCellResultImportExportModel}. + * Bean used as a row for import of {@link VoyageResultsRegionCellResultImportExportModel}. * * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class RegionCellResultImportRow implements ResultAble { +public class VoyageResultsRegionCellResultImportRow implements ResultAble { public static final String PROPERTY_NAME = "name"; @@ -130,14 +130,14 @@ public class RegionCellResultImportRow implements ResultAble { this.dataQuality = dataQuality; } - public static RegionCellResultImportRow of(Voyage voyage, Cell cell, Category category, List<Result> result) { + public static VoyageResultsRegionCellResultImportRow of(Voyage voyage, Cell cell, Category category, List<Result> result) { Preconditions.checkNotNull(voyage); Preconditions.checkNotNull(cell); Preconditions.checkNotNull(category); Preconditions.checkNotNull(result); Preconditions.checkArgument(!result.isEmpty()); - RegionCellResultImportRow row = new RegionCellResultImportRow(); + VoyageResultsRegionCellResultImportRow row = new VoyageResultsRegionCellResultImportRow(); row.setVoyage(voyage); row.setCell(cell); row.result.clear(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.