branch develop updated (40e318f4 -> 2306ec6f)
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 40e318f4 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new a5b42333 fixes launch problem (why the problem occured in the first place ?) new 2306ec6f fixes #9744 : Pb avec sexCategory à l'import des données biometry The 2 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 2306ec6f3895059c03fe6c43e004b655913b1fbf Author: Jean Couteau <jean.couteau@gmail.com> Date: Fri Mar 2 09:27:32 2018 +0100 fixes #9744 : Pb avec sexCategory à l'import des données biometry commit a5b423330b0a83badeeb5fbf9afa2d990539cc01 Author: Jean Couteau <jean.couteau@gmail.com> Date: Fri Mar 2 09:27:09 2018 +0100 fixes launch problem (why the problem occured in the first place ?) Summary of changes: .../persistence/migration/EchoBaseMigrationCallBackResolver.java | 3 ++- .../actions/VoyageCatchesBiometrySampleImportAction.java | 7 +++++-- .../csv/VoyageCatchesBiometrySampleImportExportModel.java | 4 ++-- 3 files changed, 9 insertions(+), 5 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 a5b423330b0a83badeeb5fbf9afa2d990539cc01 Author: Jean Couteau <jean.couteau@gmail.com> Date: Fri Mar 2 09:27:09 2018 +0100 fixes launch problem (why the problem occured in the first place ?) --- .../persistence/migration/EchoBaseMigrationCallBackResolver.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/EchoBaseMigrationCallBackResolver.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/EchoBaseMigrationCallBackResolver.java index 970697de..ee2c6577 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/EchoBaseMigrationCallBackResolver.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/EchoBaseMigrationCallBackResolver.java @@ -57,7 +57,8 @@ public class EchoBaseMigrationCallBackResolver<C extends MigrationCallBackForVer this.versionMigrationMapping = new TreeMap<>(new VersionComparator()); - Reflections reflections = Reflections.collect(); + //Reflections reflections = Reflections.collect(); + Reflections reflections = new Reflections("fr.ifremer.echobase"); Set<Class<? extends C>> subTypesOf = reflections.getSubTypesOf(migrationType); Preconditions.checkState(!subTypesOf.isEmpty()); -- 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 2306ec6f3895059c03fe6c43e004b655913b1fbf Author: Jean Couteau <jean.couteau@gmail.com> Date: Fri Mar 2 09:27:32 2018 +0100 fixes #9744 : Pb avec sexCategory à l'import des données biometry --- .../actions/VoyageCatchesBiometrySampleImportAction.java | 7 +++++-- .../csv/VoyageCatchesBiometrySampleImportExportModel.java | 4 ++-- 2 files changed, 7 insertions(+), 4 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 70cf1fc4..931ef844 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 @@ -29,6 +29,7 @@ import fr.ifremer.echobase.entities.data.Sample; import fr.ifremer.echobase.entities.data.SampleData; import fr.ifremer.echobase.entities.references.SampleDataType; import fr.ifremer.echobase.entities.references.SampleType; +import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.entities.references.Species; import fr.ifremer.echobase.entities.references.SpeciesCategory; import fr.ifremer.echobase.io.InputFile; @@ -75,7 +76,7 @@ public class VoyageCatchesBiometrySampleImportAction extends VoyageCatchesImport protected void performImport(VoyageCatchesImportDataContext importDataContext, InputFile inputFile, ImportDataFileResult result) { if (log.isInfoEnabled()) { - log.info("Starts import of subSample from file " + inputFile.getFileName()); + log.info("Starts import of biometry from file " + inputFile.getFileName()); } SampleDataType sampleDataTypeFishIndex = importDataContext.getSampleDataTypeSpecimenIndex(); @@ -101,6 +102,8 @@ public class VoyageCatchesBiometrySampleImportAction extends VoyageCatchesImport int numFish = row.getNumFish(); + SizeCategory sizeCategory = row.getSizeCategory(); + String sampleKey = operation.getId() + "_" + species.getBaracoudaCode() + "_" + numFish; Sample sample = samples.get(sampleKey); @@ -112,7 +115,7 @@ public class VoyageCatchesBiometrySampleImportAction extends VoyageCatchesImport sample.setSampleType(sampleTypeIndividual); - SpeciesCategory category = speciesCategoryCache.getSpeciesCategory(species, null, null, null, null, result); + SpeciesCategory category = speciesCategoryCache.getSpeciesCategory(species, null, sizeCategory, null, null, result); sample.setSpeciesCategory(category); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesBiometrySampleImportExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesBiometrySampleImportExportModel.java index 61f8c75a..74c33558 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesBiometrySampleImportExportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesBiometrySampleImportExportModel.java @@ -45,7 +45,7 @@ public class VoyageCatchesBiometrySampleImportExportModel extends EchoBaseImport 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.newForeignKeyColumn(VoyageCatchesSubSampleImportRow.PROPERTY_SIZE_CATEGORY, VoyageCatchesBiometrySampleImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, importDataContext.getSizeCategoriesByName()); + model.newForeignKeyColumn(VoyageCatchesBiometrySampleImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, importDataContext.getSizeCategoriesByName()); model.newMandatoryColumn(VoyageCatchesBiometrySampleImportRow.PROPERTY_NUM_FISH, EchoBaseCsvUtil.PRIMITIVE_INTEGER); @@ -59,7 +59,7 @@ public class VoyageCatchesBiometrySampleImportExportModel extends EchoBaseImport 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(VoyageCatchesSubSampleImportRow.PROPERTY_SEX_CATEGORY, EchoBaseCsvUtil.SEX_CATEGORY_FORMATTER); + model.newColumnForExport(VoyageCatchesBiometrySampleImportRow.PROPERTY_SIZE_CATEGORY, EchoBaseCsvUtil.SIZE_CATEGORY_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); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm