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

Publish delete events by repository methods deleteInBatch and deleteAllInBatch methods.

Browse Source 
We now publish events from deleteInBatch and deleteAllInBatch methods to consider well-known repository methods.
We also now prevent event publication if the method argument is not an instance of the domain type.

Closes: #2448.
This commit is contained in:
Mark Paluch
2021-09-14 10:08:54 +02:00
parent dfb6387135
commit 27d4918ad5
2 changed files with 64 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,7 +129,8 @@ public class EventPublishingRepositoryProxyPostProcessor implements RepositoryPr
}
private static boolean isDeleteMethod(String methodName) {
return methodName.equals("delete") || methodName.equals("deleteAll");
return methodName.equals("delete") || methodName.equals("deleteAll") || methodName.equals("deleteInBatch")
|| methodName.equals("deleteAllInBatch");
}
/**
@@ -141,13 +142,16 @@ public class EventPublishingRepositoryProxyPostProcessor implements RepositoryPr
static class EventPublishingMethod {
private static Map<Class<?>, EventPublishingMethod> cache = new ConcurrentReferenceHashMap<>();
private static @SuppressWarnings("null") EventPublishingMethod NONE = new EventPublishingMethod(null, null);
private static @SuppressWarnings("null") EventPublishingMethod NONE = new EventPublishingMethod(Object.class, null,
null);
private final Class<?> type;
private final Method publishingMethod;
private final @Nullable Method clearingMethod;
EventPublishingMethod(Method publishingMethod, Method clearingMethod) {
EventPublishingMethod(Class<?> type, Method publishingMethod, @Nullable Method clearingMethod) {
this.type = type;
this.publishingMethod = publishingMethod;
this.clearingMethod = clearingMethod;
}
@@ -170,7 +174,7 @@ public class EventPublishingRepositoryProxyPostProcessor implements RepositoryPr
return eventPublishingMethod.orNull();
}
EventPublishingMethod result = from(getDetector(type, DomainEvents.class),
EventPublishingMethod result = from(type, getDetector(type, DomainEvents.class),
() -> getDetector(type, AfterDomainEventPublication.class));
cache.put(type, result);
@@ -192,6 +196,10 @@ public class EventPublishingRepositoryProxyPostProcessor implements RepositoryPr
for (Object aggregateRoot : asCollection(object)) {
if (!type.isInstance(aggregateRoot)) {
continue;
}
for (Object event : asCollection(ReflectionUtils.invokeMethod(publishingMethod, aggregateRoot))) {
publisher.publishEvent(event);
}
@@ -229,7 +237,7 @@ public class EventPublishingRepositoryProxyPostProcessor implements RepositoryPr
* @param clearing must not be {@literal null}.
* @return
*/
private static EventPublishingMethod from(AnnotationDetectionMethodCallback<?> publishing,
private static EventPublishingMethod from(Class<?> type, AnnotationDetectionMethodCallback<?> publishing,
Supplier<AnnotationDetectionMethodCallback<?>> clearing) {
if (!publishing.hasFoundAnnotation()) {
@@ -239,7 +247,7 @@ public class EventPublishingRepositoryProxyPostProcessor implements RepositoryPr
Method eventMethod = publishing.getRequiredMethod();
ReflectionUtils.makeAccessible(eventMethod);
return new EventPublishingMethod(eventMethod, getClearingMethod(clearing.get()));
return new EventPublishingMethod(type, eventMethod, getClearingMethod(clearing.get()));
}
/**