Move off deprecated API.

See #3176

Author: mp911de

src/main/java/org/springframework/data/redis/connection/RedisPassword.java

@@ -17,6 +17,7 @@
 
 import java.util.Arrays;
 import java.util.NoSuchElementException;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Function;
 
@@ -158,6 +159,6 @@ public boolean equals(@Nullable Object o) {
 
 	@Override
 	public int hashCode() {
-		return ObjectUtils.nullSafeHashCode(thePassword);
+		return Objects.hashCode(thePassword);
 	}
 }

src/main/java/org/springframework/data/redis/connection/jedis/JedisStreamCommands.java

@@ -24,7 +24,7 @@
 import redis.clients.jedis.params.XPendingParams;
 import redis.clients.jedis.params.XReadGroupParams;
 import redis.clients.jedis.params.XReadParams;
-import redis.clients.jedis.resps.StreamConsumersInfo;
+import redis.clients.jedis.resps.StreamConsumerInfo;
 import redis.clients.jedis.resps.StreamGroupInfo;
 
 import java.util.ArrayList;
@@ -34,6 +34,7 @@
 
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.NullUnmarked;
+
 import org.springframework.data.domain.Range;
 import org.springframework.data.redis.connection.Limit;
 import org.springframework.data.redis.connection.RedisStreamCommands;
@@ -203,7 +204,7 @@ public StreamInfo.XInfoConsumers xInfoConsumers(byte @NonNull [] key, @NonNull S
 		return connection.invoke()
 				.from(Jedis::xinfoConsumers, ResponseCommands::xinfoConsumers, key, JedisConverters.toBytes(groupName))
 				.get(it -> {
-					List<StreamConsumersInfo> streamConsumersInfos = BuilderFactory.STREAM_CONSUMERS_INFO_LIST.build(it);
+					List<StreamConsumerInfo> streamConsumersInfos = BuilderFactory.STREAM_CONSUMER_INFO_LIST.build(it);
 					List<Object> sources = new ArrayList<>();
 					streamConsumersInfos.forEach(
 							streamConsumersInfo -> sources.add(StreamConverters.mapToList(streamConsumersInfo.getConsumerInfo())));

src/main/java/org/springframework/data/redis/connection/jedis/StreamConverters.java

@@ -237,11 +237,11 @@ private static StreamEntryID toStreamEntryId(String value) {
 		}
 
 		if ("$".equals(value)) {
-			return StreamEntryID.LAST_ENTRY;
+			return StreamEntryID.XGROUP_LAST_ENTRY;
 		}
 
 		if (">".equals(value)) {
-			return StreamEntryID.UNRECEIVED_ENTRY;
+			return StreamEntryID.XREADGROUP_UNDELIVERED_ENTRY;
 		}
 
 		return new StreamEntryID(value);

src/main/java/org/springframework/data/redis/core/convert/Bucket.java

@@ -32,9 +32,9 @@
 import java.util.regex.Pattern;
 
 import org.jspecify.annotations.Nullable;
+
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
-import org.springframework.util.comparator.NullSafeComparator;
 
 /**
  * Bucket is the data bag for Redis hash structures to be used with {@link RedisData}.
@@ -51,8 +51,7 @@ public class Bucket {
 	 */
 	public static final Charset CHARSET = StandardCharsets.UTF_8;
 
-	private static final Comparator<String> COMPARATOR = new NullSafeComparator<>(Comparator.<String> naturalOrder(),
-			true);
+	private static final Comparator<String> COMPARATOR = Comparator.nullsFirst(Comparator.naturalOrder());
 
 	/**
 	 * The Redis data as {@link Map} sorted by the keys.

src/main/java/org/springframework/data/redis/core/convert/MappingRedisConverter.java

@@ -31,6 +31,7 @@
 import java.util.regex.Pattern;
 
 import org.jspecify.annotations.Nullable;
+
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.CollectionFactory;
 import org.springframework.core.convert.ConversionService;
@@ -63,7 +64,6 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.util.comparator.NullSafeComparator;
 
 /**
  * {@link RedisConverter} implementation creating flat binary map structure out of a given domain type. Considers
@@ -119,8 +119,7 @@ public class MappingRedisConverter implements RedisConverter, InitializingBean {
 	private final GenericConversionService conversionService;
 	private final EntityInstantiators entityInstantiators;
 	private final RedisTypeMapper typeMapper;
-	private final Comparator<String> listKeyComparator = new NullSafeComparator<>(NaturalOrderingKeyComparator.INSTANCE,
-			true);
+	private final Comparator<String> listKeyComparator = Comparator.nullsFirst(NaturalOrderingKeyComparator.INSTANCE);
 
 	private IndexResolver indexResolver;
 	private @Nullable ReferenceResolver referenceResolver;

src/main/java/org/springframework/data/redis/stream/DefaultStreamReceiver.java

@@ -364,7 +364,7 @@ public void onComplete() {
 
 				@Override
 				public Context currentContext() {
-					return sink.currentContext();
+					return Context.of(sink.contextView());
 				}
 
 			};