[Echobase-commits] 03/05: rename catches csv java 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 3748750a5d46c9fa2c2023749f540aacd0b464a6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 2 12:58:57 2016 +0200 rename catches csv java classes --- .../VoyageCatchesBiometrySampleImportAction.java | 20 ++--- .../VoyageCatchesSubSampleImportAction.java | 26 +++---- .../VoyageCatchesTotalSampleImportAction.java | 20 ++--- .../importdata/csv/SubSampleImportExportModel.java | 87 ---------------------- .../csv/TotalSampleImportExportModel.java | 78 ------------------- ...ageCatchesBiometrySampleImportExportModel.java} | 28 +++---- ...a => VoyageCatchesBiometrySampleImportRow.java} | 12 +-- .../VoyageCatchesSubSampleImportExportModel.java | 87 ++++++++++++++++++++++ ...w.java => VoyageCatchesSubSampleImportRow.java} | 12 +-- .../VoyageCatchesTotalSampleImportExportModel.java | 78 +++++++++++++++++++ ...java => VoyageCatchesTotalSampleImportRow.java} | 12 +-- 11 files changed, 230 insertions(+), 230 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesBiometrySampleImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesBiometrySampleImportAction.java index 1a88c77..bb01639 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesBiometrySampleImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesBiometrySampleImportAction.java @@ -12,8 +12,8 @@ import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.service.importdata.ImportDataFileResult; import fr.ifremer.echobase.services.service.importdata.SpeciesCategoryCache; import fr.ifremer.echobase.services.service.importdata.contexts.VoyageCatchesImportDataContext; -import fr.ifremer.echobase.services.service.importdata.csv.BiometrySampleImportExportModel; -import fr.ifremer.echobase.services.service.importdata.csv.BiometrySampleImportRow; +import fr.ifremer.echobase.services.service.importdata.csv.VoyageCatchesBiometrySampleImportExportModel; +import fr.ifremer.echobase.services.service.importdata.csv.VoyageCatchesBiometrySampleImportRow; 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 VoyageCatchesBiometrySampleImportAction extends VoyageCatchesImportDataActionSupport<BiometrySampleImportRow> { +public class VoyageCatchesBiometrySampleImportAction extends VoyageCatchesImportDataActionSupport<VoyageCatchesBiometrySampleImportRow> { /** Logger. */ private static final Log log = LogFactory.getLog(VoyageCatchesBiometrySampleImportAction.class); @@ -39,13 +39,13 @@ public class VoyageCatchesBiometrySampleImportAction extends VoyageCatchesImport } @Override - protected BiometrySampleImportExportModel createCsvImportModel(VoyageCatchesImportDataContext importDataContext) { - return BiometrySampleImportExportModel.forImport(importDataContext); + protected VoyageCatchesBiometrySampleImportExportModel createCsvImportModel(VoyageCatchesImportDataContext importDataContext) { + return VoyageCatchesBiometrySampleImportExportModel.forImport(importDataContext); } @Override - protected BiometrySampleImportExportModel createCsvExportModel(VoyageCatchesImportDataContext importDataContext) { - return BiometrySampleImportExportModel.forExport(importDataContext); + protected VoyageCatchesBiometrySampleImportExportModel createCsvExportModel(VoyageCatchesImportDataContext importDataContext) { + return VoyageCatchesBiometrySampleImportExportModel.forExport(importDataContext); } private final Map<String, String> sampleIdToOperationId = new TreeMap<>(); @@ -64,11 +64,11 @@ public class VoyageCatchesBiometrySampleImportAction extends VoyageCatchesImport SpeciesCategoryCache speciesCategoryCache = importDataContext.getSpeciesCategoryCache(); Map<String, Sample> samples = new TreeMap<>(); - try (Import<BiometrySampleImportRow> importer = open()) { + try (Import<VoyageCatchesBiometrySampleImportRow> importer = open()) { incrementsProgress(); int rowNumber = 0; - for (BiometrySampleImportRow row : importer) { + for (VoyageCatchesBiometrySampleImportRow row : importer) { doFlushTransaction(++rowNumber); @@ -149,7 +149,7 @@ public class VoyageCatchesBiometrySampleImportAction extends VoyageCatchesImport log.info("Adding sampleData: " + sampleId + " to imported export."); } - BiometrySampleImportRow importedRow = BiometrySampleImportRow.of(operation, sample, sampleData, numFish); + VoyageCatchesBiometrySampleImportRow importedRow = VoyageCatchesBiometrySampleImportRow.of(operation, sample, sampleData, numFish); addImportedRow(result, importedRow); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesSubSampleImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesSubSampleImportAction.java index 8db9d65..d54d785 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesSubSampleImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesSubSampleImportAction.java @@ -14,8 +14,8 @@ import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.service.importdata.ImportDataFileResult; import fr.ifremer.echobase.services.service.importdata.SpeciesCategoryCache; import fr.ifremer.echobase.services.service.importdata.contexts.VoyageCatchesImportDataContext; -import fr.ifremer.echobase.services.service.importdata.csv.SubSampleImportExportModel; -import fr.ifremer.echobase.services.service.importdata.csv.SubSampleImportRow; +import fr.ifremer.echobase.services.service.importdata.csv.VoyageCatchesSubSampleImportExportModel; +import fr.ifremer.echobase.services.service.importdata.csv.VoyageCatchesSubSampleImportRow; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.csv.Import; @@ -33,7 +33,7 @@ import java.util.TreeSet; * @author Tony Chemit - chemit@codelutin.com * @since 4.0 */ -public class VoyageCatchesSubSampleImportAction extends VoyageCatchesImportDataActionSupport<SubSampleImportRow> { +public class VoyageCatchesSubSampleImportAction extends VoyageCatchesImportDataActionSupport<VoyageCatchesSubSampleImportRow> { /** Logger. */ private static final Log log = LogFactory.getLog(VoyageCatchesSubSampleImportAction.class); @@ -43,13 +43,13 @@ public class VoyageCatchesSubSampleImportAction extends VoyageCatchesImportDataA } @Override - protected SubSampleImportExportModel createCsvImportModel(VoyageCatchesImportDataContext importDataContext) { - return SubSampleImportExportModel.forImport(importDataContext); + protected VoyageCatchesSubSampleImportExportModel createCsvImportModel(VoyageCatchesImportDataContext importDataContext) { + return VoyageCatchesSubSampleImportExportModel.forImport(importDataContext); } @Override - protected SubSampleImportExportModel createCsvExportModel(VoyageCatchesImportDataContext importDataContext) { - return SubSampleImportExportModel.forExport(importDataContext); + protected VoyageCatchesSubSampleImportExportModel createCsvExportModel(VoyageCatchesImportDataContext importDataContext) { + return VoyageCatchesSubSampleImportExportModel.forExport(importDataContext); } private final Map<String, String> sampleIdToOperationId = new TreeMap<>(); @@ -73,11 +73,11 @@ public class VoyageCatchesSubSampleImportAction extends VoyageCatchesImportDataA Set<String> createdSampleIds = new TreeSet<>(); - try (Import<SubSampleImportRow> importer = open()) { + try (Import<VoyageCatchesSubSampleImportRow> importer = open()) { incrementsProgress(); int rowNumber = 0; - for (SubSampleImportRow row : importer) { + for (VoyageCatchesSubSampleImportRow row : importer) { doFlushTransaction(++rowNumber); Operation operation = row.getOperation(); @@ -247,7 +247,7 @@ public class VoyageCatchesSubSampleImportAction extends VoyageCatchesImportDataA Preconditions.checkState(sample.isSampleDataNotEmpty()); - SubSampleImportRow importedRow = null; + VoyageCatchesSubSampleImportRow importedRow = null; String lastLengthClass = null; boolean lengthDataTypeFound = false; @@ -263,7 +263,7 @@ public class VoyageCatchesSubSampleImportAction extends VoyageCatchesImportDataA // first row lastLengthClass = lengthClass; - importedRow = SubSampleImportRow.of(operation, sample); + importedRow = VoyageCatchesSubSampleImportRow.of(operation, sample); lengthDataTypeFound = false; } else { @@ -274,7 +274,7 @@ public class VoyageCatchesSubSampleImportAction extends VoyageCatchesImportDataA addImportedRow(result, importedRow); lastLengthClass = lengthClass; - importedRow = SubSampleImportRow.of(operation, sample); + importedRow = VoyageCatchesSubSampleImportRow.of(operation, sample); lengthDataTypeFound = false; } } @@ -295,7 +295,7 @@ public class VoyageCatchesSubSampleImportAction extends VoyageCatchesImportDataA } - protected void addImportedSampleData(VoyageCatchesImportDataContext importDataContext, SubSampleImportRow importedRow, SampleData sampleData) { + protected void addImportedSampleData(VoyageCatchesImportDataContext importDataContext, VoyageCatchesSubSampleImportRow importedRow, SampleData sampleData) { SampleDataType sampleDataTypeNumberAtLength = importDataContext.getSampleDataTypeNumberAtLength(); SampleDataType sampleDataTypeNumberAtLength05cm = importDataContext.getSampleDataTypeNumberAtLength05cm(); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesTotalSampleImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesTotalSampleImportAction.java index 1506910..d51a967 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesTotalSampleImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesTotalSampleImportAction.java @@ -18,8 +18,8 @@ import fr.ifremer.echobase.services.service.importdata.DuplicatedSampleException import fr.ifremer.echobase.services.service.importdata.ImportDataFileResult; import fr.ifremer.echobase.services.service.importdata.SpeciesCategoryCache; import fr.ifremer.echobase.services.service.importdata.contexts.VoyageCatchesImportDataContext; -import fr.ifremer.echobase.services.service.importdata.csv.TotalSampleImportExportModel; -import fr.ifremer.echobase.services.service.importdata.csv.TotalSampleImportRow; +import fr.ifremer.echobase.services.service.importdata.csv.VoyageCatchesTotalSampleImportExportModel; +import fr.ifremer.echobase.services.service.importdata.csv.VoyageCatchesTotalSampleImportRow; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.csv.Import; @@ -35,7 +35,7 @@ import java.util.TreeMap; * @author Tony Chemit - chemit@codelutin.com * @since 4.0 */ -public class VoyageCatchesTotalSampleImportAction extends VoyageCatchesImportDataActionSupport<TotalSampleImportRow> { +public class VoyageCatchesTotalSampleImportAction extends VoyageCatchesImportDataActionSupport<VoyageCatchesTotalSampleImportRow> { /** Logger. */ private static final Log log = LogFactory.getLog(VoyageCatchesTotalSampleImportAction.class); @@ -45,13 +45,13 @@ public class VoyageCatchesTotalSampleImportAction extends VoyageCatchesImportDat } @Override - protected TotalSampleImportExportModel createCsvImportModel(VoyageCatchesImportDataContext importDataContext) { - return TotalSampleImportExportModel.forImport(importDataContext); + protected VoyageCatchesTotalSampleImportExportModel createCsvImportModel(VoyageCatchesImportDataContext importDataContext) { + return VoyageCatchesTotalSampleImportExportModel.forImport(importDataContext); } @Override - protected TotalSampleImportExportModel createCsvExportModel(VoyageCatchesImportDataContext importDataContext) { - return TotalSampleImportExportModel.forExport(importDataContext); + protected VoyageCatchesTotalSampleImportExportModel createCsvExportModel(VoyageCatchesImportDataContext importDataContext) { + return VoyageCatchesTotalSampleImportExportModel.forExport(importDataContext); } private final Map<String, String> sampleIdToOperationId = new TreeMap<>(); @@ -77,11 +77,11 @@ public class VoyageCatchesTotalSampleImportAction extends VoyageCatchesImportDat SampleDataType sampleDataTypeMeanWeight = importDataContext.getSampleDataTypeMeanWeight(); SampleDataType sampleDataTypeNoPerKg = importDataContext.getSampleDataTypeNoPerKg(); - try (Import<TotalSampleImportRow> importer = open()) { + try (Import<VoyageCatchesTotalSampleImportRow> importer = open()) { int rowNumber = 0; incrementsProgress(); - for (TotalSampleImportRow row : importer) { + for (VoyageCatchesTotalSampleImportRow row : importer) { doFlushTransaction(++rowNumber); Operation operation = row.getOperation(); @@ -194,7 +194,7 @@ public class VoyageCatchesTotalSampleImportAction extends VoyageCatchesImportDat Sample sortedSample = persistenceService.getSample(sortedSampleId); Preconditions.checkNotNull(sortedSample); - TotalSampleImportRow importedRow = TotalSampleImportRow.of(operation, sample, sortedSample); + VoyageCatchesTotalSampleImportRow importedRow = VoyageCatchesTotalSampleImportRow.of(operation, sample, sortedSample); if (sample.isSampleDataNotEmpty()) { diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportExportModel.java deleted file mode 100644 index 840a107..0000000 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportExportModel.java +++ /dev/null @@ -1,87 +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.Operation; -import fr.ifremer.echobase.entities.data.Sample; -import fr.ifremer.echobase.entities.data.SampleData; -import fr.ifremer.echobase.entities.references.SexCategory; -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.VoyageCatchesImportDataContext; - -/** - * Model to import {@link SampleData}. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 0.3 - */ -public class SubSampleImportExportModel extends EchoBaseImportExportModelSupport<SubSampleImportRow> { - - private SubSampleImportExportModel(char separator) { - super(separator); - } - - public static SubSampleImportExportModel forImport(VoyageCatchesImportDataContext importDataContext) { - - SubSampleImportExportModel model = new SubSampleImportExportModel(importDataContext.getCsvSeparator()); - model.newIgnoredColumn("subHaul"); - model.newForeignKeyColumn(EchoBaseCsvUtil.OPERATION_ID, SubSampleImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, importDataContext.getVoyageOperationsById()); - model.newForeignKeyColumn(Species.PROPERTY_BARACOUDA_CODE, SubSampleImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, importDataContext.getSpeciesByBaracoudaCode()); - model.newForeignKeyColumn(SubSampleImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, importDataContext.getSizeCategoriesByName()); - model.newForeignKeyColumn(SubSampleImportRow.PROPERTY_SEX_CATEGORY, SexCategory.class, SexCategory.PROPERTY_NAME, importDataContext.getSexCategoriesByName()); - model.newMandatoryColumn(SubSampleImportRow.PROPERTY_LENGTH_CLASS); - model.newMandatoryColumn(Sample.PROPERTY_SAMPLE_WEIGHT, EchoBaseCsvUtil.PRIMITIVE_FLOAT); - model.newMandatoryColumn(Sample.PROPERTY_NUMBER_SAMPLED, EchoBaseCsvUtil.PRIMITIVE_INTEGER); - model.newMandatoryColumn(SubSampleImportRow.PROPERTY_NUMBER_AT_LENGTH, EchoBaseCsvUtil.PRIMITIVE_FLOAT); - model.newMandatoryColumn(SubSampleImportRow.PROPERTY_WEIGHT_AT_LENGTH, EchoBaseCsvUtil.NA_TO_FLOAT_PARSER_FORMATTER); -// model.newMandatoryColumn(SubSampleImportRow.PROPERTY_UNITS); - model.newIgnoredColumn(SubSampleImportRow.PROPERTY_UNITS); - model.newMandatoryColumn(SubSampleImportRow.PROPERTY_ROUND, EchoBaseCsvUtil.NA_TO_INTEGER_PARSER_FORMATTER); - return model; - - } - - public static SubSampleImportExportModel forExport(VoyageCatchesImportDataContext importDataContext) { - - SubSampleImportExportModel model = new SubSampleImportExportModel(importDataContext.getCsvSeparator()); -// model.newIgnoredColumn("subHaul"); - model.newColumnForExport(EchoBaseCsvUtil.OPERATION_ID, TotalSampleImportRow.PROPERTY_OPERATION, EchoBaseCsvUtil.OPERATION_FORMATTER); - model.newColumnForExport(Species.PROPERTY_BARACOUDA_CODE, TotalSampleImportRow.PROPERTY_SPECIES, EchoBaseCsvUtil.SPECIES_FORMATTER); - model.newColumnForExport(SubSampleImportRow.PROPERTY_SIZE_CATEGORY, EchoBaseCsvUtil.SIZE_CATEGORY_FORMATTER); - model.newColumnForExport(SubSampleImportRow.PROPERTY_SEX_CATEGORY, EchoBaseCsvUtil.SEX_CATEGORY_FORMATTER); - model.newColumnForExport(SubSampleImportRow.PROPERTY_LENGTH_CLASS); - model.newColumnForExport(Sample.PROPERTY_SAMPLE_WEIGHT, EchoBaseCsvUtil.PRIMITIVE_FLOAT); - model.newColumnForExport(Sample.PROPERTY_NUMBER_SAMPLED, EchoBaseCsvUtil.PRIMITIVE_INTEGER); - model.newColumnForExport(SubSampleImportRow.PROPERTY_NUMBER_AT_LENGTH, EchoBaseCsvUtil.PRIMITIVE_FLOAT); - model.newColumnForExport(SubSampleImportRow.PROPERTY_WEIGHT_AT_LENGTH, EchoBaseCsvUtil.NA_TO_FLOAT_PARSER_FORMATTER); -// model.newColumnForExport(SubSampleImportRow.PROPERTY_UNITS); - model.newColumnForExport(SubSampleImportRow.PROPERTY_ROUND, EchoBaseCsvUtil.NA_TO_INTEGER_PARSER_FORMATTER); - return model; - - } - - @Override - public SubSampleImportRow newEmptyInstance() { - return new SubSampleImportRow(); - } -} diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportExportModel.java deleted file mode 100644 index 79932fe..0000000 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportExportModel.java +++ /dev/null @@ -1,78 +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.Operation; -import fr.ifremer.echobase.entities.data.Sample; -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.VoyageCatchesImportDataContext; - -/** - * Model to import {@link Sample} of total type. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 0.3 - */ -public class TotalSampleImportExportModel extends EchoBaseImportExportModelSupport<TotalSampleImportRow> { - - private TotalSampleImportExportModel(char separator) { - super(separator); - } - - public static TotalSampleImportExportModel forImport(VoyageCatchesImportDataContext importDataContext) { - - TotalSampleImportExportModel model = new TotalSampleImportExportModel(importDataContext.getCsvSeparator()); - model.newForeignKeyColumn(EchoBaseCsvUtil.OPERATION_ID, TotalSampleImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, importDataContext.getVoyageOperationsById()); - model.newForeignKeyColumn(Species.PROPERTY_BARACOUDA_CODE, TotalSampleImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, importDataContext.getSpeciesByBaracoudaCode()); - model.newForeignKeyColumn(TotalSampleImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, importDataContext.getSizeCategoriesByName()); - model.newMandatoryColumn(Sample.PROPERTY_SAMPLE_WEIGHT, EchoBaseCsvUtil.PRIMITIVE_FLOAT); - model.newMandatoryColumn(Sample.PROPERTY_NUMBER_SAMPLED, EchoBaseCsvUtil.NA_TO_INTEGER_PARSER_FORMATTER); - model.newMandatoryColumn(TotalSampleImportRow.PROPERTY_MEAN_LENGTH, EchoBaseCsvUtil.NA_TO_FLOAT_PARSER_FORMATTER); - model.newMandatoryColumn(TotalSampleImportRow.PROPERTY_MEAN_WEIGHT, EchoBaseCsvUtil.NA_TO_FLOAT_PARSER_FORMATTER); - model.newMandatoryColumn(TotalSampleImportRow.PROPERTY_NO_PER_KG, EchoBaseCsvUtil.NA_TO_FLOAT_PARSER_FORMATTER); - model.newMandatoryColumn(TotalSampleImportRow.PROPERTY_SORTED_WEIGHT, EchoBaseCsvUtil.PRIMITIVE_FLOAT); - return model; - - } - - public static TotalSampleImportExportModel forExport(VoyageCatchesImportDataContext importDataContext) { - - TotalSampleImportExportModel model = new TotalSampleImportExportModel(importDataContext.getCsvSeparator()); - model.newColumnForExport(EchoBaseCsvUtil.OPERATION_ID, TotalSampleImportRow.PROPERTY_OPERATION, EchoBaseCsvUtil.OPERATION_FORMATTER); - model.newColumnForExport(Species.PROPERTY_BARACOUDA_CODE,TotalSampleImportRow.PROPERTY_SPECIES, EchoBaseCsvUtil.SPECIES_FORMATTER); - model.newColumnForExport(TotalSampleImportRow.PROPERTY_SIZE_CATEGORY, EchoBaseCsvUtil.SIZE_CATEGORY_FORMATTER); - model.newColumnForExport(Sample.PROPERTY_SAMPLE_WEIGHT, EchoBaseCsvUtil.PRIMITIVE_FLOAT); - model.newColumnForExport(Sample.PROPERTY_NUMBER_SAMPLED, EchoBaseCsvUtil.NA_TO_INTEGER_PARSER_FORMATTER); - model.newColumnForExport(TotalSampleImportRow.PROPERTY_MEAN_LENGTH, EchoBaseCsvUtil.NA_TO_FLOAT_PARSER_FORMATTER); - model.newColumnForExport(TotalSampleImportRow.PROPERTY_MEAN_WEIGHT, EchoBaseCsvUtil.NA_TO_FLOAT_PARSER_FORMATTER); - model.newColumnForExport(TotalSampleImportRow.PROPERTY_NO_PER_KG, EchoBaseCsvUtil.NA_TO_FLOAT_PARSER_FORMATTER); - model.newColumnForExport(TotalSampleImportRow.PROPERTY_SORTED_WEIGHT, EchoBaseCsvUtil.PRIMITIVE_FLOAT); - return model; - - } - - @Override - public TotalSampleImportRow newEmptyInstance() { - return new TotalSampleImportRow(); - } -} diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/BiometrySampleImportExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesBiometrySampleImportExportModel.java similarity index 58% rename from echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/BiometrySampleImportExportModel.java rename to echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesBiometrySampleImportExportModel.java index 9c78567..336ef4b 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/BiometrySampleImportExportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesBiometrySampleImportExportModel.java @@ -34,18 +34,18 @@ import fr.ifremer.echobase.services.service.importdata.contexts.VoyageCatchesImp * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class BiometrySampleImportExportModel extends EchoBaseImportExportModelSupport<BiometrySampleImportRow> { +public class VoyageCatchesBiometrySampleImportExportModel extends EchoBaseImportExportModelSupport<VoyageCatchesBiometrySampleImportRow> { - private BiometrySampleImportExportModel(char separator) { + private VoyageCatchesBiometrySampleImportExportModel(char separator) { super(separator); } - public static BiometrySampleImportExportModel forImport(VoyageCatchesImportDataContext importDataContext) { - BiometrySampleImportExportModel model = new BiometrySampleImportExportModel(importDataContext.getCsvSeparator()); - model.newForeignKeyColumn(EchoBaseCsvUtil.OPERATION_ID, BiometrySampleImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, importDataContext.getVoyageOperationsById()); - model.newForeignKeyColumn(Species.PROPERTY_BARACOUDA_CODE, BiometrySampleImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, importDataContext.getSpeciesByBaracoudaCode()); + public static VoyageCatchesBiometrySampleImportExportModel forImport(VoyageCatchesImportDataContext importDataContext) { + VoyageCatchesBiometrySampleImportExportModel model = new VoyageCatchesBiometrySampleImportExportModel(importDataContext.getCsvSeparator()); + model.newForeignKeyColumn(EchoBaseCsvUtil.OPERATION_ID, VoyageCatchesBiometrySampleImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, importDataContext.getVoyageOperationsById()); + model.newForeignKeyColumn(Species.PROPERTY_BARACOUDA_CODE, VoyageCatchesBiometrySampleImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, importDataContext.getSpeciesByBaracoudaCode()); - model.newMandatoryColumn(BiometrySampleImportRow.PROPERTY_NUM_FISH, EchoBaseCsvUtil.PRIMITIVE_INTEGER); + model.newMandatoryColumn(VoyageCatchesBiometrySampleImportRow.PROPERTY_NUM_FISH, EchoBaseCsvUtil.PRIMITIVE_INTEGER); model.newForeignKeyColumn("name", SampleData.PROPERTY_SAMPLE_DATA_TYPE, SampleDataType.class, SampleDataType.PROPERTY_NAME, importDataContext.getSampleDataTypesByName()); model.newMandatoryColumn(SampleData.PROPERTY_DATA_LABEL); @@ -53,11 +53,11 @@ public class BiometrySampleImportExportModel extends EchoBaseImportExportModelSu return model; } - public static BiometrySampleImportExportModel forExport(VoyageCatchesImportDataContext importDataContext) { - BiometrySampleImportExportModel model = new BiometrySampleImportExportModel(importDataContext.getCsvSeparator()); - model.newColumnForExport(EchoBaseCsvUtil.OPERATION_ID, BiometrySampleImportRow.PROPERTY_OPERATION, EchoBaseCsvUtil.OPERATION_FORMATTER); - model.newColumnForExport(Species.PROPERTY_BARACOUDA_CODE, BiometrySampleImportRow.PROPERTY_SPECIES, EchoBaseCsvUtil.SPECIES_FORMATTER); - model.newColumnForExport(BiometrySampleImportRow.PROPERTY_NUM_FISH, EchoBaseCsvUtil.PRIMITIVE_INTEGER); + public static VoyageCatchesBiometrySampleImportExportModel forExport(VoyageCatchesImportDataContext importDataContext) { + VoyageCatchesBiometrySampleImportExportModel model = new VoyageCatchesBiometrySampleImportExportModel(importDataContext.getCsvSeparator()); + model.newColumnForExport(EchoBaseCsvUtil.OPERATION_ID, VoyageCatchesBiometrySampleImportRow.PROPERTY_OPERATION, EchoBaseCsvUtil.OPERATION_FORMATTER); + model.newColumnForExport(Species.PROPERTY_BARACOUDA_CODE, VoyageCatchesBiometrySampleImportRow.PROPERTY_SPECIES, EchoBaseCsvUtil.SPECIES_FORMATTER); + model.newColumnForExport(VoyageCatchesBiometrySampleImportRow.PROPERTY_NUM_FISH, EchoBaseCsvUtil.PRIMITIVE_INTEGER); model.newColumnForExport("name", SampleData.PROPERTY_SAMPLE_DATA_TYPE, EchoBaseCsvUtil.SAMPLE_DATA_TYPE_FORMATTER); model.newColumnForExport(SampleData.PROPERTY_DATA_LABEL); model.newColumnForExport(SampleData.PROPERTY_DATA_VALUE, EchoBaseCsvUtil.NA_TO_FLOAT_PARSER_FORMATTER); @@ -65,7 +65,7 @@ public class BiometrySampleImportExportModel extends EchoBaseImportExportModelSu } @Override - public BiometrySampleImportRow newEmptyInstance() { - return new BiometrySampleImportRow(); + public VoyageCatchesBiometrySampleImportRow newEmptyInstance() { + return new VoyageCatchesBiometrySampleImportRow(); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/BiometrySampleImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesBiometrySampleImportRow.java similarity index 85% rename from echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/BiometrySampleImportRow.java rename to echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesBiometrySampleImportRow.java index a089138..b68496a 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/BiometrySampleImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesBiometrySampleImportRow.java @@ -28,12 +28,12 @@ import fr.ifremer.echobase.entities.references.SampleDataType; import fr.ifremer.echobase.entities.references.Species; /** - * Bean used as a row for import of {@link BiometrySampleImportExportModel}. + * Bean used as a row for import of {@link VoyageCatchesBiometrySampleImportExportModel}. * * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class BiometrySampleImportRow { +public class VoyageCatchesBiometrySampleImportRow { public static final String PROPERTY_NUM_FISH = "numFish"; @@ -49,9 +49,9 @@ public class BiometrySampleImportRow { protected int numFish; - public static BiometrySampleImportRow of(Operation operation, Sample sample, SampleData sampleData, int numFish) { + public static VoyageCatchesBiometrySampleImportRow of(Operation operation, Sample sample, SampleData sampleData, int numFish) { - BiometrySampleImportRow row = new BiometrySampleImportRow(sampleData); + VoyageCatchesBiometrySampleImportRow row = new VoyageCatchesBiometrySampleImportRow(sampleData); row.setOperation(operation); row.setSpecies(sample.getSpeciesCategory().getSpecies()); row.setNumFish(numFish); @@ -59,11 +59,11 @@ public class BiometrySampleImportRow { return row; } - public BiometrySampleImportRow(SampleData sampleData) { + public VoyageCatchesBiometrySampleImportRow(SampleData sampleData) { this.sampleData = sampleData; } - public BiometrySampleImportRow() { + public VoyageCatchesBiometrySampleImportRow() { this(new SampleDataImpl()); } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesSubSampleImportExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesSubSampleImportExportModel.java new file mode 100644 index 0000000..c3e6e6d --- /dev/null +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesSubSampleImportExportModel.java @@ -0,0 +1,87 @@ +/* + * #%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.Operation; +import fr.ifremer.echobase.entities.data.Sample; +import fr.ifremer.echobase.entities.data.SampleData; +import fr.ifremer.echobase.entities.references.SexCategory; +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.VoyageCatchesImportDataContext; + +/** + * Model to import {@link SampleData}. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 0.3 + */ +public class VoyageCatchesSubSampleImportExportModel extends EchoBaseImportExportModelSupport<VoyageCatchesSubSampleImportRow> { + + private VoyageCatchesSubSampleImportExportModel(char separator) { + super(separator); + } + + public static VoyageCatchesSubSampleImportExportModel forImport(VoyageCatchesImportDataContext importDataContext) { + + VoyageCatchesSubSampleImportExportModel model = new VoyageCatchesSubSampleImportExportModel(importDataContext.getCsvSeparator()); + model.newIgnoredColumn("subHaul"); + model.newForeignKeyColumn(EchoBaseCsvUtil.OPERATION_ID, VoyageCatchesSubSampleImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, importDataContext.getVoyageOperationsById()); + model.newForeignKeyColumn(Species.PROPERTY_BARACOUDA_CODE, VoyageCatchesSubSampleImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, importDataContext.getSpeciesByBaracoudaCode()); + model.newForeignKeyColumn(VoyageCatchesSubSampleImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, importDataContext.getSizeCategoriesByName()); + model.newForeignKeyColumn(VoyageCatchesSubSampleImportRow.PROPERTY_SEX_CATEGORY, SexCategory.class, SexCategory.PROPERTY_NAME, importDataContext.getSexCategoriesByName()); + model.newMandatoryColumn(VoyageCatchesSubSampleImportRow.PROPERTY_LENGTH_CLASS); + model.newMandatoryColumn(Sample.PROPERTY_SAMPLE_WEIGHT, EchoBaseCsvUtil.PRIMITIVE_FLOAT); + model.newMandatoryColumn(Sample.PROPERTY_NUMBER_SAMPLED, EchoBaseCsvUtil.PRIMITIVE_INTEGER); + model.newMandatoryColumn(VoyageCatchesSubSampleImportRow.PROPERTY_NUMBER_AT_LENGTH, EchoBaseCsvUtil.PRIMITIVE_FLOAT); + model.newMandatoryColumn(VoyageCatchesSubSampleImportRow.PROPERTY_WEIGHT_AT_LENGTH, EchoBaseCsvUtil.NA_TO_FLOAT_PARSER_FORMATTER); +// model.newMandatoryColumn(VoyageCatchesSubSampleImportRow.PROPERTY_UNITS); + model.newIgnoredColumn(VoyageCatchesSubSampleImportRow.PROPERTY_UNITS); + model.newMandatoryColumn(VoyageCatchesSubSampleImportRow.PROPERTY_ROUND, EchoBaseCsvUtil.NA_TO_INTEGER_PARSER_FORMATTER); + return model; + + } + + public static VoyageCatchesSubSampleImportExportModel forExport(VoyageCatchesImportDataContext importDataContext) { + + VoyageCatchesSubSampleImportExportModel model = new VoyageCatchesSubSampleImportExportModel(importDataContext.getCsvSeparator()); +// model.newIgnoredColumn("subHaul"); + model.newColumnForExport(EchoBaseCsvUtil.OPERATION_ID, VoyageCatchesTotalSampleImportRow.PROPERTY_OPERATION, EchoBaseCsvUtil.OPERATION_FORMATTER); + model.newColumnForExport(Species.PROPERTY_BARACOUDA_CODE, VoyageCatchesTotalSampleImportRow.PROPERTY_SPECIES, EchoBaseCsvUtil.SPECIES_FORMATTER); + model.newColumnForExport(VoyageCatchesSubSampleImportRow.PROPERTY_SIZE_CATEGORY, EchoBaseCsvUtil.SIZE_CATEGORY_FORMATTER); + model.newColumnForExport(VoyageCatchesSubSampleImportRow.PROPERTY_SEX_CATEGORY, EchoBaseCsvUtil.SEX_CATEGORY_FORMATTER); + model.newColumnForExport(VoyageCatchesSubSampleImportRow.PROPERTY_LENGTH_CLASS); + model.newColumnForExport(Sample.PROPERTY_SAMPLE_WEIGHT, EchoBaseCsvUtil.PRIMITIVE_FLOAT); + model.newColumnForExport(Sample.PROPERTY_NUMBER_SAMPLED, EchoBaseCsvUtil.PRIMITIVE_INTEGER); + model.newColumnForExport(VoyageCatchesSubSampleImportRow.PROPERTY_NUMBER_AT_LENGTH, EchoBaseCsvUtil.PRIMITIVE_FLOAT); + model.newColumnForExport(VoyageCatchesSubSampleImportRow.PROPERTY_WEIGHT_AT_LENGTH, EchoBaseCsvUtil.NA_TO_FLOAT_PARSER_FORMATTER); +// model.newColumnForExport(VoyageCatchesSubSampleImportRow.PROPERTY_UNITS); + model.newColumnForExport(VoyageCatchesSubSampleImportRow.PROPERTY_ROUND, EchoBaseCsvUtil.NA_TO_INTEGER_PARSER_FORMATTER); + return model; + + } + + @Override + public VoyageCatchesSubSampleImportRow newEmptyInstance() { + return new VoyageCatchesSubSampleImportRow(); + } +} diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesSubSampleImportRow.java similarity index 91% rename from echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportRow.java rename to echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesSubSampleImportRow.java index c2f75e0..d71c1ec 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesSubSampleImportRow.java @@ -28,12 +28,12 @@ import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.entities.references.Species; /** - * Bean used as a row for import of {@link SubSampleImportExportModel}. + * Bean used as a row for import of {@link VoyageCatchesSubSampleImportExportModel}. * * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class SubSampleImportRow { +public class VoyageCatchesSubSampleImportRow { public static final String PROPERTY_OPERATION = "operation"; @@ -64,8 +64,8 @@ public class SubSampleImportRow { protected Integer round; protected String units; - public static SubSampleImportRow of(Operation operation, Sample sample) { - SubSampleImportRow row = new SubSampleImportRow(sample); + public static VoyageCatchesSubSampleImportRow of(Operation operation, Sample sample) { + VoyageCatchesSubSampleImportRow row = new VoyageCatchesSubSampleImportRow(sample); row.setOperation(operation); row.setSpecies(sample.getSpeciesCategory().getSpecies()); row.setSizeCategory(sample.getSpeciesCategory().getSizeCategory()); @@ -73,11 +73,11 @@ public class SubSampleImportRow { return row; } - public SubSampleImportRow(Sample sample) { + public VoyageCatchesSubSampleImportRow(Sample sample) { this.sample = sample; } - public SubSampleImportRow() { + public VoyageCatchesSubSampleImportRow() { this(new SampleImpl()); } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesTotalSampleImportExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesTotalSampleImportExportModel.java new file mode 100644 index 0000000..8939cb3 --- /dev/null +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesTotalSampleImportExportModel.java @@ -0,0 +1,78 @@ +/* + * #%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.Operation; +import fr.ifremer.echobase.entities.data.Sample; +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.VoyageCatchesImportDataContext; + +/** + * Model to import {@link Sample} of total type. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 0.3 + */ +public class VoyageCatchesTotalSampleImportExportModel extends EchoBaseImportExportModelSupport<VoyageCatchesTotalSampleImportRow> { + + private VoyageCatchesTotalSampleImportExportModel(char separator) { + super(separator); + } + + public static VoyageCatchesTotalSampleImportExportModel forImport(VoyageCatchesImportDataContext importDataContext) { + + VoyageCatchesTotalSampleImportExportModel model = new VoyageCatchesTotalSampleImportExportModel(importDataContext.getCsvSeparator()); + model.newForeignKeyColumn(EchoBaseCsvUtil.OPERATION_ID, VoyageCatchesTotalSampleImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, importDataContext.getVoyageOperationsById()); + model.newForeignKeyColumn(Species.PROPERTY_BARACOUDA_CODE, VoyageCatchesTotalSampleImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, importDataContext.getSpeciesByBaracoudaCode()); + model.newForeignKeyColumn(VoyageCatchesTotalSampleImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, importDataContext.getSizeCategoriesByName()); + model.newMandatoryColumn(Sample.PROPERTY_SAMPLE_WEIGHT, EchoBaseCsvUtil.PRIMITIVE_FLOAT); + model.newMandatoryColumn(Sample.PROPERTY_NUMBER_SAMPLED, EchoBaseCsvUtil.NA_TO_INTEGER_PARSER_FORMATTER); + model.newMandatoryColumn(VoyageCatchesTotalSampleImportRow.PROPERTY_MEAN_LENGTH, EchoBaseCsvUtil.NA_TO_FLOAT_PARSER_FORMATTER); + model.newMandatoryColumn(VoyageCatchesTotalSampleImportRow.PROPERTY_MEAN_WEIGHT, EchoBaseCsvUtil.NA_TO_FLOAT_PARSER_FORMATTER); + model.newMandatoryColumn(VoyageCatchesTotalSampleImportRow.PROPERTY_NO_PER_KG, EchoBaseCsvUtil.NA_TO_FLOAT_PARSER_FORMATTER); + model.newMandatoryColumn(VoyageCatchesTotalSampleImportRow.PROPERTY_SORTED_WEIGHT, EchoBaseCsvUtil.PRIMITIVE_FLOAT); + return model; + + } + + public static VoyageCatchesTotalSampleImportExportModel forExport(VoyageCatchesImportDataContext importDataContext) { + + VoyageCatchesTotalSampleImportExportModel model = new VoyageCatchesTotalSampleImportExportModel(importDataContext.getCsvSeparator()); + model.newColumnForExport(EchoBaseCsvUtil.OPERATION_ID, VoyageCatchesTotalSampleImportRow.PROPERTY_OPERATION, EchoBaseCsvUtil.OPERATION_FORMATTER); + model.newColumnForExport(Species.PROPERTY_BARACOUDA_CODE, VoyageCatchesTotalSampleImportRow.PROPERTY_SPECIES, EchoBaseCsvUtil.SPECIES_FORMATTER); + model.newColumnForExport(VoyageCatchesTotalSampleImportRow.PROPERTY_SIZE_CATEGORY, EchoBaseCsvUtil.SIZE_CATEGORY_FORMATTER); + model.newColumnForExport(Sample.PROPERTY_SAMPLE_WEIGHT, EchoBaseCsvUtil.PRIMITIVE_FLOAT); + model.newColumnForExport(Sample.PROPERTY_NUMBER_SAMPLED, EchoBaseCsvUtil.NA_TO_INTEGER_PARSER_FORMATTER); + model.newColumnForExport(VoyageCatchesTotalSampleImportRow.PROPERTY_MEAN_LENGTH, EchoBaseCsvUtil.NA_TO_FLOAT_PARSER_FORMATTER); + model.newColumnForExport(VoyageCatchesTotalSampleImportRow.PROPERTY_MEAN_WEIGHT, EchoBaseCsvUtil.NA_TO_FLOAT_PARSER_FORMATTER); + model.newColumnForExport(VoyageCatchesTotalSampleImportRow.PROPERTY_NO_PER_KG, EchoBaseCsvUtil.NA_TO_FLOAT_PARSER_FORMATTER); + model.newColumnForExport(VoyageCatchesTotalSampleImportRow.PROPERTY_SORTED_WEIGHT, EchoBaseCsvUtil.PRIMITIVE_FLOAT); + return model; + + } + + @Override + public VoyageCatchesTotalSampleImportRow newEmptyInstance() { + return new VoyageCatchesTotalSampleImportRow(); + } +} diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesTotalSampleImportRow.java similarity index 89% rename from echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportRow.java rename to echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesTotalSampleImportRow.java index 5bed089..2f11800 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesTotalSampleImportRow.java @@ -27,12 +27,12 @@ import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.entities.references.Species; /** - * Bean used as a row for import of {@link TotalSampleImportExportModel}. + * Bean used as a row for import of {@link VoyageCatchesTotalSampleImportExportModel}. * * @author Tony Chemit - chemit@codelutin.com * @since 0.3 */ -public class TotalSampleImportRow { +public class VoyageCatchesTotalSampleImportRow { public static final String PROPERTY_OPERATION = "operation"; @@ -56,11 +56,11 @@ public class TotalSampleImportRow { protected Species species; protected SizeCategory sizeCategory; - public TotalSampleImportRow() { + public VoyageCatchesTotalSampleImportRow() { this(new SampleImpl()); } - public TotalSampleImportRow(Sample sample) { + public VoyageCatchesTotalSampleImportRow(Sample sample) { this.sample = sample; } @@ -140,8 +140,8 @@ public class TotalSampleImportRow { this.sortedWeight = sortedWeight; } - public static TotalSampleImportRow of(Operation operation, Sample sample, Sample sortedSample) { - TotalSampleImportRow row = new TotalSampleImportRow(sample); + public static VoyageCatchesTotalSampleImportRow of(Operation operation, Sample sample, Sample sortedSample) { + VoyageCatchesTotalSampleImportRow row = new VoyageCatchesTotalSampleImportRow(sample); row.setOperation(operation); row.setSpecies(sample.getSpeciesCategory().getSpecies()); row.setSizeCategory(sample.getSpeciesCategory().getSizeCategory()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.