| ... |
... |
@@ -26,6 +26,7 @@ import com.google.auto.service.AutoService; |
|
26
|
26
|
import fr.ird.observe.dto.DtoToReference;
|
|
27
|
27
|
import fr.ird.observe.dto.IdDto;
|
|
28
|
28
|
import fr.ird.observe.dto.data.DataDto;
|
|
|
29
|
+import fr.ird.observe.dto.data.DataFileDto;
|
|
29
|
30
|
import fr.ird.observe.dto.reference.DataDtoReference;
|
|
30
|
31
|
import fr.ird.observe.dto.reference.DtoReference;
|
|
31
|
32
|
import fr.ird.observe.dto.reference.ReferentialDtoReference;
|
| ... |
... |
@@ -37,6 +38,7 @@ import fr.ird.observe.entities.referential.ReferentialEntity; |
|
37
|
38
|
import fr.ird.observe.spi.module.BusinessProject;
|
|
38
|
39
|
import io.ultreia.java4all.bean.definition.JavaBeanDefinition;
|
|
39
|
40
|
import io.ultreia.java4all.bean.definition.JavaBeanDefinitionStore;
|
|
|
41
|
+import io.ultreia.java4all.bean.definition.JavaBeanPropertyDefinition;
|
|
40
|
42
|
import io.ultreia.java4all.util.ServiceLoaders;
|
|
41
|
43
|
import org.apache.logging.log4j.LogManager;
|
|
42
|
44
|
import org.apache.logging.log4j.Logger;
|
| ... |
... |
@@ -55,6 +57,7 @@ import java.util.LinkedHashSet; |
|
55
|
57
|
import java.util.List;
|
|
56
|
58
|
import java.util.Map;
|
|
57
|
59
|
import java.util.Objects;
|
|
|
60
|
+import java.util.Optional;
|
|
58
|
61
|
import java.util.Set;
|
|
59
|
62
|
|
|
60
|
63
|
/**
|
| ... |
... |
@@ -160,7 +163,8 @@ public class ToolkitEntityToDtoMapping extends EntityToDtoMapping { |
|
160
|
163
|
@Override
|
|
161
|
164
|
public boolean acceptToDtoProperty(Class<?> dtoType, String propertyName) {
|
|
162
|
165
|
JavaBeanDefinition javaBeanDefinition = definitions.get(dtoType);
|
|
163
|
|
- return javaBeanDefinition.writeProperties().anyMatch(p -> p.propertyName().equals(propertyName));
|
|
|
166
|
+ Optional<JavaBeanPropertyDefinition<?, ?>> first = javaBeanDefinition.writeProperties().filter(p -> p.propertyName().equals(propertyName)).findFirst();
|
|
|
167
|
+ return first.isPresent() && !(DataFileDto.class.equals(first.get().type()));
|
|
164
|
168
|
}
|
|
165
|
169
|
|
|
166
|
170
|
@Override
|
| ... |
... |
@@ -182,9 +186,6 @@ public class ToolkitEntityToDtoMapping extends EntityToDtoMapping { |
|
182
|
186
|
if (isEntity) {
|
|
183
|
187
|
return String.format("java.util.Optional.ofNullable(%s()).map(e-> e.toReference(referentialLocale)).orElse(null)", getTransformer().getJavaBeanMethodName(operationPrefix, attribute.getName()));
|
|
184
|
188
|
} else {
|
|
185
|
|
- if ("java.sql.Blob".equals(attribute.getType())) {
|
|
186
|
|
- return "null";
|
|
187
|
|
- }
|
|
188
|
189
|
return String.format("%s()", getTransformer().getJavaBeanMethodName(operationPrefix, attribute.getName()));
|
|
189
|
190
|
}
|
|
190
|
191
|
}
|