Spring/spring-data-relational
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAJDBC-252 - Polishing.

Browse Source 
Original pull request: #86.
This commit is contained in:
Oliver Gierke
2018-08-21 11:04:11 +02:00
parent 2a55aeb2b8
commit 84379b28e9
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/springframework/data/jdbc/core/EntityRowMapper.java
View File

@@ -70,11 +70,9 @@ public class EntityRowMapper<T> implements RowMapper<T> {
T result = createInstance(entity, resultSet, "");
if (entity.requiresPropertyPopulation()) {
return populateProperties(result, resultSet);
}
return result;
return entity.requiresPropertyPopulation() //
? populateProperties(result, resultSet) //
: result;
}
private T populateProperties(T result, ResultSet resultSet) {
@@ -92,12 +90,16 @@ public class EntityRowMapper<T> implements RowMapper<T> {
}
if (property.isCollectionLike() && id != null) {
propertyAccessor.setProperty(property, accessStrategy.findAllByProperty(id, property));
} else if (property.isMap() && id != null) {
Iterable<Object> allByProperty = accessStrategy.findAllByProperty(id, property);
propertyAccessor.setProperty(property, ITERABLE_OF_ENTRY_TO_MAP_CONVERTER.convert(allByProperty));
} else {
propertyAccessor.setProperty(property, readFrom(resultSet, property, ""));
}
}