Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ec14b19e by Tony Chemit at 2021-01-14T15:28:42+01:00 Fix entity ←→ dto binding for DataFileDto properties - - - - - 1 changed file: - toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/entity/ToolkitEntityToDtoMapping.java Changes: ===================================== toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/entity/ToolkitEntityToDtoMapping.java ===================================== @@ -26,6 +26,7 @@ import com.google.auto.service.AutoService; import fr.ird.observe.dto.DtoToReference; import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.data.DataDto; +import fr.ird.observe.dto.data.DataFileDto; import fr.ird.observe.dto.reference.DataDtoReference; import fr.ird.observe.dto.reference.DtoReference; import fr.ird.observe.dto.reference.ReferentialDtoReference; @@ -37,6 +38,7 @@ import fr.ird.observe.entities.referential.ReferentialEntity; import fr.ird.observe.spi.module.BusinessProject; import io.ultreia.java4all.bean.definition.JavaBeanDefinition; import io.ultreia.java4all.bean.definition.JavaBeanDefinitionStore; +import io.ultreia.java4all.bean.definition.JavaBeanPropertyDefinition; import io.ultreia.java4all.util.ServiceLoaders; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -55,6 +57,7 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.Optional; import java.util.Set; /** @@ -160,7 +163,8 @@ public class ToolkitEntityToDtoMapping extends EntityToDtoMapping { @Override public boolean acceptToDtoProperty(Class<?> dtoType, String propertyName) { JavaBeanDefinition javaBeanDefinition = definitions.get(dtoType); - return javaBeanDefinition.writeProperties().anyMatch(p -> p.propertyName().equals(propertyName)); + Optional<JavaBeanPropertyDefinition<?, ?>> first = javaBeanDefinition.writeProperties().filter(p -> p.propertyName().equals(propertyName)).findFirst(); + return first.isPresent() && !(DataFileDto.class.equals(first.get().type())); } @Override @@ -182,9 +186,6 @@ public class ToolkitEntityToDtoMapping extends EntityToDtoMapping { if (isEntity) { return String.format("java.util.Optional.ofNullable(%s()).map(e-> e.toReference(referentialLocale)).orElse(null)", getTransformer().getJavaBeanMethodName(operationPrefix, attribute.getName())); } else { - if ("java.sql.Blob".equals(attribute.getType())) { - return "null"; - } return String.format("%s()", getTransformer().getJavaBeanMethodName(operationPrefix, attribute.getName())); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ec14b19e973a0267f11ff0ca00... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ec14b19e973a0267f11ff0ca00... You're receiving this email because of your account on gitlab.com.