This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 16d28d4c3ca0dd3aa9b83a3c7f2a3cee0c233a52 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 9 16:40:32 2016 +0200 Improve exception handler --- .../service/actions/validate/ValidateServiceUtils.java | 10 ++++------ .../actions/validate/ValidatorInitializationException.java | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceUtils.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceUtils.java index 616c1e6..cf92b40 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceUtils.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceUtils.java @@ -26,8 +26,6 @@ import com.google.common.collect.ImmutableSet; import com.google.gson.Gson; import fr.ird.observe.services.dto.gson.ObserveDtoGsonSupplier; -import java.io.IOException; -import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; @@ -42,19 +40,19 @@ public class ValidateServiceUtils { return ValidateService.AVAILABLE_CONTEXT_NAMES; } - public static ImmutableSet<ValidatorDto> getValidators() throws IOException { + public static ImmutableSet<ValidatorDto> getValidators() { ObserveDtoGsonSupplier gsonSupplier = new ObserveDtoGsonSupplier(false); Gson gson = gsonSupplier.get(); - InputStream inputStream = ValidateServiceUtils.class.getResourceAsStream(RESOURCE_VALIDATORS); - - try (Reader reader = new InputStreamReader(inputStream)) { + try (Reader reader = new InputStreamReader(ValidateServiceUtils.class.getResourceAsStream(RESOURCE_VALIDATORS))) { ValidatorDto[] validators = gson.fromJson(reader, ValidatorDto[].class); return ImmutableSet.copyOf(validators); + } catch (Exception e) { + throw new ValidatorInitializationException(e); } } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorInitializationException.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorInitializationException.java new file mode 100644 index 0000000..80a2f8e --- /dev/null +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidatorInitializationException.java @@ -0,0 +1,14 @@ +package fr.ird.observe.services.service.actions.validate; + +/** + * Created on 09/08/16. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class ValidatorInitializationException extends RuntimeException { + private static final long serialVersionUID =1L; + + public ValidatorInitializationException(Throwable cause) { + super(cause); + } +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.