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 c3bbf77070c9acaa91b6c84b6f479ff659fd7a07 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Feb 19 10:24:05 2015 +0100 improve caracteristic value parser --- .../csv/CaracteristicValueParseException.java | 46 ++++++++++++++++++++++ .../csv/CaracteristicValueParserFormatter.java | 5 +++ 2 files changed, 51 insertions(+) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CaracteristicValueParseException.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CaracteristicValueParseException.java new file mode 100644 index 0000000..1ad2140 --- /dev/null +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CaracteristicValueParseException.java @@ -0,0 +1,46 @@ +package fr.ifremer.tutti.service.csv; + +import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; + +import static org.nuiton.i18n.I18n.t; + +/** + * Created on 2/19/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 3.14 + */ +public class CaracteristicValueParseException extends Exception { + + private static final long serialVersionUID = 1L; + + private final Caracteristic caracteristic; + + private final String value; + + private final String errorMessage; + + public CaracteristicValueParseException(Caracteristic caracteristic, String value, String errorMessage) { + this.caracteristic = caracteristic; + this.value = value; + this.errorMessage = errorMessage; + } + + public Caracteristic getCaracteristic() { + return caracteristic; + } + + public String getValue() { + return value; + } + + public String getErrorMessage() { + return errorMessage; + } + + @Override + public String getMessage() { + return t("tutti.service.csv.parse.qualitativeValueError", value, caracteristic.getId(), errorMessage); + } + +} diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CaracteristicValueParserFormatter.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CaracteristicValueParserFormatter.java index e3edc75..afe949a 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CaracteristicValueParserFormatter.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CaracteristicValueParserFormatter.java @@ -10,6 +10,8 @@ import org.nuiton.csv.ValueParserFormatter; import java.io.Serializable; import java.text.ParseException; +import static org.nuiton.i18n.I18n.t; + /** * Created on 2/14/15. * @@ -68,6 +70,9 @@ public class CaracteristicValueParserFormatter implements ValueParserFormatter<S } else { result = CaracteristicQualitativeValues.getQualitativeValue(caracteristic, value); + if (result == null) { + throw new ParseException(t("tutti.service.csv.caracteristic.qualitativeValue.notFound", caracteristic.getId(), value), 0); + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.