DATAJDBC-586 - Guard JdbcRepositoryFactoryBean against setting null values for properties.

Author: mp911de

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

@@ -96,19 +96,27 @@ protected RepositoryFactorySupport doCreateRepositoryFactory() {
 	@Autowired
 	protected void setMappingContext(RelationalMappingContext mappingContext) {
 
+		Assert.notNull(mappingContext, "MappingContext must not be null");
+
 		super.setMappingContext(mappingContext);
 		this.mappingContext = mappingContext;
 	}
 
 	@Autowired
 	protected void setDialect(Dialect dialect) {
+
+		Assert.notNull(dialect, "Dialect must not be null");
+
 		this.dialect = dialect;
 	}
 
 	/**
 	 * @param dataAccessStrategy can be {@literal null}.
 	 */
 	public void setDataAccessStrategy(DataAccessStrategy dataAccessStrategy) {
+
+		Assert.notNull(dataAccessStrategy, "DataAccessStrategy must not be null");
+
 		this.dataAccessStrategy = dataAccessStrategy;
 	}
 
@@ -118,15 +126,24 @@ public void setDataAccessStrategy(DataAccessStrategy dataAccessStrategy) {
 	 */
 	@Autowired(required = false)
 	public void setQueryMappingConfiguration(QueryMappingConfiguration queryMappingConfiguration) {
+
+		Assert.notNull(queryMappingConfiguration, "QueryMappingConfiguration must not be null");
+
 		this.queryMappingConfiguration = queryMappingConfiguration;
 	}
 
 	public void setJdbcOperations(NamedParameterJdbcOperations operations) {
+
+		Assert.notNull(operations, "NamedParameterJdbcOperations must not be null");
+
 		this.operations = operations;
 	}
 
 	@Autowired
 	public void setConverter(JdbcConverter converter) {
+
+		Assert.notNull(converter, "JdbcConverter must not be null");
+
 		this.converter = converter;
 	}
 

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

@@ -97,17 +97,13 @@ public void setsUpBasicInstanceCorrectly() {
 
 	@Test(expected = IllegalArgumentException.class) // DATAJDBC-151
 	public void requiresListableBeanFactory() {
-
 		factoryBean.setBeanFactory(mock(BeanFactory.class));
 	}
 
-	@Test(expected = IllegalStateException.class) // DATAJDBC-155
+	@Test(expected = IllegalArgumentException.class) // DATAJDBC-155
 	public void afterPropertiesThrowsExceptionWhenNoMappingContextSet() {
 
 		factoryBean.setMappingContext(null);
-		factoryBean.setApplicationEventPublisher(publisher);
-		factoryBean.setBeanFactory(beanFactory);
-		factoryBean.afterPropertiesSet();
 	}
 
 	@Test // DATAJDBC-155