From 42b43e5339869aebbe1d6e8f287370d13ac956cd Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 20 Aug 2024 10:10:00 +0200 Subject: [PATCH] Polishing. Replace instanceof check with pattern variable in production code. Add missing Deprecated annotations. See #2967 Original pull request: #2971 --- .../redis/connection/BitFieldSubCommands.java | 18 ++++++------------ .../connection/RedisSocketConfiguration.java | 3 +-- .../RedisStandaloneConfiguration.java | 3 +-- ...RedisStaticMasterReplicaConfiguration.java | 3 +-- .../redis/connection/RedisStreamCommands.java | 3 +-- .../redis/connection/SentinelMasterId.java | 3 +-- .../connection/jedis/JedisConverters.java | 6 ++---- .../connection/jedis/StreamConverters.java | 3 +-- .../connection/lettuce/LettuceConverters.java | 7 ++----- .../LettucePoolingConnectionProvider.java | 3 +-- .../redis/connection/zset/DefaultTuple.java | 3 +-- .../data/redis/connection/zset/Weights.java | 3 +-- .../data/redis/core/BoundSetOperations.java | 2 ++ .../core/convert/GeoIndexedPropertyValue.java | 3 +-- .../core/index/RedisIndexDefinition.java | 3 +-- .../data/redis/domain/geo/BoundingBox.java | 4 +--- .../data/redis/domain/geo/GeoLocation.java | 5 +---- .../data/redis/domain/geo/GeoReference.java | 6 ++---- .../data/redis/hash/Jackson2HashMapper.java | 19 +++---------------- ...ReactiveRedisMessageListenerContainer.java | 11 +++++------ .../cdi/RedisKeyValueAdapterBean.java | 3 +-- ...DefaultStreamMessageListenerContainer.java | 4 +--- .../data/redis/listener/PubSubTests.java | 8 ++++---- ...sageListenerContainerIntegrationTests.java | 12 ++++++------ .../BoundKeyOperationsIntegrationTests.java | 8 ++++---- 25 files changed, 51 insertions(+), 95 deletions(-) diff --git a/src/main/java/org/springframework/data/redis/connection/BitFieldSubCommands.java b/src/main/java/org/springframework/data/redis/connection/BitFieldSubCommands.java index 4e4193e98..282893d6b 100644 --- a/src/main/java/org/springframework/data/redis/connection/BitFieldSubCommands.java +++ b/src/main/java/org/springframework/data/redis/connection/BitFieldSubCommands.java @@ -151,10 +151,9 @@ public class BitFieldSubCommands implements Iterable { if (this == o) { return true; } - if (!(o instanceof BitFieldSubCommands)) { + if (!(o instanceof BitFieldSubCommands that)) { return false; } - BitFieldSubCommands that = (BitFieldSubCommands) o; return ObjectUtils.nullSafeEquals(subCommands, that.subCommands); } @@ -437,10 +436,9 @@ public class BitFieldSubCommands implements Iterable { if (this == o) { return true; } - if (!(o instanceof Offset)) { + if (!(o instanceof Offset that)) { return false; } - Offset that = (Offset) o; if (offset != that.offset) { return false; } @@ -549,10 +547,9 @@ public class BitFieldSubCommands implements Iterable { if (this == o) { return true; } - if (!(o instanceof BitFieldType)) { + if (!(o instanceof BitFieldType that)) { return false; } - BitFieldType that = (BitFieldType) o; if (signed != that.signed) { return false; } @@ -597,10 +594,9 @@ public class BitFieldSubCommands implements Iterable { if (this == o) { return true; } - if (!(o instanceof AbstractBitFieldSubCommand)) { + if (!(o instanceof AbstractBitFieldSubCommand that)) { return false; } - AbstractBitFieldSubCommand that = (AbstractBitFieldSubCommand) o; if (!ObjectUtils.nullSafeEquals(getClass(), that.getClass())) { return false; } @@ -680,13 +676,12 @@ public class BitFieldSubCommands implements Iterable { if (this == o) { return true; } - if (!(o instanceof BitFieldSet)) { + if (!(o instanceof BitFieldSet that)) { return false; } if (!super.equals(o)) { return false; } - BitFieldSet that = (BitFieldSet) o; if (value != that.value) { return false; } @@ -832,10 +827,9 @@ public class BitFieldSubCommands implements Iterable { if (this == o) { return true; } - if (!(o instanceof BitFieldIncrBy)) { + if (!(o instanceof BitFieldIncrBy that)) { return false; } - BitFieldIncrBy that = (BitFieldIncrBy) o; if (value != that.value) { return false; } diff --git a/src/main/java/org/springframework/data/redis/connection/RedisSocketConfiguration.java b/src/main/java/org/springframework/data/redis/connection/RedisSocketConfiguration.java index 7e70cfdfd..5e41c44a7 100644 --- a/src/main/java/org/springframework/data/redis/connection/RedisSocketConfiguration.java +++ b/src/main/java/org/springframework/data/redis/connection/RedisSocketConfiguration.java @@ -108,10 +108,9 @@ public class RedisSocketConfiguration implements RedisConfiguration, DomainSocke if (this == o) { return true; } - if (!(o instanceof RedisSocketConfiguration)) { + if (!(o instanceof RedisSocketConfiguration that)) { return false; } - RedisSocketConfiguration that = (RedisSocketConfiguration) o; if (database != that.database) { return false; } diff --git a/src/main/java/org/springframework/data/redis/connection/RedisStandaloneConfiguration.java b/src/main/java/org/springframework/data/redis/connection/RedisStandaloneConfiguration.java index 0ec52a6b7..f7d8b2372 100644 --- a/src/main/java/org/springframework/data/redis/connection/RedisStandaloneConfiguration.java +++ b/src/main/java/org/springframework/data/redis/connection/RedisStandaloneConfiguration.java @@ -137,10 +137,9 @@ public class RedisStandaloneConfiguration if (this == o) { return true; } - if (!(o instanceof RedisStandaloneConfiguration)) { + if (!(o instanceof RedisStandaloneConfiguration that)) { return false; } - RedisStandaloneConfiguration that = (RedisStandaloneConfiguration) o; if (port != that.port) { return false; } diff --git a/src/main/java/org/springframework/data/redis/connection/RedisStaticMasterReplicaConfiguration.java b/src/main/java/org/springframework/data/redis/connection/RedisStaticMasterReplicaConfiguration.java index 6ed05903b..1b60bf7a9 100644 --- a/src/main/java/org/springframework/data/redis/connection/RedisStaticMasterReplicaConfiguration.java +++ b/src/main/java/org/springframework/data/redis/connection/RedisStaticMasterReplicaConfiguration.java @@ -159,10 +159,9 @@ public class RedisStaticMasterReplicaConfiguration implements RedisConfiguration if (this == o) { return true; } - if (!(o instanceof RedisStaticMasterReplicaConfiguration)) { + if (!(o instanceof RedisStaticMasterReplicaConfiguration that)) { return false; } - RedisStaticMasterReplicaConfiguration that = (RedisStaticMasterReplicaConfiguration) o; if (database != that.database) { return false; } diff --git a/src/main/java/org/springframework/data/redis/connection/RedisStreamCommands.java b/src/main/java/org/springframework/data/redis/connection/RedisStreamCommands.java index a32610661..df9cbd9f5 100644 --- a/src/main/java/org/springframework/data/redis/connection/RedisStreamCommands.java +++ b/src/main/java/org/springframework/data/redis/connection/RedisStreamCommands.java @@ -246,10 +246,9 @@ public interface RedisStreamCommands { if (this == o) { return true; } - if (!(o instanceof XAddOptions)) { + if (!(o instanceof XAddOptions that)) { return false; } - XAddOptions that = (XAddOptions) o; if (nomkstream != that.nomkstream) { return false; } diff --git a/src/main/java/org/springframework/data/redis/connection/SentinelMasterId.java b/src/main/java/org/springframework/data/redis/connection/SentinelMasterId.java index e5d72b171..10954f4ca 100644 --- a/src/main/java/org/springframework/data/redis/connection/SentinelMasterId.java +++ b/src/main/java/org/springframework/data/redis/connection/SentinelMasterId.java @@ -51,10 +51,9 @@ class SentinelMasterId implements NamedNode { if (this == o) { return true; } - if (!(o instanceof SentinelMasterId)) { + if (!(o instanceof SentinelMasterId that)) { return false; } - SentinelMasterId that = (SentinelMasterId) o; return ObjectUtils.nullSafeEquals(name, that.name); } diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConverters.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConverters.java index 65cf3d40e..e3fee12e9 100644 --- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisConverters.java +++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisConverters.java @@ -748,9 +748,8 @@ abstract class JedisConverters extends Converters { return param; } - if (predicate instanceof BoxShape) { + if (predicate instanceof BoxShape boxPredicate) { - BoxShape boxPredicate = (BoxShape) predicate; BoundingBox boundingBox = boxPredicate.getBoundingBox(); param.byBox(boundingBox.getWidth().getValue(), boundingBox.getHeight().getValue(), @@ -770,9 +769,8 @@ abstract class JedisConverters extends Converters { return; } - if (reference instanceof GeoReference.GeoCoordinateReference) { + if (reference instanceof GeoReference.GeoCoordinateReference coordinates) { - GeoReference.GeoCoordinateReference coordinates = (GeoReference.GeoCoordinateReference) reference; param.fromLonLat(coordinates.getLongitude(), coordinates.getLatitude()); return; } diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/StreamConverters.java b/src/main/java/org/springframework/data/redis/connection/jedis/StreamConverters.java index 60d16a1f4..f4b0c7b2c 100644 --- a/src/main/java/org/springframework/data/redis/connection/jedis/StreamConverters.java +++ b/src/main/java/org/springframework/data/redis/connection/jedis/StreamConverters.java @@ -96,9 +96,8 @@ class StreamConverters { if (v instanceof StreamEntryID) { sources.add(v.toString()); - } else if (v instanceof StreamEntry) { + } else if (v instanceof StreamEntry streamEntry) { List entries = new ArrayList<>(2); - StreamEntry streamEntry = (StreamEntry) v; entries.add(streamEntry.getID().toString()); entries.add(streamEntry.getFields()); sources.add(entries); diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConverters.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConverters.java index 354217c54..450045a01 100644 --- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConverters.java +++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceConverters.java @@ -863,9 +863,8 @@ public abstract class LettuceConverters extends Converters { return GeoSearch.byRadius(radius.getValue(), toGeoArgsUnit(radius.getMetric())); } - if (predicate instanceof BoxShape) { + if (predicate instanceof BoxShape boxPredicate) { - BoxShape boxPredicate = (BoxShape) predicate; BoundingBox boundingBox = boxPredicate.getBoundingBox(); return GeoSearch.byBox(boundingBox.getWidth().getValue(), boundingBox.getHeight().getValue(), @@ -881,9 +880,7 @@ public abstract class LettuceConverters extends Converters { return GeoSearch.fromMember(((GeoMemberReference) reference).getMember()); } - if (reference instanceof GeoReference.GeoCoordinateReference) { - - GeoCoordinateReference coordinates = (GeoCoordinateReference) reference; + if (reference instanceof GeoCoordinateReference coordinates) { return GeoSearch.fromCoordinates(coordinates.getLongitude(), coordinates.getLatitude()); } diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettucePoolingConnectionProvider.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettucePoolingConnectionProvider.java index d82e88c3a..5b888e8f0 100644 --- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettucePoolingConnectionProvider.java +++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettucePoolingConnectionProvider.java @@ -165,9 +165,8 @@ class LettucePoolingConnectionProvider implements LettuceConnectionProvider, Red private void discardIfNecessary(StatefulConnection connection) { - if (connection instanceof StatefulRedisConnection) { + if (connection instanceof StatefulRedisConnection redisConnection) { - StatefulRedisConnection redisConnection = (StatefulRedisConnection) connection; if (redisConnection.isMulti()) { redisConnection.async().discard(); } diff --git a/src/main/java/org/springframework/data/redis/connection/zset/DefaultTuple.java b/src/main/java/org/springframework/data/redis/connection/zset/DefaultTuple.java index bddd817e0..4fa99efce 100644 --- a/src/main/java/org/springframework/data/redis/connection/zset/DefaultTuple.java +++ b/src/main/java/org/springframework/data/redis/connection/zset/DefaultTuple.java @@ -58,9 +58,8 @@ public class DefaultTuple implements Tuple { return true; if (obj == null) return false; - if (!(obj instanceof DefaultTuple)) + if (!(obj instanceof DefaultTuple other)) return false; - DefaultTuple other = (DefaultTuple) obj; if (score == null) { if (other.score != null) return false; diff --git a/src/main/java/org/springframework/data/redis/connection/zset/Weights.java b/src/main/java/org/springframework/data/redis/connection/zset/Weights.java index a40045f27..1ecab0fe3 100644 --- a/src/main/java/org/springframework/data/redis/connection/zset/Weights.java +++ b/src/main/java/org/springframework/data/redis/connection/zset/Weights.java @@ -151,11 +151,10 @@ public class Weights { return true; } - if (!(o instanceof Weights)) { + if (!(o instanceof Weights that)) { return false; } - Weights that = (Weights) o; return ObjectUtils.nullSafeEquals(this.weights, that.weights); } diff --git a/src/main/java/org/springframework/data/redis/core/BoundSetOperations.java b/src/main/java/org/springframework/data/redis/core/BoundSetOperations.java index b9d03ab65..5d333bbc0 100644 --- a/src/main/java/org/springframework/data/redis/core/BoundSetOperations.java +++ b/src/main/java/org/springframework/data/redis/core/BoundSetOperations.java @@ -185,6 +185,7 @@ public interface BoundSetOperations extends BoundKeyOperations { * @deprecated since 3.0, use {@link #difference(Object)} instead to follow a consistent method naming scheme. */ @Nullable + @Deprecated(since = "3.0") default Set diff(K key) { return difference(key); } @@ -209,6 +210,7 @@ public interface BoundSetOperations extends BoundKeyOperations { * @deprecated since 3.0, use {@link #difference(Collection)} instead to follow a consistent method naming scheme. */ @Nullable + @Deprecated(since = "3.0") default Set diff(Collection keys) { return difference(keys); } diff --git a/src/main/java/org/springframework/data/redis/core/convert/GeoIndexedPropertyValue.java b/src/main/java/org/springframework/data/redis/core/convert/GeoIndexedPropertyValue.java index 979d576a0..e45af221b 100644 --- a/src/main/java/org/springframework/data/redis/core/convert/GeoIndexedPropertyValue.java +++ b/src/main/java/org/springframework/data/redis/core/convert/GeoIndexedPropertyValue.java @@ -74,11 +74,10 @@ public class GeoIndexedPropertyValue implements IndexedData { return true; } - if (!(o instanceof GeoIndexedPropertyValue)) { + if (!(o instanceof GeoIndexedPropertyValue that)) { return false; } - GeoIndexedPropertyValue that = (GeoIndexedPropertyValue) o; if (!ObjectUtils.nullSafeEquals(keyspace, that.keyspace)) { return false; } diff --git a/src/main/java/org/springframework/data/redis/core/index/RedisIndexDefinition.java b/src/main/java/org/springframework/data/redis/core/index/RedisIndexDefinition.java index 122659a12..8e0e522fe 100644 --- a/src/main/java/org/springframework/data/redis/core/index/RedisIndexDefinition.java +++ b/src/main/java/org/springframework/data/redis/core/index/RedisIndexDefinition.java @@ -105,10 +105,9 @@ public abstract class RedisIndexDefinition implements IndexDefinition { if (obj == null) { return false; } - if (!(obj instanceof RedisIndexDefinition)) { + if (!(obj instanceof RedisIndexDefinition that)) { return false; } - RedisIndexDefinition that = (RedisIndexDefinition) obj; if (!ObjectUtils.nullSafeEquals(this.keyspace, that.keyspace)) { return false; diff --git a/src/main/java/org/springframework/data/redis/domain/geo/BoundingBox.java b/src/main/java/org/springframework/data/redis/domain/geo/BoundingBox.java index 4d00e271d..1807832b6 100644 --- a/src/main/java/org/springframework/data/redis/domain/geo/BoundingBox.java +++ b/src/main/java/org/springframework/data/redis/domain/geo/BoundingBox.java @@ -18,7 +18,6 @@ package org.springframework.data.redis.domain.geo; import org.springframework.data.geo.Distance; import org.springframework.data.geo.Metric; import org.springframework.data.geo.Shape; -import org.springframework.data.redis.connection.RedisGeoCommands; import org.springframework.lang.Nullable; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; @@ -94,10 +93,9 @@ public class BoundingBox implements Shape { if (this == o) { return true; } - if (!(o instanceof BoundingBox)) { + if (!(o instanceof BoundingBox that)) { return false; } - BoundingBox that = (BoundingBox) o; if (!ObjectUtils.nullSafeEquals(width, that.width)) { return false; } diff --git a/src/main/java/org/springframework/data/redis/domain/geo/GeoLocation.java b/src/main/java/org/springframework/data/redis/domain/geo/GeoLocation.java index bd570afab..ee60b5ea4 100644 --- a/src/main/java/org/springframework/data/redis/domain/geo/GeoLocation.java +++ b/src/main/java/org/springframework/data/redis/domain/geo/GeoLocation.java @@ -16,7 +16,6 @@ package org.springframework.data.redis.domain.geo; import org.springframework.data.geo.Point; -import org.springframework.data.redis.connection.RedisGeoCommands; import org.springframework.lang.Nullable; import org.springframework.util.ObjectUtils; @@ -49,12 +48,10 @@ public class GeoLocation { return true; } - if (!(o instanceof GeoLocation)) { + if (!(o instanceof GeoLocation that)) { return false; } - GeoLocation that = (GeoLocation) o; - if (!ObjectUtils.nullSafeEquals(name, that.name)) { return false; } diff --git a/src/main/java/org/springframework/data/redis/domain/geo/GeoReference.java b/src/main/java/org/springframework/data/redis/domain/geo/GeoReference.java index b3d728e0b..004f4c5c3 100644 --- a/src/main/java/org/springframework/data/redis/domain/geo/GeoReference.java +++ b/src/main/java/org/springframework/data/redis/domain/geo/GeoReference.java @@ -133,10 +133,9 @@ public interface GeoReference { if (this == o) { return true; } - if (!(o instanceof GeoReference.GeoMemberReference)) { + if (!(o instanceof GeoMemberReference that)) { return false; } - GeoMemberReference that = (GeoMemberReference) o; return ObjectUtils.nullSafeEquals(member, that.member); } @@ -178,10 +177,9 @@ public interface GeoReference { if (this == o) { return true; } - if (!(o instanceof GeoReference.GeoCoordinateReference)) { + if (!(o instanceof GeoCoordinateReference that)) { return false; } - GeoCoordinateReference that = (GeoCoordinateReference) o; if (longitude != that.longitude) { return false; } diff --git a/src/main/java/org/springframework/data/redis/hash/Jackson2HashMapper.java b/src/main/java/org/springframework/data/redis/hash/Jackson2HashMapper.java index e33243b6b..e7dcb37b1 100644 --- a/src/main/java/org/springframework/data/redis/hash/Jackson2HashMapper.java +++ b/src/main/java/org/springframework/data/redis/hash/Jackson2HashMapper.java @@ -15,23 +15,12 @@ */ package org.springframework.data.redis.hash; -import static com.fasterxml.jackson.databind.ObjectMapper.DefaultTyping.EVERYTHING; +import static com.fasterxml.jackson.databind.ObjectMapper.DefaultTyping.*; import java.io.IOException; import java.text.ParseException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.Map.Entry; -import java.util.Set; import org.springframework.data.mapping.MappingException; import org.springframework.data.redis.support.collections.CollectionUtils; @@ -379,13 +368,11 @@ public class Jackson2HashMapper implements HashMapper { private void flattenElement(String propertyPrefix, Object source, Map resultMap) { - if (!(source instanceof JsonNode)) { + if (!(source instanceof JsonNode element)) { resultMap.put(propertyPrefix, source); return; } - JsonNode element = (JsonNode) source; - if (element.isArray()) { Iterator nodes = element.elements(); diff --git a/src/main/java/org/springframework/data/redis/listener/ReactiveRedisMessageListenerContainer.java b/src/main/java/org/springframework/data/redis/listener/ReactiveRedisMessageListenerContainer.java index 58903a5a2..c23a75b9e 100644 --- a/src/main/java/org/springframework/data/redis/listener/ReactiveRedisMessageListenerContainer.java +++ b/src/main/java/org/springframework/data/redis/listener/ReactiveRedisMessageListenerContainer.java @@ -135,8 +135,8 @@ public class ReactiveRedisMessageListenerContainer implements DisposableBean { */ public Collection getActiveSubscriptions() { - return subscriptions.entrySet().stream().filter(entry -> entry.getValue().hasRegistration()) - .map(Map.Entry::getKey).collect(Collectors.toList()); + return subscriptions.entrySet().stream().filter(entry -> entry.getValue().hasRegistration()).map(Map.Entry::getKey) + .collect(Collectors.toList()); } /** @@ -295,8 +295,7 @@ public class ReactiveRedisMessageListenerContainer implements DisposableBean { } return doReceive(channelSerializer, messageSerializer, - getRequiredConnection().pubSubCommands().createSubscription(subscriptionListener), patterns, - channels); + getRequiredConnection().pubSubCommands().createSubscription(subscriptionListener), patterns, channels); } private Flux> doReceive(SerializationPair channelSerializer, @@ -361,7 +360,7 @@ public class ReactiveRedisMessageListenerContainer implements DisposableBean { return doReceiveLater(channelSerializer, messageSerializer, getRequiredConnection().pubSubCommands().createSubscription(readyListener), patterns, channels) - .delayUntil(it -> readyListener.getTrigger()); + .delayUntil(it -> readyListener.getTrigger()); }); } @@ -441,7 +440,7 @@ public class ReactiveRedisMessageListenerContainer implements DisposableBean { private Message readMessage(RedisElementReader channelSerializer, RedisElementReader messageSerializer, Message message) { - if (message instanceof PatternMessage) { + if (message instanceof PatternMessage) { PatternMessage patternMessage = (PatternMessage) message; diff --git a/src/main/java/org/springframework/data/redis/repository/cdi/RedisKeyValueAdapterBean.java b/src/main/java/org/springframework/data/redis/repository/cdi/RedisKeyValueAdapterBean.java index 9a1a8988b..5c93d1009 100644 --- a/src/main/java/org/springframework/data/redis/repository/cdi/RedisKeyValueAdapterBean.java +++ b/src/main/java/org/springframework/data/redis/repository/cdi/RedisKeyValueAdapterBean.java @@ -70,8 +70,7 @@ public class RedisKeyValueAdapterBean extends CdiBean { return type; } - if (type instanceof ParameterizedType) { - ParameterizedType parameterizedType = (ParameterizedType) type; + if (type instanceof ParameterizedType parameterizedType) { if (parameterizedType.getRawType() instanceof Class && RedisOperations.class.isAssignableFrom((Class) parameterizedType.getRawType())) { return type; diff --git a/src/main/java/org/springframework/data/redis/stream/DefaultStreamMessageListenerContainer.java b/src/main/java/org/springframework/data/redis/stream/DefaultStreamMessageListenerContainer.java index 25cd0d4b1..bd727ce89 100644 --- a/src/main/java/org/springframework/data/redis/stream/DefaultStreamMessageListenerContainer.java +++ b/src/main/java/org/springframework/data/redis/stream/DefaultStreamMessageListenerContainer.java @@ -224,9 +224,7 @@ class DefaultStreamMessageListenerContainer> implement byte[] rawKey = ((RedisSerializer) template.getKeySerializer()) .serialize(streamRequest.getStreamOffset().getKey()); - if (streamRequest instanceof StreamMessageListenerContainer.ConsumerStreamReadRequest) { - - ConsumerStreamReadRequest consumerStreamRequest = (ConsumerStreamReadRequest) streamRequest; + if (streamRequest instanceof ConsumerStreamReadRequest consumerStreamRequest) { StreamReadOptions readOptions = consumerStreamRequest.isAutoAcknowledge() ? this.readOptions.autoAcknowledge() : this.readOptions; diff --git a/src/test/java/org/springframework/data/redis/listener/PubSubTests.java b/src/test/java/org/springframework/data/redis/listener/PubSubTests.java index 84d60c82b..38413dc5d 100644 --- a/src/test/java/org/springframework/data/redis/listener/PubSubTests.java +++ b/src/test/java/org/springframework/data/redis/listener/PubSubTests.java @@ -170,10 +170,10 @@ public class PubSubTests { private static boolean isClusterAware(RedisConnectionFactory connectionFactory) { - if (connectionFactory instanceof LettuceConnectionFactory lettuceConnectionFactory) { - return lettuceConnectionFactory.isClusterAware(); - } else if (connectionFactory instanceof JedisConnectionFactory jedisConnectionFactory) { - return jedisConnectionFactory.isRedisClusterAware(); + if (connectionFactory instanceof LettuceConnectionFactory lettuce) { + return lettuce.isClusterAware(); + } else if (connectionFactory instanceof JedisConnectionFactory jedis) { + return jedis.isRedisClusterAware(); } return false; } diff --git a/src/test/java/org/springframework/data/redis/stream/AbstractStreamMessageListenerContainerIntegrationTests.java b/src/test/java/org/springframework/data/redis/stream/AbstractStreamMessageListenerContainerIntegrationTests.java index 8f74c5a4f..4e5d620cc 100644 --- a/src/test/java/org/springframework/data/redis/stream/AbstractStreamMessageListenerContainerIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/stream/AbstractStreamMessageListenerContainerIntegrationTests.java @@ -15,7 +15,10 @@ */ package org.springframework.data.redis.stream; -import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; + +import io.lettuce.core.codec.StringCodec; +import io.lettuce.core.output.NestedMultiOutput; import java.time.Duration; import java.util.Collections; @@ -48,9 +51,6 @@ import org.springframework.data.redis.stream.StreamMessageListenerContainer.Stre import org.springframework.data.redis.test.condition.EnabledOnCommand; import org.springframework.util.NumberUtils; -import io.lettuce.core.codec.StringCodec; -import io.lettuce.core.output.NestedMultiOutput; - /** * Integration tests for {@link StreamMessageListenerContainer}. * @@ -395,9 +395,9 @@ abstract class AbstractStreamMessageListenerContainerIntegrationTests { RedisConnection connection = connectionFactory.getConnection(); - if (connection instanceof LettuceConnection lettuceConnection) { + if (connection instanceof LettuceConnection lettuce) { - String value = ((List) lettuceConnection.execute("XPENDING", + String value = ((List) lettuce.execute("XPENDING", new NestedMultiOutput<>(StringCodec.UTF8), new byte[][] { stream.getBytes(), group.getBytes() })).get(0) .toString(); return NumberUtils.parseNumber(value, Integer.class); diff --git a/src/test/java/org/springframework/data/redis/support/BoundKeyOperationsIntegrationTests.java b/src/test/java/org/springframework/data/redis/support/BoundKeyOperationsIntegrationTests.java index df8992bb9..826247c56 100644 --- a/src/test/java/org/springframework/data/redis/support/BoundKeyOperationsIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/support/BoundKeyOperationsIntegrationTests.java @@ -123,10 +123,10 @@ public class BoundKeyOperationsIntegrationTests { collection.add("dummy"); } else if (keyOps instanceof Map map) { map.put("dummy", "dummy"); - } else if (keyOps instanceof RedisAtomicInteger redisAtomicInteger) { - redisAtomicInteger.set(42); - } else if (keyOps instanceof RedisAtomicLong redisAtomicLong) { - redisAtomicLong.set(42L); + } else if (keyOps instanceof RedisAtomicInteger atomic) { + atomic.set(42); + } else if (keyOps instanceof RedisAtomicLong atomic) { + atomic.set(42L); } } }