[Tutti-commits] 61/98: move to CsvConsumer some API

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 1f18450ac8909d765524118436f2d9e299d3a133 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Feb 14 13:56:51 2015 +0100 move to CsvConsumer some API --- .../fr/ifremer/tutti/service/csv/CsvComsumer.java | 26 ++++++++++++++++++++++ .../consumer/CsvConsumerForAccidentalCatch.java | 3 +-- .../consumer/CsvConsumerForCatch.java | 3 +-- .../consumer/CsvConsumerForGearCaracteristic.java | 3 +-- .../CsvConsumerForIndividualObservation.java | 3 +-- .../consumer/CsvConsumerForMarineLitter.java | 3 +-- .../consumer/CsvConsumerForOperation.java | 3 +-- .../consumer/CsvConsumerForParameter.java | 3 +-- .../consumer/CsvConsumerForSurvey.java | 2 +- .../consumer/CsvConsumerForTemporaryGear.java | 5 ++--- .../consumer/CsvConsumerForTemporaryPerson.java | 5 ++--- .../consumer/CsvConsumerForTemporarySpecies.java | 5 ++--- .../consumer/CsvConsumerForTemporaryVessel.java | 5 ++--- 13 files changed, 42 insertions(+), 27 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CsvComsumer.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CsvComsumer.java index 774335b..d60d8f6 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CsvComsumer.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CsvComsumer.java @@ -1,10 +1,13 @@ package fr.ifremer.tutti.service.csv; import com.google.common.base.Charsets; +import com.google.common.base.Joiner; import com.google.common.io.Files; import org.apache.commons.io.IOUtils; +import org.nuiton.csv.AbstractImportErrorInfo; import org.nuiton.csv.Import2; import org.nuiton.csv.ImportRow; +import org.nuiton.csv.ImportableColumn; import org.nuiton.jaxx.application.ApplicationTechnicalException; import java.io.BufferedReader; @@ -12,7 +15,11 @@ import java.io.Closeable; import java.io.FileNotFoundException; import java.io.IOException; import java.nio.file.Path; +import java.util.HashSet; import java.util.Iterator; +import java.util.Set; + +import static org.nuiton.i18n.I18n.t; /** * Created on 2/11/15. @@ -51,4 +58,23 @@ public abstract class CsvComsumer<O, M extends AbstractTuttiImportExportModel<O> IOUtils.closeQuietly(importer); } + public String rowErrorsToExceptionMessage(ImportRow<O> bean) { + + Set<String> errors = new HashSet<>(); + for (AbstractImportErrorInfo<O> errorInfo : bean.getErrors()) { + errors.add(t("tutti.csv.import.error.on.field", errorInfo.getField().getHeaderName(), errorInfo.getCause().getMessage())); + } + + String message = t("tutti.csv.import.error.on.row", bean.getLineNumber(), Joiner.on("\n").join(errors)); + return message; + + } + + public static class CheckImportErrorInfo<E> extends AbstractImportErrorInfo<E> { + + public CheckImportErrorInfo(ImportRow<E> row, ImportableColumn<E, Object> field, Throwable cause) { + super(row, field, cause); + } + + } } 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 8c6c6b0..ce2a6c4 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,7 +1,6 @@ package fr.ifremer.tutti.service.genericformat.consumer; import fr.ifremer.tutti.service.csv.CsvComsumer; -import fr.ifremer.tutti.service.csv.TuttiCsvUtil; import fr.ifremer.tutti.service.genericformat.GenericFormatImportResult; import fr.ifremer.tutti.service.genericformat.GlobalImportContext; import fr.ifremer.tutti.service.genericformat.csv.AccidentalCatchModel; @@ -35,7 +34,7 @@ public class CsvConsumerForAccidentalCatch extends CsvComsumer<AccidentalCatchRo if (!row.isValid()) { - String message = TuttiCsvUtil.rowErrorsToExceptionMessage(row); + String message = rowErrorsToExceptionMessage(row); throw new ApplicationBusinessException(message); } 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 e2229cd..dd87e52 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 @@ -1,7 +1,6 @@ package fr.ifremer.tutti.service.genericformat.consumer; import fr.ifremer.tutti.service.csv.CsvComsumer; -import fr.ifremer.tutti.service.csv.TuttiCsvUtil; import fr.ifremer.tutti.service.genericformat.GenericFormatImportResult; import fr.ifremer.tutti.service.genericformat.GlobalImportContext; import fr.ifremer.tutti.service.genericformat.csv.CatchModel; @@ -35,7 +34,7 @@ public class CsvConsumerForCatch extends CsvComsumer<CatchRow, CatchModel> { if (!row.isValid()) { - String message = TuttiCsvUtil.rowErrorsToExceptionMessage(row); + String message = rowErrorsToExceptionMessage(row); throw new ApplicationBusinessException(message); } 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 d9f3f15..1937f19 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 @@ -1,7 +1,6 @@ package fr.ifremer.tutti.service.genericformat.consumer; import fr.ifremer.tutti.service.csv.CsvComsumer; -import fr.ifremer.tutti.service.csv.TuttiCsvUtil; import fr.ifremer.tutti.service.genericformat.GenericFormatImportResult; import fr.ifremer.tutti.service.genericformat.GlobalImportContext; import fr.ifremer.tutti.service.genericformat.csv.GearCaracteristicModel; @@ -35,7 +34,7 @@ public class CsvConsumerForGearCaracteristic extends CsvComsumer<GearCaracterist if (!row.isValid()) { - String message = TuttiCsvUtil.rowErrorsToExceptionMessage(row); + String message = rowErrorsToExceptionMessage(row); throw new ApplicationBusinessException(message); } 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 b710cae..d9af30a 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,7 +1,6 @@ package fr.ifremer.tutti.service.genericformat.consumer; import fr.ifremer.tutti.service.csv.CsvComsumer; -import fr.ifremer.tutti.service.csv.TuttiCsvUtil; import fr.ifremer.tutti.service.genericformat.GenericFormatImportResult; import fr.ifremer.tutti.service.genericformat.GlobalImportContext; import fr.ifremer.tutti.service.genericformat.csv.IndividualObservationModel; @@ -35,7 +34,7 @@ public class CsvConsumerForIndividualObservation extends CsvComsumer<IndividualO if (!row.isValid()) { - String message = TuttiCsvUtil.rowErrorsToExceptionMessage(row); + String message = rowErrorsToExceptionMessage(row); throw new ApplicationBusinessException(message); } 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 009057f..c3f6ba4 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,7 +1,6 @@ package fr.ifremer.tutti.service.genericformat.consumer; import fr.ifremer.tutti.service.csv.CsvComsumer; -import fr.ifremer.tutti.service.csv.TuttiCsvUtil; import fr.ifremer.tutti.service.genericformat.GenericFormatImportResult; import fr.ifremer.tutti.service.genericformat.GlobalImportContext; import fr.ifremer.tutti.service.genericformat.csv.MarineLitterModel; @@ -35,7 +34,7 @@ public class CsvConsumerForMarineLitter extends CsvComsumer<MarineLitterRow, Mar if (!row.isValid()) { - String message = TuttiCsvUtil.rowErrorsToExceptionMessage(row); + String message = rowErrorsToExceptionMessage(row); throw new ApplicationBusinessException(message); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForOperation.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForOperation.java index 6ed4e90..a33f92d 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForOperation.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForOperation.java @@ -1,7 +1,6 @@ package fr.ifremer.tutti.service.genericformat.consumer; import fr.ifremer.tutti.service.csv.CsvComsumer; -import fr.ifremer.tutti.service.csv.TuttiCsvUtil; import fr.ifremer.tutti.service.genericformat.GenericFormatImportResult; import fr.ifremer.tutti.service.genericformat.GlobalImportContext; import fr.ifremer.tutti.service.genericformat.csv.OperationModel; @@ -35,7 +34,7 @@ public class CsvConsumerForOperation extends CsvComsumer<OperationRow, Operation if (!row.isValid()) { - String message = TuttiCsvUtil.rowErrorsToExceptionMessage(row); + String message = rowErrorsToExceptionMessage(row); throw new ApplicationBusinessException(message); } 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 76dca39..0fbf829 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,7 +1,6 @@ package fr.ifremer.tutti.service.genericformat.consumer; import fr.ifremer.tutti.service.csv.CsvComsumer; -import fr.ifremer.tutti.service.csv.TuttiCsvUtil; import fr.ifremer.tutti.service.genericformat.GenericFormatImportResult; import fr.ifremer.tutti.service.genericformat.GlobalImportContext; import fr.ifremer.tutti.service.genericformat.csv.ParameterModel; @@ -35,7 +34,7 @@ public class CsvConsumerForParameter extends CsvComsumer<ParameterRow, Parameter if (!row.isValid()) { - String message = TuttiCsvUtil.rowErrorsToExceptionMessage(row); + String message = rowErrorsToExceptionMessage(row); throw new ApplicationBusinessException(message); } 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 ee68a7e..1d85ba1 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 @@ -53,7 +53,7 @@ public class CsvConsumerForSurvey extends CsvComsumer<SurveyRow, SurveyModel> { if (!row.isValid()) { - String message = TuttiCsvUtil.rowErrorsToExceptionMessage(row); + String message = rowErrorsToExceptionMessage(row); throw new ApplicationBusinessException(message); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryGear.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryGear.java index c988277..b2cb522 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryGear.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryGear.java @@ -4,7 +4,6 @@ import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.csv.CsvComsumer; -import fr.ifremer.tutti.service.csv.TuttiCsvUtil; import fr.ifremer.tutti.service.referential.ReferentialImportRequest; import fr.ifremer.tutti.service.referential.csv.GearModel; import fr.ifremer.tutti.service.referential.csv.GearRow; @@ -41,7 +40,7 @@ public class CsvConsumerForTemporaryGear extends CsvComsumer<GearRow, GearModel> if (!row.isValid()) { - String message = TuttiCsvUtil.rowErrorsToExceptionMessage(row); + String message = rowErrorsToExceptionMessage(row); throw new ApplicationBusinessException(message); } @@ -85,7 +84,7 @@ public class CsvConsumerForTemporaryGear extends CsvComsumer<GearRow, GearModel> if (!row.isValid()) { - String message = TuttiCsvUtil.rowErrorsToExceptionMessage(row); + String message = rowErrorsToExceptionMessage(row); throw new ApplicationBusinessException(message); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryPerson.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryPerson.java index cf9130d..cc51557 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryPerson.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryPerson.java @@ -4,7 +4,6 @@ import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.csv.CsvComsumer; -import fr.ifremer.tutti.service.csv.TuttiCsvUtil; import fr.ifremer.tutti.service.referential.ReferentialImportRequest; import fr.ifremer.tutti.service.referential.csv.PersonModel; import fr.ifremer.tutti.service.referential.csv.PersonRow; @@ -41,7 +40,7 @@ public class CsvConsumerForTemporaryPerson extends CsvComsumer<PersonRow, Person if (!row.isValid()) { - String message = TuttiCsvUtil.rowErrorsToExceptionMessage(row); + String message = rowErrorsToExceptionMessage(row); throw new ApplicationBusinessException(message); } @@ -85,7 +84,7 @@ public class CsvConsumerForTemporaryPerson extends CsvComsumer<PersonRow, Person if (!row.isValid()) { - String message = TuttiCsvUtil.rowErrorsToExceptionMessage(row); + String message = rowErrorsToExceptionMessage(row); throw new ApplicationBusinessException(message); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporarySpecies.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporarySpecies.java index e6f1e49..fc5cb07 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporarySpecies.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporarySpecies.java @@ -4,7 +4,6 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.csv.CsvComsumer; -import fr.ifremer.tutti.service.csv.TuttiCsvUtil; import fr.ifremer.tutti.service.referential.ReferentialImportRequest; import fr.ifremer.tutti.service.referential.csv.SpeciesModel; import fr.ifremer.tutti.service.referential.csv.SpeciesRow; @@ -41,7 +40,7 @@ public class CsvConsumerForTemporarySpecies extends CsvComsumer<SpeciesRow, Spec if (!row.isValid()) { - String message = TuttiCsvUtil.rowErrorsToExceptionMessage(row); + String message = rowErrorsToExceptionMessage(row); throw new ApplicationBusinessException(message); } @@ -85,7 +84,7 @@ public class CsvConsumerForTemporarySpecies extends CsvComsumer<SpeciesRow, Spec if (!row.isValid()) { - String message = TuttiCsvUtil.rowErrorsToExceptionMessage(row); + String message = rowErrorsToExceptionMessage(row); throw new ApplicationBusinessException(message); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryVessel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryVessel.java index 0efe633..aa0d7a7 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryVessel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/consumer/CsvConsumerForTemporaryVessel.java @@ -4,7 +4,6 @@ import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.csv.CsvComsumer; -import fr.ifremer.tutti.service.csv.TuttiCsvUtil; import fr.ifremer.tutti.service.referential.ReferentialImportRequest; import fr.ifremer.tutti.service.referential.csv.VesselModel; import fr.ifremer.tutti.service.referential.csv.VesselRow; @@ -41,7 +40,7 @@ public class CsvConsumerForTemporaryVessel extends CsvComsumer<VesselRow, Vessel if (!row.isValid()) { - String message = TuttiCsvUtil.rowErrorsToExceptionMessage(row); + String message = rowErrorsToExceptionMessage(row); throw new ApplicationBusinessException(message); } @@ -86,7 +85,7 @@ public class CsvConsumerForTemporaryVessel extends CsvComsumer<VesselRow, Vessel if (!row.isValid()) { - String message = TuttiCsvUtil.rowErrorsToExceptionMessage(row); + String message = rowErrorsToExceptionMessage(row); throw new ApplicationBusinessException(message); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.