From 8f6d07070774d870d3b5f62807b0a3fa2d221844 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 7 Jun 2019 16:07:36 +0200 Subject: [PATCH] DATACASS-618 - Polishing. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Expose maybeEmitEvent(…) so it can be overridden in subclasses. --- .../data/cassandra/core/AsyncCassandraTemplate.java | 4 ++-- .../data/cassandra/core/CassandraTemplate.java | 4 ++-- .../data/cassandra/core/ReactiveCassandraTemplate.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraTemplate.java index f4f4d31a9..d32332649 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraTemplate.java @@ -24,7 +24,6 @@ import java.util.function.Function; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; -import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.dao.DataAccessException; @@ -55,6 +54,7 @@ import org.springframework.data.cassandra.core.mapping.event.BeforeConvertCallba import org.springframework.data.cassandra.core.mapping.event.BeforeDeleteEvent; import org.springframework.data.cassandra.core.mapping.event.BeforeSaveCallback; import org.springframework.data.cassandra.core.mapping.event.BeforeSaveEvent; +import org.springframework.data.cassandra.core.mapping.event.CassandraMappingEvent; import org.springframework.data.cassandra.core.query.Query; import org.springframework.data.domain.Slice; import org.springframework.data.mapping.callback.EntityCallbacks; @@ -859,7 +859,7 @@ public class AsyncCassandraTemplate return converter; } - private void maybeEmitEvent(ApplicationEvent event) { + protected , T> void maybeEmitEvent(E event) { if (this.eventPublisher != null) { this.eventPublisher.publishEvent(event); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java index ef56d94b0..638e8652d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java @@ -26,7 +26,6 @@ import java.util.stream.StreamSupport; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; -import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.dao.DataAccessException; @@ -56,6 +55,7 @@ import org.springframework.data.cassandra.core.mapping.event.BeforeConvertCallba import org.springframework.data.cassandra.core.mapping.event.BeforeDeleteEvent; import org.springframework.data.cassandra.core.mapping.event.BeforeSaveCallback; import org.springframework.data.cassandra.core.mapping.event.BeforeSaveEvent; +import org.springframework.data.cassandra.core.mapping.event.CassandraMappingEvent; import org.springframework.data.cassandra.core.query.Columns; import org.springframework.data.cassandra.core.query.Query; import org.springframework.data.domain.Slice; @@ -932,7 +932,7 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP return converter; } - private void maybeEmitEvent(ApplicationEvent event) { + protected , T> void maybeEmitEvent(E event) { if (this.eventPublisher != null) { this.eventPublisher.publishEvent(event); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java index 5bda49618..4c1ca8efc 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java @@ -29,7 +29,6 @@ import org.reactivestreams.Publisher; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; -import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.dao.DataAccessException; @@ -59,6 +58,7 @@ import org.springframework.data.cassandra.core.mapping.event.AfterLoadEvent; import org.springframework.data.cassandra.core.mapping.event.AfterSaveEvent; import org.springframework.data.cassandra.core.mapping.event.BeforeDeleteEvent; import org.springframework.data.cassandra.core.mapping.event.BeforeSaveEvent; +import org.springframework.data.cassandra.core.mapping.event.CassandraMappingEvent; import org.springframework.data.cassandra.core.mapping.event.ReactiveBeforeConvertCallback; import org.springframework.data.cassandra.core.mapping.event.ReactiveBeforeSaveCallback; import org.springframework.data.cassandra.core.query.Columns; @@ -879,7 +879,7 @@ public class ReactiveCassandraTemplate return converter; } - private void maybeEmitEvent(ApplicationEvent event) { + protected , T> void maybeEmitEvent(E event) { if (this.eventPublisher != null) { this.eventPublisher.publishEvent(event);