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

DATACMNS-917 - Query method execution for Maps now defaults null to an empty Map.

Browse Source 
QueryExecutionResultHandler now explicitly handles null values for query methods returning Maps by returning an empty Map. This can be the case if a query is supposed to produce a Map (a single result) but doesn't actually yield any results at all.
This commit is contained in:
Oliver Gierke
2016-09-23 14:46:59 +02:00
parent 8e35c4e41d
commit 3811ce5873
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/org/springframework/data/repository/core/support/QueryExecutionResultHandler.java
View File

@@ -15,6 +15,9 @@
*/
package org.springframework.data.repository.core.support;
import java.util.Map;
import org.springframework.core.CollectionFactory;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.support.DefaultConversionService;
import org.springframework.core.convert.support.GenericConversionService;
@@ -68,11 +71,15 @@ class QueryExecutionResultHandler {
return conversionService.convert(new NullableWrapper(result), expectedReturnType);
}
if (result == null) {
return null;
if (result != null) {
return conversionService.canConvert(result.getClass(), expectedReturnType)
? conversionService.convert(result, expectedReturnType) : result;
}
return conversionService.canConvert(result.getClass(), expectedReturnType) ? conversionService.convert(result,
expectedReturnType) : result;
if (Map.class.equals(expectedReturnType)) {
return CollectionFactory.createMap(expectedReturnType, 0);
}
return null;
}
}