tmp save 3

Author: christophstrobl

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

@@ -35,6 +35,7 @@
 import org.springframework.data.redis.TooManyClusterRedirectionsException;
 import org.springframework.data.redis.connection.util.ByteArraySet;
 import org.springframework.data.redis.connection.util.ByteArrayWrapper;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
@@ -598,6 +599,7 @@ public List<T> resultsAsListSortBy(byte[]... keys) {
 		 * @param returnValue can be {@literal null}.
 		 * @return can be {@literal null}.
 		 */
+		@Contract("!null -> !null")
 		public @Nullable T getFirstNonNullNotEmptyOrDefault(@Nullable T returnValue) {
 
 			for (NodeResult<T> nodeResult : nodeResults) {

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

@@ -23,6 +23,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.jspecify.annotations.NullUnmarked;
 import org.jspecify.annotations.Nullable;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.geo.Circle;
@@ -81,6 +82,7 @@
  * @author Dennis Neufeld
  * @author Shyngys Sapraliyev
  */
+@NullUnmarked
 @SuppressWarnings({ "ConstantConditions", "deprecation" })
 public class DefaultStringRedisConnection implements StringRedisConnection, DecoratedRedisConnection {
 
@@ -127,7 +129,6 @@ public String convert(byte[] source) {
 
 	private class SerializingConverter implements Converter<String, byte[]> {
 
-
 		@Override
 		public byte @Nullable[] convert(String source) {
 			return serializer.serialize(source);

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

@@ -23,6 +23,7 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
+import org.jspecify.annotations.NullUnmarked;
 import org.jspecify.annotations.Nullable;
 import org.springframework.data.geo.Circle;
 import org.springframework.data.geo.Distance;
@@ -69,6 +70,7 @@
  * @since 2.0
  */
 @Deprecated
+@NullUnmarked
 public interface DefaultedRedisConnection extends RedisCommands, RedisCommandsProvider {
 
 	// KEY COMMANDS

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

@@ -18,6 +18,7 @@
 import java.util.List;
 
 import org.jspecify.annotations.NullUnmarked;
+import org.jspecify.annotations.Nullable;
 import org.springframework.dao.DataAccessException;
 
 /**
@@ -104,7 +105,7 @@ public interface RedisConnection extends RedisCommandsProvider, DefaultedRedisCo
 	 * @throws RedisPipelineException if the pipeline contains any incorrect/invalid statements
 	 * @return the result of the executed commands.
 	 */
-	List<Object> closePipeline() throws RedisPipelineException;
+	List<@Nullable Object> closePipeline() throws RedisPipelineException;
 
 	/**
 	 * @return the {@link RedisSentinelConnection} when using Redis Sentinel.

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

@@ -83,7 +83,7 @@ default Long geoAdd(byte @NonNull [] key, @NonNull GeoLocation<byte[]> location)
 	 * @return Number of elements added. {@literal null} when used in pipeline / transaction.
 	 * @see <a href="https://redis.io/commands/geoadd">Redis Documentation: GEOADD</a>
 	 */
-	Long geoAdd(byte @NonNull [] key, Map<byte @NonNull [], @NonNull Point> memberCoordinateMap);
+	Long geoAdd(byte @NonNull [] key,  @NonNull Map<byte @NonNull [], @NonNull Point> memberCoordinateMap);
 
 	/**
 	 * Add {@link GeoLocation}s to {@literal key}
@@ -93,7 +93,7 @@ default Long geoAdd(byte @NonNull [] key, @NonNull GeoLocation<byte[]> location)
 	 * @return Number of elements added. {@literal null} when used in pipeline / transaction.
 	 * @see <a href="https://redis.io/commands/geoadd">Redis Documentation: GEOADD</a>
 	 */
-	Long geoAdd(byte @NonNull [] key, Iterable<@NonNull GeoLocation<byte[]>> locations);
+	Long geoAdd(byte @NonNull [] key,  @NonNull Iterable<@NonNull GeoLocation<byte[]>> locations);
 
 	/**
 	 * Get the {@link Distance} between {@literal member1} and {@literal member2}.

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

@@ -79,7 +79,7 @@ public interface RedisHashCommands {
 	 * @return empty {@link List} if key does not exist. {@literal null} when used in pipeline / transaction.
 	 * @see <a href="https://redis.io/commands/hmget">Redis Documentation: HMGET</a>
 	 */
-	List<byte @NonNull []> hMGet(byte @NonNull [] key, byte @NonNull [] @NonNull... fields);
+	List<byte[]> hMGet(byte @NonNull [] key, byte @NonNull [] @NonNull... fields);
 
 	/**
 	 * Set multiple hash fields to multiple values using data provided in {@code hashes}
@@ -214,7 +214,7 @@ public interface RedisHashCommands {
 	 * @since 2.6
 	 * @see <a href="https://redis.io/commands/hrandfield">Redis Documentation: HRANDFIELD</a>
 	 */
-	List<Map.Entry<byte @NonNull [], byte @NonNull []>> hRandFieldWithValues(byte @NonNull [] key, long count);
+	List<Map. @NonNull Entry<byte @NonNull [], byte @NonNull []>> hRandFieldWithValues(byte @NonNull [] key, long count);
 
 	/**
 	 * Use a {@link Cursor} to iterate over entries in hash at {@code key}.
@@ -225,7 +225,7 @@ public interface RedisHashCommands {
 	 * @since 1.4
 	 * @see <a href="https://redis.io/commands/hscan">Redis Documentation: HSCAN</a>
 	 */
-	Cursor<Map.Entry<byte @NonNull [], byte @NonNull []>> hScan(byte @NonNull [] key, ScanOptions options);
+	Cursor<Map. @NonNull Entry<byte @NonNull [], byte @NonNull []>> hScan(byte @NonNull [] key, ScanOptions options);
 
 	/**
 	 * Returns the length of the value associated with {@code field} in the hash stored at {@code key}. If the {@code key}

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

@@ -23,6 +23,7 @@
 
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.NullUnmarked;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.redis.core.Cursor;
 import org.springframework.data.redis.core.KeyScanOptions;
 import org.springframework.data.redis.core.ScanOptions;
@@ -153,7 +154,7 @@ default Boolean exists(byte @NonNull [] key) {
 	 * @return {@literal null} if no keys available or when used in pipeline or transaction.
 	 * @see <a href="https://redis.io/commands/randomkey">Redis Documentation: RANDOMKEY</a>
 	 */
-	byte @NonNull [] randomKey();
+	byte[] randomKey();
 
 	/**
 	 * Rename key {@code oldKey} to {@code newKey}.
@@ -456,22 +457,22 @@ default Boolean pExpireAt(byte @NonNull [] key, @NonNull Instant unixTime) {
 	 * Sort the elements for {@code key}.
 	 *
 	 * @param key must not be {@literal null}.
-	 * @param params must not be {@literal null}.
+	 * @param params can be {@literal null}.
 	 * @return {@literal null} when used in pipeline / transaction.
 	 * @see <a href="https://redis.io/commands/sort">Redis Documentation: SORT</a>
 	 */
-	List<byte @NonNull []> sort(byte @NonNull [] key, @NonNull SortParameters params);
+	List<byte @NonNull []> sort(byte @NonNull [] key, @Nullable SortParameters params);
 
 	/**
 	 * Sort the elements for {@code key} and store result in {@code storeKey}.
 	 *
 	 * @param key must not be {@literal null}.
-	 * @param params must not be {@literal null}.
+	 * @param params can be {@literal null}.
 	 * @param storeKey must not be {@literal null}.
 	 * @return {@literal null} when used in pipeline / transaction.
 	 * @see <a href="https://redis.io/commands/sort">Redis Documentation: SORT</a>
 	 */
-	Long sort(byte @NonNull [] key, @NonNull SortParameters params, byte @NonNull [] storeKey);
+	Long sort(byte @NonNull [] key, @Nullable SortParameters params, byte @NonNull [] storeKey);
 
 	/**
 	 * Retrieve serialized version of the value stored at {@code key}.

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

@@ -105,7 +105,7 @@ default Long lPos(byte @NonNull [] key, byte @NonNull [] element) {
 	 * @see <a href="https://redis.io/commands/lpos">Redis Documentation: LPOS</a>
 	 * @since 2.4
 	 */
-	List<Long> lPos(byte @NonNull [] key, byte[] element, @Nullable Integer rank, @Nullable Integer count);
+	List<Long> lPos(byte @NonNull [] key, byte @NonNull[] element, @Nullable Integer rank, @Nullable Integer count);
 
 	/**
 	 * Prepend {@code values} to {@code key}.

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

@@ -155,10 +155,11 @@ enum FlushOption {
 	/**
 	 * Shutdown server.
 	 *
+	 * @param option shutdown options if applicable.
 	 * @see <a href="https://redis.io/commands/shutdown">Redis Documentation: SHUTDOWN</a>
 	 * @since 1.3
 	 */
-	void shutdown(@NonNull ShutdownOption option);
+	void shutdown(@Nullable ShutdownOption option);
 
 	/**
 	 * Load configuration parameters for given {@code pattern} from server.

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

@@ -901,7 +901,7 @@ public boolean isLimited() {
 	 * @see <a href="https://redis.io/commands/xread">Redis Documentation: XREAD</a>
 	 */
 	List<@NonNull ByteRecord> xRead(@NonNull StreamReadOptions readOptions,
-			StreamOffset<byte @NonNull []> @NonNull... streams);
+		@NonNull StreamOffset<byte[]> @NonNull... streams);
 
 	/**
 	 * Read records from one or more {@link StreamOffset}s using a consumer group.
@@ -912,7 +912,7 @@ public boolean isLimited() {
 	 * @see <a href="https://redis.io/commands/xreadgroup">Redis Documentation: XREADGROUP</a>
 	 */
 	default List<@NonNull ByteRecord> xReadGroup(@NonNull Consumer consumer,
-			StreamOffset<byte @NonNull []> @NonNull... streams) {
+		@NonNull StreamOffset<byte[]> @NonNull... streams) {
 		return xReadGroup(consumer, StreamReadOptions.empty(), streams);
 	}
 
@@ -926,7 +926,7 @@ public boolean isLimited() {
 	 * @see <a href="https://redis.io/commands/xreadgroup">Redis Documentation: XREADGROUP</a>
 	 */
 	List<@NonNull ByteRecord> xReadGroup(@NonNull Consumer consumer, @NonNull StreamReadOptions readOptions,
-			StreamOffset<byte @NonNull []> @NonNull... streams);
+		@NonNull StreamOffset<byte[]> @NonNull... streams);
 
 	/**
 	 * Read records from a stream within a specific {@link Range} in reverse order.

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

@@ -21,6 +21,7 @@
 
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.NullUnmarked;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.domain.Range;
 import org.springframework.data.redis.core.types.Expiration;
 
@@ -71,7 +72,7 @@ enum BitOperation {
 	 * @see <a href="https://redis.io/commands/getex">Redis Documentation: GETEX</a>
 	 * @since 2.6
 	 */
-	byte[] getEx(byte @NonNull [] key, Expiration expiration);
+	byte[] getEx(byte @NonNull [] key, @NonNull Expiration expiration);
 
 	/**
 	 * Set {@code value} of {@code key} and return its old value.
@@ -91,7 +92,7 @@ enum BitOperation {
 	 * @return {@literal null} when used in pipeline / transaction.
 	 * @see <a href="https://redis.io/commands/mget">Redis Documentation: MGET</a>
 	 */
-	List<byte @NonNull []> mGet(byte @NonNull [] @NonNull... keys);
+	List<byte[]> mGet(byte @NonNull [] @NonNull... keys);
 
 	/**
 	 * Set {@code value} for {@code key}.
@@ -174,7 +175,7 @@ byte[] setGet(byte @NonNull [] key, byte @NonNull [] value, @NonNull Expiration
 	 * @return {@literal null} when used in pipeline / transaction.
 	 * @see <a href="https://redis.io/commands/mset">Redis Documentation: MSET</a>
 	 */
-	Boolean mSet(Map<byte @NonNull [], byte @NonNull []> tuple);
+	Boolean mSet(@NonNull Map<byte @NonNull [], byte @NonNull []> tuple);
 
 	/**
 	 * Set multiple keys to multiple values using key-value pairs provided in {@code tuple} only if the provided key does
@@ -184,7 +185,7 @@ byte[] setGet(byte @NonNull [] key, byte @NonNull [] value, @NonNull Expiration
 	 * @return {@literal null} when used in pipeline / transaction.
 	 * @see <a href="https://redis.io/commands/msetnx">Redis Documentation: MSETNX</a>
 	 */
-	Boolean mSetNX(Map<byte @NonNull [], byte @NonNull []> tuple);
+	Boolean mSetNX( @NonNull Map<byte @NonNull [], byte @NonNull []> tuple);
 
 	/**
 	 * Increment an integer value stored as string value of {@code key} by 1.

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

@@ -974,7 +974,7 @@ Long zRemRangeByScore(byte @NonNull [] key,
 	 * @since 2.6
 	 * @see <a href="https://redis.io/commands/zdiff">Redis Documentation: ZDIFF</a>
 	 */
-	Set<byte[]> zDiff(byte @NonNull [] @Nullable... sets);
+	Set<byte[]> zDiff(byte @NonNull [] @NonNull ... sets);
 
 	/**
 	 * Diff sorted {@code sets}.
@@ -1129,7 +1129,7 @@ Long zInterStore(byte @NonNull [] destKey, @NonNull Aggregate aggregate, @NonNul
 	 * @since 2.6
 	 * @see <a href="https://redis.io/commands/zunion">Redis Documentation: ZUNION</a>
 	 */
-	Set<@NonNull Tuple> zUnionWithScores(Aggregate aggregate, Weights weights, byte @NonNull [] @NonNull... sets);
+	Set<@NonNull Tuple> zUnionWithScores( @NonNull Aggregate aggregate,  @NonNull Weights weights, byte @NonNull [] @NonNull... sets);
 
 	/**
 	 * Union sorted {@code sets}.