From 789099f6b99edc80c064db53d3951b6939987fbb Mon Sep 17 00:00:00 2001
From: Francisco Soler <francisco.soler@coosto.com>
Date: Wed, 19 Dec 2018 15:28:05 +0100
Subject: [PATCH] DATACMNS-1453 - Fixed wrong assertion in
 AuditingBeanDefinitionRegistrarSupport.

Original pull request: #328.
---
 ...AuditingBeanDefinitionRegistrarSupport.java |  3 ++-
 ...eanDefinitionRegistrarSupportUnitTests.java | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupport.java b/src/main/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupport.java
index 54fe7b898..c2be84add 100644
--- a/src/main/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupport.java
+++ b/src/main/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupport.java
@@ -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);
diff --git a/src/test/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupportUnitTests.java b/src/test/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupportUnitTests.java
index f4fc70669..07b21125f 100755
--- a/src/test/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupportUnitTests.java
+++ b/src/test/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupportUnitTests.java
@@ -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 {