Change client listener to receive events even without oldValue

infinispan · Oct 9, 2023 · 2342181 · 2342181
1 parent cbaeab0
commit 2342181
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 deletions.
diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/event/ClientEventsTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/event/ClientEventsTest.java
@@ -53,7 +53,7 @@ public void testRemovedEvent() {
       withClientListener(l, remote -> {
          l.expectNoEvents();
          remote.remove(1);
-         l.expectNoEvents();
+         l.expectOnlyRemovedEvent(1);
          remote.put(1, "one");
          l.expectOnlyCreatedEvent(1);
          remote.remove(1);

diff --git a/...ts/endpoints-interop-it/src/test/java/org/infinispan/it/endpoints/EmbeddedHotRodTest.java b/...ts/endpoints-interop-it/src/test/java/org/infinispan/it/endpoints/EmbeddedHotRodTest.java
@@ -195,7 +195,7 @@ public void testEventReceiveBasic() {
       withClientListener(l, remote -> {
          l.expectNoEvents();
          remote.remove(1);
-         l.expectNoEvents();
+         l.expectOnlyRemovedEvent(1);
          remote.put(1, "one");
          assertEquals("one", getEmbeddedCache().get(1));
          l.expectOnlyCreatedEvent(1);

diff --git a/server/hotrod/src/main/java/org/infinispan/server/hotrod/ClientListenerRegistry.java b/server/hotrod/src/main/java/org/infinispan/server/hotrod/ClientListenerRegistry.java
@@ -409,10 +409,8 @@ boolean isSendEvent(CacheEntryEvent<byte[], byte[]> event) {
             switch (event.getType()) {
                case CACHE_ENTRY_CREATED:
                case CACHE_ENTRY_MODIFIED:
-                  return !event.isPre();
                case CACHE_ENTRY_REMOVED:
-                  CacheEntryRemovedEvent removedEvent = (CacheEntryRemovedEvent) event;
-                  return !event.isPre() && removedEvent.getOldValue() != null;
+                  return !event.isPre();
                case CACHE_ENTRY_EXPIRED:
                   return true;
                default:

diff --git a/server/hotrod/src/test/java/org/infinispan/server/hotrod/event/HotRodCustomEventsTest.java b/server/hotrod/src/test/java/org/infinispan/server/hotrod/event/HotRodCustomEventsTest.java
@@ -40,7 +40,7 @@ public void testCustomEvents(Method m) {
                eventListener.expectNoEvents(Optional.empty());
                byte[] key = k(m);
                client().remove(key);
-               eventListener.expectNoEvents(Optional.empty());
+               eventListener.expectSingleCustomEvent(cache, addLengthPrefix(key));
                byte[] value = v(m);
                client().put(key, 0, 0, value);
                eventListener.expectSingleCustomEvent(cache, addLengthPrefix(key, value));

diff --git a/server/hotrod/src/test/java/org/infinispan/server/hotrod/event/HotRodEventsTest.java b/server/hotrod/src/test/java/org/infinispan/server/hotrod/event/HotRodEventsTest.java
@@ -49,7 +49,7 @@ public void testRemovedEvent(Method m) {
          eventListener.expectNoEvents(Optional.empty());
          byte[] key = k(m);
          client().remove(key);
-         eventListener.expectNoEvents(Optional.empty());
+         eventListener.expectOnlyRemovedEvent(cache, key);
          client().put(key, 0, 0, v(m));
          eventListener.expectOnlyCreatedEvent(cache, key);
          client().remove(key);

diff --git a/server/tests/src/test/java/org/infinispan/server/functional/hotrod/HotRodCacheEvents.java b/server/tests/src/test/java/org/infinispan/server/functional/hotrod/HotRodCacheEvents.java
@@ -89,7 +89,7 @@ public void testRemovedEvent(ProtocolVersion protocolVersion) {
       new EventLogListener<>(remoteCache(protocolVersion)).accept((l, remote) -> {
          l.expectNoEvents();
          remote.remove(1);
-         l.expectNoEvents();
+         l.expectOnlyRemovedEvent(1);
          remote.put(1, "one");
          l.expectOnlyCreatedEvent(1);
          remote.remove(1);