Add missing hooks for callbacks. #1142

mikereiche · 2021-05-28T20:41:55Z

the previous change (Add @EnableReactiveCouchbaseAuditing [DATACOUCH-644] #955) to CouchbaseAuditingRegister intended to register
AuditingEntityCallback instead of AuditingEventListener but only changed the
name that AuditingEventListener was registered with. Since
AuditingEventListener does exactly the same thing as AuditingEntityCallback,
it behaved as those AuditingEntityCallback was being used.
It seems that the two mechanisms - EntityCallback and EventListener
both do more-or-less the same thing. I'm not sure why there are two
mechanisms to do the same thing.
Although the ReactiveAuditingEntityCallback mechanism is triggered
only for reactive operations and the non-reactive AuditingEntityCallback
is triggered only for non-reactive operations, the events are triggered
for both. Since there was a desire to have distinct callbacks for
reactive/non-reactive operations, I also made distinct events for
reactive/non-reactive operations. However both the reactive and non-reactive
event mechanisms are triggered for either reactive and non-reactive operations,
so it is necessary for the mechanism to determine if it should act on the
event.
Although there is an AbstractCouchbaseEventListener that is extended by
LoggingEventListener and ValidatingEventListener, AuditingEventListener does
not extend it (maybe it should).

Closes #1074.

You have read the Spring Data contribution guidelines.
There is a ticket in the bug tracker for the project in our JIRA.
You use the code formatters provided here and have them applied to your changes. Don’t submit any formatting related changes.
You submit test cases (unit or integration tests) that back your changes.
You added yourself as author in the headers of the classes you touched. Amend the date range in the Apache license header if needed. For new types, add the license header (copy from another file and set the current year only).

mikereiche · 2021-05-28T20:43:37Z

src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplateSupport.java

@@ -172,7 +178,7 @@ public void setEntityCallbacks(EntityCallbacks entityCallbacks) {
 		this.entityCallbacks = entityCallbacks;
 	}

-	void maybeEmitEvent(CouchbaseMappingEvent<?> event) {
+	public void maybeEmitEvent(CouchbaseMappingEvent<?> event) {
 		if (canPublishEvent()) {


need to call from ReactiveRemoveByIdOperationSupport

mikereiche · 2021-05-28T20:44:37Z

src/main/java/org/springframework/data/couchbase/core/CouchbaseTemplateSupport.java

@@ -95,16 +96,21 @@ public CouchbaseDocument encodeEntity(final Object entityToEncode) {
 	}

 	@Override
-	public Object applyUpdatedCas(final Object entity, final long cas) {
+	public Object applyUpdatedCas(final Object entity, CouchbaseDocument converted, final long cas) {


Added converted CouchbaseDocument to args as AfterSaveEvent takes a CouchbaseDocument.

mikereiche · 2021-05-28T20:50:55Z

src/main/java/org/springframework/data/couchbase/core/mapping/event/AfterConvertCallback.java

 	 */
-	T onAfterConvert(T entity, Document document, String collection);
+	T onAfterConvert(T entity, CouchbaseDocument document, String collection);


This was copied incorrectly from Mongo with the second arg of Document instead of CouchbaseDocument.

mikereiche · 2021-05-28T20:51:58Z

src/main/java/org/springframework/data/couchbase/core/mapping/event/AuditingEventListener.java

@@ -33,17 +35,19 @@
 * @author Mark Paluch
 * @author Michael Reiche
 */
-public class AuditingEventListener implements ApplicationListener<BeforeConvertEvent<Object>> {
+public class AuditingEventListener implements ApplicationListener<CouchbaseMappingEvent<Object>> {


Support any CouchbaseMappingEvent. Not just BeforeConvertEvent.

mikereiche · 2021-05-28T20:54:20Z

...va/org/springframework/data/couchbase/core/mapping/event/ReactiveAuditingEntityCallback.java

+	 */
+	@Override
+	public Publisher<Object> onAfterConvert(Object entity, CouchbaseDocument document, String collection) {
+		LOG.debug("onAfterConvert " + document.toString());


should remove this debug.

1) the previous change (#955) to CouchbaseAuditingRegister intended to register AuditingEntityCallback instead of AuditingEventListener but only changed the name that AuditingEventListener was registered with. Since AuditingEventListener does exactly the same thing as AuditingEntityCallback, it behaved as those AuditingEntityCallback was being used. 2) It seems that the two mechanisms - EntityCallback and EventListener both do more-or-less the same thing. I'm not sure why there are two mechanisms to do the same thing. 3) Although the ReactiveAuditingEntityCallback mechanism is triggered only for reactive operations and the non-reactive AuditingEntityCallback is triggered only for non-reactive operations, the events are triggered for both. Since there was a desire to have distinct callbacks for reactive/non-reactive operations, I also made distinct events for reactive/non-reactive operations. However both the reactive and non-reactive event mechanisms are triggered for either reactive and non-reactive operations, so it is necessary for the mechanism to determine if it should act on the event. 4) Although there is an AbstractCouchbaseEventListener that is extended by LoggingEventListener and ValidatingEventListener, AuditingEventListener does not extend it (maybe it should). Closes #1074.

1) the previous change (#955) to CouchbaseAuditingRegister intended to register AuditingEntityCallback instead of AuditingEventListener but only changed the name that AuditingEventListener was registered with. Since AuditingEventListener does exactly the same thing as AuditingEntityCallback, it behaved as those AuditingEntityCallback was being used. 2) It seems that the two mechanisms - EntityCallback and EventListener both do more-or-less the same thing. I'm not sure why there are two mechanisms to do the same thing. 3) Although the ReactiveAuditingEntityCallback mechanism is triggered only for reactive operations and the non-reactive AuditingEntityCallback is triggered only for non-reactive operations, the events are triggered for both. Since there was a desire to have distinct callbacks for reactive/non-reactive operations, I also made distinct events for reactive/non-reactive operations. However both the reactive and non-reactive event mechanisms are triggered for either reactive and non-reactive operations, so it is necessary for the mechanism to determine if it should act on the event. 4) Although there is an AbstractCouchbaseEventListener that is extended by LoggingEventListener and ValidatingEventListener, AuditingEventListener does not extend it (maybe it should). Closes #1074. Co-authored-by: mikereiche <michael.reiche@couchbase.com>

mikereiche commented May 28, 2021

View reviewed changes

mikereiche requested a review from daschl June 1, 2021 13:20

mikereiche force-pushed the datacouch_1074_aftersave_event_etc branch 3 times, most recently from 2aba7f2 to 615f873 Compare June 8, 2021 19:46

mikereiche force-pushed the datacouch_1074_aftersave_event_etc branch from 615f873 to ed3d923 Compare June 10, 2021 01:18

mikereiche force-pushed the datacouch_1074_aftersave_event_etc branch from ed3d923 to b311c6f Compare June 10, 2021 01:47

Merge branch 'main' into datacouch_1074_aftersave_event_etc

63f5116

mikereiche merged commit 155663e into main Jun 10, 2021

mikereiche deleted the datacouch_1074_aftersave_event_etc branch August 11, 2021 22:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add missing hooks for callbacks. #1142

Add missing hooks for callbacks. #1142

Uh oh!

mikereiche commented May 28, 2021 •

edited

Loading

Uh oh!

mikereiche May 28, 2021

Uh oh!

mikereiche May 28, 2021

Uh oh!

mikereiche May 28, 2021

Uh oh!

mikereiche May 28, 2021

Uh oh!

mikereiche May 28, 2021

Uh oh!

Uh oh!

Add missing hooks for callbacks. #1142

Add missing hooks for callbacks. #1142

Uh oh!

Conversation

mikereiche commented May 28, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mikereiche May 28, 2021

Choose a reason for hiding this comment

Uh oh!

mikereiche May 28, 2021

Choose a reason for hiding this comment

Uh oh!

mikereiche May 28, 2021

Choose a reason for hiding this comment

Uh oh!

mikereiche May 28, 2021

Choose a reason for hiding this comment

Uh oh!

mikereiche May 28, 2021

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mikereiche commented May 28, 2021 •

edited

Loading