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

DATACMNS-1743 - Fixed handling of failed aggregate lookup in DomainClassConverter.

Browse Source 
We now fall back to null in case the repository lookup for the aggregate results in an absent value rather than returning the source unconverted.
This commit is contained in:
Oliver Drotbohm
2020-06-16 11:48:59 +02:00
committed by Oliver Drotbohm
parent f65451d777
commit aa1c1d4f15
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/test/java/org/springframework/data/repository/support/DomainClassConverterUnitTests.java
View File

@@ -30,6 +30,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
import org.springframework.aop.framework.Advised;
import org.springframework.aop.framework.AopProxyUtils;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.context.ApplicationContext;
@@ -203,6 +204,23 @@ class DomainClassConverterUnitTests {
assertThat(conversionService.canConvert(String.class, User.class)).isTrue();
}
@Test // DATACMNS-1743
void returnsNullForFailedLookup() {
ApplicationContext context = initContextWithRepo();
converter.setApplicationContext(context);
// Expect ID conversion
doReturn(4711L).when(service).convert("4711", Long.class);
// Configure aggregate lookup to fail
UserRepository users = context.getBean(UserRepository.class);
users = (UserRepository) AopProxyUtils.getSingletonTarget(users);
doReturn(Optional.empty()).when(users).findById(any());
assertThat(converter.convert("4711", STRING_TYPE, USER_TYPE)).isNull();
}
private ApplicationContext initContextWithRepo() {
BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(DummyRepositoryFactoryBean.class);