This is an automated email from the git hooks/post-receive script. New commit to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit 39c37e46735bcbb6221ade388725497de86b81fe Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Feb 19 17:09:47 2015 +0100 renommage de la methode de validation d'une ligne + ajout de la methode de preparation pour les autres fichiers --- .../consumer/CsvConsumerForAccidentalCatch.java | 10 +++++-- .../consumer/CsvConsumerForCatch.java | 10 +++++-- .../consumer/CsvConsumerForGearCaracteristic.java | 2 +- .../CsvConsumerForIndividualObservation.java | 10 +++++-- .../consumer/CsvConsumerForMarineLitter.java | 10 +++++-- .../consumer/CsvConsumerForParameter.java | 10 +++++-- .../consumer/CsvConsumerForSampleCategory.java | 2 +- .../consumer/CsvConsumerForSurvey.java | 16 +++++------ .../FishingOperationAlreadyImportedException.java | 32 ++++++++++++++++++++++ 9 files changed, 82 insertions(+), 20 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForAccidentalCatch.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForAccidentalCatch.java index 8cc531b..03ca96c 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForAccidentalCatch.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForAccidentalCatch.java @@ -1,8 +1,8 @@ package fr.ifremer.tutti.service.genericformat.consumer; import fr.ifremer.tutti.service.csv.CsvComsumer; -import fr.ifremer.tutti.service.genericformat.GenericFormatImportEntityParserFactory; import fr.ifremer.tutti.service.genericformat.GenericFormatImportContext; +import fr.ifremer.tutti.service.genericformat.GenericFormatImportEntityParserFactory; import fr.ifremer.tutti.service.genericformat.csv.AccidentalCatchModel; import fr.ifremer.tutti.service.genericformat.csv.AccidentalCatchRow; import org.nuiton.csv.ImportRow; @@ -21,7 +21,7 @@ public class CsvConsumerForAccidentalCatch extends CsvComsumer<AccidentalCatchRo super(file, AccidentalCatchModel.forImport(separator, parserFactory)); } - public void checkRow(ImportRow<AccidentalCatchRow> row, GenericFormatImportContext importContext) { + public void validateRow(ImportRow<AccidentalCatchRow> row, GenericFormatImportContext importContext) { if (row.isValid()) { @@ -34,4 +34,10 @@ public class CsvConsumerForAccidentalCatch extends CsvComsumer<AccidentalCatchRo reportError(row); } + + public void prepareRowForPersist(ImportRow<AccidentalCatchRow> row) { + + AccidentalCatchRow bean = row.getBean(); + + } } \ No newline at end of file diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForCatch.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForCatch.java index d597d7b..1b68a1b 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForCatch.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForCatch.java @@ -2,8 +2,8 @@ package fr.ifremer.tutti.service.genericformat.consumer; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.service.csv.CsvComsumer; -import fr.ifremer.tutti.service.genericformat.GenericFormatImportEntityParserFactory; import fr.ifremer.tutti.service.genericformat.GenericFormatImportContext; +import fr.ifremer.tutti.service.genericformat.GenericFormatImportEntityParserFactory; import fr.ifremer.tutti.service.genericformat.csv.CatchModel; import fr.ifremer.tutti.service.genericformat.csv.CatchRow; import org.nuiton.csv.ImportRow; @@ -22,7 +22,7 @@ public class CsvConsumerForCatch extends CsvComsumer<CatchRow, CatchModel> { super(file, CatchModel.forImport(separator, sampleCategoryModel, parserFactory)); } - public void checkRow(ImportRow<CatchRow> row, GenericFormatImportContext importContext) { + public void validateRow(ImportRow<CatchRow> row, GenericFormatImportContext importContext) { if (row.isValid()) { @@ -36,4 +36,10 @@ public class CsvConsumerForCatch extends CsvComsumer<CatchRow, CatchModel> { } + public void prepareRowForPersist(ImportRow<CatchRow> row) { + + CatchRow bean = row.getBean(); + + } + } \ No newline at end of file diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForGearCaracteristic.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForGearCaracteristic.java index 7ad00eb..57ad59b 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForGearCaracteristic.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForGearCaracteristic.java @@ -27,7 +27,7 @@ public class CsvConsumerForGearCaracteristic extends CsvComsumer<GearCaracterist super(file, GearCaracteristicModel.forImport(separator, parserFactory)); } - public void checkRow(ImportRow<GearCaracteristicRow> row, GenericFormatImportContext importContext) { + public void validateRow(ImportRow<GearCaracteristicRow> row, GenericFormatImportContext importContext) { if (row.isValid()) { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForIndividualObservation.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForIndividualObservation.java index ed03845..d4da32c 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForIndividualObservation.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForIndividualObservation.java @@ -1,8 +1,8 @@ package fr.ifremer.tutti.service.genericformat.consumer; import fr.ifremer.tutti.service.csv.CsvComsumer; -import fr.ifremer.tutti.service.genericformat.GenericFormatImportEntityParserFactory; import fr.ifremer.tutti.service.genericformat.GenericFormatImportContext; +import fr.ifremer.tutti.service.genericformat.GenericFormatImportEntityParserFactory; import fr.ifremer.tutti.service.genericformat.csv.IndividualObservationModel; import fr.ifremer.tutti.service.genericformat.csv.IndividualObservationRow; import org.nuiton.csv.ImportRow; @@ -21,7 +21,7 @@ public class CsvConsumerForIndividualObservation extends CsvComsumer<IndividualO super(file, IndividualObservationModel.forImport(separator, parserFactory)); } - public void checkRow(ImportRow<IndividualObservationRow> row, GenericFormatImportContext importContext) { + public void validateRow(ImportRow<IndividualObservationRow> row, GenericFormatImportContext importContext) { if (row.isValid()) { @@ -35,4 +35,10 @@ public class CsvConsumerForIndividualObservation extends CsvComsumer<IndividualO } + public void prepareRowForPersist(ImportRow<IndividualObservationRow> row) { + + IndividualObservationRow bean = row.getBean(); + + } + } \ No newline at end of file diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForMarineLitter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForMarineLitter.java index d568ec3..714c7be 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForMarineLitter.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForMarineLitter.java @@ -1,8 +1,8 @@ package fr.ifremer.tutti.service.genericformat.consumer; import fr.ifremer.tutti.service.csv.CsvComsumer; -import fr.ifremer.tutti.service.genericformat.GenericFormatImportEntityParserFactory; import fr.ifremer.tutti.service.genericformat.GenericFormatImportContext; +import fr.ifremer.tutti.service.genericformat.GenericFormatImportEntityParserFactory; import fr.ifremer.tutti.service.genericformat.csv.MarineLitterModel; import fr.ifremer.tutti.service.genericformat.csv.MarineLitterRow; import org.nuiton.csv.ImportRow; @@ -21,7 +21,7 @@ public class CsvConsumerForMarineLitter extends CsvComsumer<MarineLitterRow, Mar super(file, MarineLitterModel.forImport(separator, parserFactory)); } - public void checkRow(ImportRow<MarineLitterRow> row, GenericFormatImportContext importContext) { + public void validateRow(ImportRow<MarineLitterRow> row, GenericFormatImportContext importContext) { if (row.isValid()) { @@ -35,4 +35,10 @@ public class CsvConsumerForMarineLitter extends CsvComsumer<MarineLitterRow, Mar } + public void prepareRowForPersist(ImportRow<MarineLitterRow> row) { + + MarineLitterRow bean = row.getBean(); + + } + } \ No newline at end of file diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForParameter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForParameter.java index f3a790f..e9baca2 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForParameter.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForParameter.java @@ -1,8 +1,8 @@ package fr.ifremer.tutti.service.genericformat.consumer; import fr.ifremer.tutti.service.csv.CsvComsumer; -import fr.ifremer.tutti.service.genericformat.GenericFormatImportEntityParserFactory; import fr.ifremer.tutti.service.genericformat.GenericFormatImportContext; +import fr.ifremer.tutti.service.genericformat.GenericFormatImportEntityParserFactory; import fr.ifremer.tutti.service.genericformat.csv.ParameterModel; import fr.ifremer.tutti.service.genericformat.csv.ParameterRow; import org.nuiton.csv.ImportRow; @@ -21,7 +21,7 @@ public class CsvConsumerForParameter extends CsvComsumer<ParameterRow, Parameter super(file, ParameterModel.forImport(separator, parserFactory)); } - public void checkRow(ImportRow<ParameterRow> row, GenericFormatImportContext importContext) { + public void validateRow(ImportRow<ParameterRow> row, GenericFormatImportContext importContext) { if (row.isValid()) { @@ -35,4 +35,10 @@ public class CsvConsumerForParameter extends CsvComsumer<ParameterRow, Parameter } + public void prepareRowForPersist(ImportRow<ParameterRow> row) { + + ParameterRow bean = row.getBean(); + + } + } \ No newline at end of file diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForSampleCategory.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForSampleCategory.java index 76e8ce5..55bde61 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForSampleCategory.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForSampleCategory.java @@ -27,7 +27,7 @@ public class CsvConsumerForSampleCategory extends CsvComsumer<SampleCategoryRow, super(file, SampleCategoryModel.forImport(separator, parserFactory)); } - public void checkRow(ImportRow<SampleCategoryRow> row, GenericFormatImportContext importContext) { + public void validateRow(ImportRow<SampleCategoryRow> row, GenericFormatImportContext importContext) { if (row.isValid()) { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForSurvey.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForSurvey.java index 6e4392f..513225b 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForSurvey.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForSurvey.java @@ -27,7 +27,7 @@ public class CsvConsumerForSurvey extends CsvComsumer<SurveyRow, SurveyModel> { super(file, SurveyModel.forImport(separator, parserFactory)); } - public void checkRow(ImportRow<SurveyRow> row, GenericFormatImportContext importContext, ValidationService validationService) { + public void validateRow(ImportRow<SurveyRow> row, GenericFormatImportContext importContext, ValidationService validationService) { if (row.isValid()) { @@ -39,18 +39,18 @@ public class CsvConsumerForSurvey extends CsvComsumer<SurveyRow, SurveyModel> { addCheckError(row, new CruiseAlreadyExistException(cruise)); - } - - if (importContext.isCruiseAlreadyImported(cruise)) { + } else if (importContext.isCruiseAlreadyImported(cruise)) { addCheckError(row, new CruiseAlreadyExistException(cruise)); - } + } else { + + NuitonValidatorResult nuitonValidatorResult = validationService.validateEditCruise(cruise); + if (nuitonValidatorResult.hasFatalMessages() || nuitonValidatorResult.hasErrorMessagess()) { - NuitonValidatorResult nuitonValidatorResult = validationService.validateEditCruise(cruise); - if (nuitonValidatorResult.hasFatalMessages() || nuitonValidatorResult.hasErrorMessagess()) { + addCheckError(row, new CruiseNotValidException(cruise, nuitonValidatorResult)); - addCheckError(row, new CruiseNotValidException(cruise, nuitonValidatorResult)); + } } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/FishingOperationAlreadyImportedException.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/FishingOperationAlreadyImportedException.java new file mode 100644 index 0000000..015ea11 --- /dev/null +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/FishingOperationAlreadyImportedException.java @@ -0,0 +1,32 @@ +package fr.ifremer.tutti.service.genericformat.consumer; + +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; + +import static org.nuiton.i18n.I18n.t; + +/** + * Created on 2/19/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.14 + */ +public class FishingOperationAlreadyImportedException extends Exception { + + private static final long serialVersionUID = 1L; + + private final FishingOperation fishingOperation; + + public FishingOperationAlreadyImportedException(FishingOperation fishingOperation) { + this.fishingOperation = fishingOperation; + } + + public FishingOperation getFishingOperation() { + return fishingOperation; + } + + @Override + public String getMessage() { + return t("tutti.genericFormat.import.error.fishingOperationAlreadyImported", fishingOperation.getStationNumber() , fishingOperation.getFishingOperationNumber() , fishingOperation.getMultirigAggregation(), fishingOperation.getGearShootingStartDate(), fishingOperation.getCruise().getName()); + } + +} \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.