branch develop updated (df43230 -> b539e1d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from df43230 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new b539e1d #8763 Fix column name and data quality The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit b539e1d43ad5467cee5d2e2bded93663644cb10f Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Thu Nov 10 11:23:27 2016 +0100 #8763 Fix column name and data quality Summary of changes: ...typeAndSpeciesCategoryAndLengthCellImportAction.java | 6 +++--- ...sduByEchotypeAndSpeciesCategoryCellImportAction.java | 1 - ...ypeAndSpeciesCategoryAndLengthImportExportModel.java | 6 +++--- ...uByEchotypeAndSpeciesCategoryAndLengthImportRow.java | 17 +++++++++-------- 4 files changed, 15 insertions(+), 15 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit b539e1d43ad5467cee5d2e2bded93663644cb10f Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Thu Nov 10 11:23:27 2016 +0100 #8763 Fix column name and data quality --- ...typeAndSpeciesCategoryAndLengthCellImportAction.java | 6 +++--- ...sduByEchotypeAndSpeciesCategoryCellImportAction.java | 1 - ...ypeAndSpeciesCategoryAndLengthImportExportModel.java | 6 +++--- ...uByEchotypeAndSpeciesCategoryAndLengthImportRow.java | 17 +++++++++-------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthCellImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthCellImportAction.java index ee44257..c888129 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthCellImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthCellImportAction.java @@ -73,10 +73,10 @@ public class VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthCellImportAct } if (row.getLengthClass() != null) { - lengthCategory = sizeCategoryCache.getSizeCategory(String.valueOf(row.getLengthClass()), row.getLengthCategoryMeaning(), result); + lengthCategory = sizeCategoryCache.getSizeCategory(String.valueOf(row.getLengthClass()), row.getLengthClassMeaning(), result); Preconditions.checkNotNull(lengthCategory); - if (!lengthCategory.getMeaning().equals(row.getLengthCategoryMeaning())) { - throw new MismatchLengthCategoryMeaningException(getLocale(), row.getLengthCategoryMeaning(), lengthCategory.getMeaning()); + if (!lengthCategory.getMeaning().equals(row.getLengthClassMeaning())) { + throw new MismatchLengthCategoryMeaningException(getLocale(), row.getLengthClassMeaning(), lengthCategory.getMeaning()); } } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryCellImportAction.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryCellImportAction.java index 2bd57ad..3a52af5 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryCellImportAction.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryCellImportAction.java @@ -25,7 +25,6 @@ import fr.ifremer.echobase.entities.data.DataAcousticProvider; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.Result; -import fr.ifremer.echobase.entities.data.Voyage; 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; diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportExportModel.java index fd2ea82..63a564a 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportExportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportExportModel.java @@ -47,7 +47,7 @@ public class VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportExportM VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_LENGTH_CLASS, VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_ECHOTYPE, VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_SIZE_CATEGORY, - VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_LENGTH_CATEGORY_MEANING, + VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_LENGTH_CLASS_MEANING, VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_DATA_QUALITY, VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_VOYAGE }; @@ -65,7 +65,7 @@ public class VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportExportM model.newForeignKeyColumn(VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_ECHOTYPE, Echotype.class, Echotype.PROPERTY_NAME, importDataContext.getVoyageEchotypesByName()); model.newMandatoryColumn(VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_LENGTH_CLASS, EchoBaseCsvUtil.NA_TO_FLOAT_PARSER_FORMATTER); model.newMandatoryColumn(VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_SIZE_CATEGORY); - model.newMandatoryColumn(VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_LENGTH_CATEGORY_MEANING); + model.newMandatoryColumn(VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_LENGTH_CLASS_MEANING); model.newForeignKeyColumn(HEADER_SPECIES, VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, importDataContext.getSpeciesByBaracoudaCode()); model.newForeignKeyColumn(VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_DATA_QUALITY, DataQuality.class, DataQuality.PROPERTY_QUALITY_DATA_FLAG_VALUES, importDataContext.getDataQualitiesByName()); @@ -83,7 +83,7 @@ public class VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportExportM model.newColumnForExport(VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_ECHOTYPE, EchoBaseCsvUtil.ECHOTYPE_FORMATTER); model.newColumnForExport(VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_LENGTH_CLASS, EchoBaseCsvUtil.NA_TO_FLOAT_PARSER_FORMATTER); model.newColumnForExport(VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_SIZE_CATEGORY); - model.newColumnForExport(VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_LENGTH_CATEGORY_MEANING); + model.newColumnForExport(VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_LENGTH_CLASS_MEANING); model.newColumnForExport(HEADER_SPECIES, VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_SPECIES, EchoBaseCsvUtil.SPECIES_FORMATTER); model.newColumnForExport(VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.PROPERTY_DATA_QUALITY, EchoBaseCsvUtil.DATA_QUALITY_FORMATTER); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.java index 87f8778..25e891c 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow.java @@ -50,7 +50,7 @@ public class VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow imp public static final String PROPERTY_ECHOTYPE = "echotype"; public static final String PROPERTY_LENGTH_CLASS = "lengthClass"; public static final String PROPERTY_SIZE_CATEGORY = "sizeCategory"; - public static final String PROPERTY_LENGTH_CATEGORY_MEANING = "lengthClassMeaning"; + public static final String PROPERTY_LENGTH_CLASS_MEANING = "lengthClassMeaning"; public static final String PROPERTY_DATA_QUALITY = "dataQuality"; protected Voyage voyage; @@ -60,7 +60,7 @@ public class VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow imp protected DataQuality dataQuality; protected Float lengthClass; protected String sizeCategory; - protected String lengthCategoryMeaning; + protected String lengthClassMeaning; protected Echotype echotype; public static VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow of(DataAcousticProvider provider, Cell cell, Category category, SizeCategory lengthCategory, List<Result> results) { @@ -70,13 +70,14 @@ public class VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow imp row.setSpecies(category.getSpeciesCategory().getSpecies()); row.setLengthClass(category.getSpeciesCategory().getLengthClass()); - row.setLengthCategoryMeaning(lengthCategory.getMeaning()); + row.setLengthClassMeaning(lengthCategory.getMeaning()); SizeCategory sizeCategory = category.getSpeciesCategory().getSizeCategory(); if (sizeCategory != null) { row.setSizeCategory(sizeCategory.getName()); } row.setEchotype(category.getEchotype()); + row.setDataQuality(results.get(0).getDataQuality()); row.result.addAll(results); return row; } @@ -145,14 +146,14 @@ public class VoyageResultsEsduByEchotypeAndSpeciesCategoryAndLengthImportRow imp this.sizeCategory = sizeCategory; } - public String getLengthCategoryMeaning() { - return lengthCategoryMeaning; + public String getLengthClassMeaning() { + return lengthClassMeaning; } - public void setLengthCategoryMeaning(String lengthCategoryMeaning) { - this.lengthCategoryMeaning = lengthCategoryMeaning; + public void setLengthClassMeaning(String lengthClassMeaning) { + this.lengthClassMeaning = lengthClassMeaning; } - + public Float getLengthClass() { return lengthClass; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm