diff --git a/src/main/java/org/springframework/data/redis/core/RedisKeyExpiredEvent.java b/src/main/java/org/springframework/data/redis/core/RedisKeyExpiredEvent.java index d3a95b5488..eff88c9d12 100644 --- a/src/main/java/org/springframework/data/redis/core/RedisKeyExpiredEvent.java +++ b/src/main/java/org/springframework/data/redis/core/RedisKeyExpiredEvent.java @@ -30,7 +30,7 @@ * @author Mark Paluch * @since 1.7 */ -public class RedisKeyExpiredEvent extends RedisKeyspaceEvent { +public class RedisKeyExpiredEvent extends RedisKeyspaceEvent { /** * Use {@literal UTF-8} as default charset. diff --git a/src/main/java/org/springframework/data/redis/core/RedisKeyValueAdapter.java b/src/main/java/org/springframework/data/redis/core/RedisKeyValueAdapter.java index 91ed200dbc..b2eeeb904b 100644 --- a/src/main/java/org/springframework/data/redis/core/RedisKeyValueAdapter.java +++ b/src/main/java/org/springframework/data/redis/core/RedisKeyValueAdapter.java @@ -856,7 +856,7 @@ public void onMessage(Message message, byte @Nullable [] pattern) { ? converter.getConversionService().convert(channelAsBytes, String.class) : null; - RedisKeyExpiredEvent event = new RedisKeyExpiredEvent<>(channel, key, value); + RedisKeyExpiredEvent event = new RedisKeyExpiredEvent(channel, key, value); ops.execute((RedisCallback) connection -> { diff --git a/src/test/java/org/springframework/data/redis/core/RedisKeyExpiredEventUnitTests.java b/src/test/java/org/springframework/data/redis/core/RedisKeyExpiredEventUnitTests.java index d308065a3d..77e0e7c124 100644 --- a/src/test/java/org/springframework/data/redis/core/RedisKeyExpiredEventUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/RedisKeyExpiredEventUnitTests.java @@ -29,16 +29,16 @@ class RedisKeyExpiredEventUnitTests { @Test // DATAREDIS-744 void shouldReturnKeyspace() { - assertThat(new RedisKeyExpiredEvent<>("foo".getBytes(), "").getKeyspace()).isNull(); - assertThat(new RedisKeyExpiredEvent<>("foo:bar".getBytes(), "").getKeyspace()).isEqualTo("foo"); - assertThat(new RedisKeyExpiredEvent<>("foo:bar:baz".getBytes(), "").getKeyspace()).isEqualTo("foo"); + assertThat(new RedisKeyExpiredEvent("foo".getBytes(), "").getKeyspace()).isNull(); + assertThat(new RedisKeyExpiredEvent("foo:bar".getBytes(), "").getKeyspace()).isEqualTo("foo"); + assertThat(new RedisKeyExpiredEvent("foo:bar:baz".getBytes(), "").getKeyspace()).isEqualTo("foo"); } @Test // DATAREDIS-744 void shouldReturnId() { - assertThat(new RedisKeyExpiredEvent<>("foo".getBytes(), "").getId()).isEqualTo("foo".getBytes()); - assertThat(new RedisKeyExpiredEvent<>("foo:bar".getBytes(), "").getId()).isEqualTo("bar".getBytes()); - assertThat(new RedisKeyExpiredEvent<>("foo:bar:baz".getBytes(), "").getId()).isEqualTo("bar:baz".getBytes()); + assertThat(new RedisKeyExpiredEvent("foo".getBytes(), "").getId()).isEqualTo("foo".getBytes()); + assertThat(new RedisKeyExpiredEvent("foo:bar".getBytes(), "").getId()).isEqualTo("bar".getBytes()); + assertThat(new RedisKeyExpiredEvent("foo:bar:baz".getBytes(), "").getId()).isEqualTo("bar:baz".getBytes()); } }