DATACMNS-1113 - Domain event publication now happens for all methods starting with save….

Previously we explicitly intercepted repository methods named save(…) and saveAll(…) which unfortunately results in custom variants of that (e.g. JpaRepository's saveAndFlush(…)) not causing event publication.

We now publish events for methods whose names start with save….

Author: odrotbohm

src/main/java/org/springframework/data/repository/core/support/EventPublishingRepositoryProxyPostProcessor.java

@@ -21,7 +21,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
-import java.util.stream.Stream;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
@@ -90,7 +89,7 @@ public Object invoke(MethodInvocation invocation) throws Throwable {
 
 			Object result = invocation.proceed();
 
-			if (!Stream.of("save", "saveAll").anyMatch(it -> invocation.getMethod().getName().equals(it))) {
+			if (!invocation.getMethod().getName().startsWith("save")) {
 				return result;
 			}
 

src/test/java/org/springframework/data/repository/core/support/EventPublishingRepositoryProxyPostProcessorUnitTests.java

@@ -22,6 +22,7 @@
 import lombok.Getter;
 import lombok.Value;
 
+import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -187,6 +188,23 @@ public void publishesEventsAfterSaveInvocation() throws Throwable {
 		}
 	}
 
+	@Test // DATACMNS-1113
+	public void invokesEventsForMethodsThatStartsWithSave() throws Throwable {
+
+		Method method = SampleRepository.class.getMethod("saveAndFlush", MultipleEvents.class);
+		doReturn(method).when(invocation).getMethod();
+
+		SomeEvent event = new SomeEvent();
+		MultipleEvents sample = MultipleEvents.of(Collections.singletonList(event));
+		doReturn(new Object[] { sample }).when(invocation).getArguments();
+
+		EventPublishingMethodInterceptor//
+				.of(EventPublishingMethod.of(MultipleEvents.class), publisher)//
+				.invoke(invocation);
+
+		verify(publisher).publishEvent(event);
+	}
+
 	@Value(staticConstructor = "of")
 	static class MultipleEvents {
 		@Getter(onMethod = @__(@DomainEvents)) Collection<? extends Object> events;
@@ -202,5 +220,8 @@ static class SomeEvent {
 		UUID id = UUID.randomUUID();
 	}
 
-	interface SampleRepository extends CrudRepository<MultipleEvents, Long> {}
+	interface SampleRepository extends CrudRepository<MultipleEvents, Long> {
+
+		MultipleEvents saveAndFlush(MultipleEvents events);
+	}
 }