This is an automated email from the git hooks/post-receive script. New commit to branch feature/7619 in repository observe. See http://git.codelutin.com/observe.git commit 2e9ab243d6859c172d55f7df7d3829c7de7f520d Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Oct 22 10:28:49 2015 +0200 binder aussi les propritées dont la valeur est null. --- .../fr/ird/observe/services/builder/DtoToEntityBuilder.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java index 407b2c1..75fd352 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/DtoToEntityBuilder.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.builder; */ import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; import com.google.common.reflect.TypeToken; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.IdDto; @@ -76,9 +76,9 @@ public class DtoToEntityBuilder<D extends IdDto, E extends TopiaEntity> implemen Preconditions.checkNotNull(dto, "'dto' can't be null."); Preconditions.checkNotNull(entity, "'entity' can't be null."); - Map<String, Object> dtoProperties = binder.obtainProperties(dto); + Map<String, Object> dtoProperties = binder.obtainProperties(dto, true); - ImmutableMap.Builder<String, Object> entityProperties = new ImmutableMap.Builder<>(); + Map<String, Object> entityProperties = Maps.newHashMap(); for (Map.Entry<String, Object> entry : dtoProperties.entrySet()) { @@ -188,7 +188,7 @@ public class DtoToEntityBuilder<D extends IdDto, E extends TopiaEntity> implemen } - binder.injectProperties(entityProperties.build(), entity); + binder.injectProperties(entityProperties, entity, true); } @@ -247,13 +247,13 @@ public class DtoToEntityBuilder<D extends IdDto, E extends TopiaEntity> implemen } - protected void addProperty(String propertyName, Object propertyValue, ImmutableMap.Builder<String, Object> entitiesPropertiesBuilder) { + protected void addProperty(String propertyName, Object propertyValue, Map<String, Object> entitiesProperties) { if (IdDto.PROPERTY_ID.equals(propertyName)) { propertyName = TopiaEntity.PROPERTY_TOPIA_ID; } - entitiesPropertiesBuilder.put(propertyName, propertyValue); + entitiesProperties.put(propertyName, propertyValue); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.