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 58ea44596ff75161f988f65f57b14d66d23c7f92 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Aug 31 14:30:39 2016 +0200 fix validator types --- .../service/actions/validate/ValidateServiceUtils.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceUtils.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceUtils.java index fd531c1..3022bff 100644 --- a/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceUtils.java +++ b/services-api/src/main/java/fr/ird/observe/services/service/actions/validate/ValidateServiceUtils.java @@ -24,6 +24,7 @@ package fr.ird.observe.services.service.actions.validate; import com.google.common.collect.ImmutableSet; import com.google.gson.Gson; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.gson.ObserveDtoGsonSupplier; import java.io.InputStreamReader; @@ -46,7 +47,18 @@ public class ValidateServiceUtils { ValidatorDto[] validators = gson.fromJson(reader, ValidatorDto[].class); - return ImmutableSet.copyOf(validators); + ImmutableSet.Builder<ValidatorDto> builder = ImmutableSet.builder(); + + for (ValidatorDto validator : validators) { + String entityClassName = validator.getType().getName(); + String dtoClassName = entityClassName.replace(".entities.", ".services.dto.").replace(".referentiel.", ".referential.") + "Dto"; + Class<? extends IdDto> dtoClass = (Class<? extends IdDto>) Class.forName(dtoClassName); + ValidatorDto v2 = new ValidatorDto(dtoClass, validator.getScope(), validator.getContext(), validator.getFields()); + builder.add(v2); + } + + return builder.build(); + } catch (Exception e) { throw new ValidatorInitializationException(e); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.