Add setting mappingContext in afterPropertiesSet()

Signed-off-by: Sergey Korotaev <[email protected]>

Author: serezakorotaev

spring-data-jdbc/src/main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBean.java

@@ -49,6 +49,7 @@
  * @author Hebert Coelho
  * @author Chirag Tailor
  * @author Mikhail Polivakha
+ * @author Sergey Korotaev
  */
 public class JdbcRepositoryFactoryBean<T extends Repository<S, ID>, S, ID extends Serializable>
 		extends TransactionalRepositoryFactoryBeanSupport<T, S, ID> implements ApplicationEventPublisherAware {
@@ -157,9 +158,14 @@ public void setBeanFactory(BeanFactory beanFactory) {
 	@Override
 	public void afterPropertiesSet() {
 
-		Assert.state(this.mappingContext != null, "MappingContext is required and must not be null");
 		Assert.state(this.converter != null, "RelationalConverter is required and must not be null");
 
+		if (mappingContext == null) {
+			Assert.state(beanFactory != null, "If no MappingContext are set a BeanFactory must be available");
+
+			this.mappingContext = beanFactory.getBean(RelationalMappingContext.class);
+		}
+
 		if (this.operations == null) {
 
 			Assert.state(beanFactory != null, "If no JdbcOperations are set a BeanFactory must be available");

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBeanUnitTests.java

@@ -80,6 +80,7 @@ public void setUp() {
 
 		ObjectProvider<DataAccessStrategy> provider = mock(ObjectProvider.class);
 		when(beanFactory.getBeanProvider(DataAccessStrategy.class)).thenReturn(provider);
+		when(beanFactory.getBean(RelationalMappingContext.class)).thenReturn(mappingContext);
 		when(provider.getIfAvailable(any()))
 				.then((Answer<?>) invocation -> ((Supplier<?>) invocation.getArgument(0)).get());
 	}
@@ -114,7 +115,6 @@ public void afterPropertiesThrowsExceptionWhenNoMappingContextSet() {
 	@Test // DATAJDBC-155
 	public void afterPropertiesSetDefaultsNullablePropertiesCorrectly() {
 
-		factoryBean.setMappingContext(mappingContext);
 		factoryBean.setConverter(new MappingJdbcConverter(mappingContext, dataAccessStrategy));
 		factoryBean.setApplicationEventPublisher(publisher);
 		factoryBean.setBeanFactory(beanFactory);
@@ -126,6 +126,8 @@ public void afterPropertiesSetDefaultsNullablePropertiesCorrectly() {
 				.isInstanceOf(DefaultDataAccessStrategy.class);
 		assertThat(ReflectionTestUtils.getField(factoryBean, "queryMappingConfiguration"))
 				.isEqualTo(QueryMappingConfiguration.EMPTY);
+		assertThat(ReflectionTestUtils.getField(factoryBean, "mappingContext"))
+				.isEqualTo(mappingContext);
 	}
 
 	private static class DummyEntity {