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

DATACMNS-1453 - Fixed wrong assertion in AuditingBeanDefinitionRegistrarSupport.

Browse Source 
Original pull request: #328.
This commit is contained in:
Francisco Soler
2018-12-19 15:28:05 +01:00
committed by Oliver Drotbohm
parent d8705c1cca
commit 789099f6b9
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupport.java
View File

@@ -41,6 +41,7 @@ import org.springframework.util.StringUtils;
* @author Ranie Jade Ramiso
* @author Thomas Darimont
* @author Oliver Gierke
* @author Francisco Soler
*/
public abstract class AuditingBeanDefinitionRegistrarSupport implements ImportBeanDefinitionRegistrar {
@@ -57,7 +58,7 @@ public abstract class AuditingBeanDefinitionRegistrarSupport implements ImportBe
public void registerBeanDefinitions(AnnotationMetadata annotationMetadata, BeanDefinitionRegistry registry) {
Assert.notNull(annotationMetadata, "AnnotationMetadata must not be null!");
Assert.notNull(annotationMetadata, "BeanDefinitionRegistry must not be null!");
Assert.notNull(registry, "BeanDefinitionRegistry must not be null!");
AbstractBeanDefinition ahbd = registerAuditHandlerBeanDefinition(registry, getConfiguration(annotationMetadata));
registerAuditListenerBeanDefinition(ahbd, registry);

18
src/test/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupportUnitTests.java
View File

@@ -34,6 +34,7 @@ import org.springframework.data.auditing.EnableAuditing;
* @author Ranie Jade Ramiso
* @author Thomas Darimont
* @author Oliver Gierke
* @author Francisco Soler
*/
@RunWith(MockitoJUnitRunner.class)
public class AuditingBeanDefinitionRegistrarSupportUnitTests {
@@ -50,6 +51,23 @@ public class AuditingBeanDefinitionRegistrarSupportUnitTests {
verify(registry, times(1)).registerBeanDefinition(anyString(), any(BeanDefinition.class));
}
@Test(expected = IllegalArgumentException.class) // DATACMNS-1453
public void testNullMetadataInput() {
AuditingBeanDefinitionRegistrarSupport registrar = new DummyAuditingBeanDefinitionRegistrarSupport();
registrar.registerBeanDefinitions(null, registry);
}
@Test(expected = IllegalArgumentException.class) // DATACMNS-1453
public void testNullRegistryInput() {
AuditingBeanDefinitionRegistrarSupport registrar = new DummyAuditingBeanDefinitionRegistrarSupport();
AnnotationMetadata metadata = new StandardAnnotationMetadata(SampleConfig.class);
registrar.registerBeanDefinitions(metadata, null);
}
static class SampleConfig {}
static class DummyAuditingBeanDefinitionRegistrarSupport extends AuditingBeanDefinitionRegistrarSupport {