omg

Author: christophstrobl

src/main/java/org/springframework/data/redis/TooManyClusterRedirectionsException.java

@@ -17,6 +17,7 @@
 
 import java.io.Serial;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.dao.DataRetrievalFailureException;
 
 /**
@@ -35,7 +36,7 @@ public class TooManyClusterRedirectionsException extends DataRetrievalFailureExc
 	 *
 	 * @param msg the detail message.
 	 */
-	public TooManyClusterRedirectionsException(String msg) {
+	public TooManyClusterRedirectionsException(@Nullable String msg) {
 		super(msg);
 	}
 
@@ -45,7 +46,7 @@ public TooManyClusterRedirectionsException(String msg) {
 	 * @param msg the detail message.
 	 * @param cause the root cause from the data access API in use.
 	 */
-	public TooManyClusterRedirectionsException(String msg, Throwable cause) {
+	public TooManyClusterRedirectionsException(@Nullable String msg, @Nullable Throwable cause) {
 		super(msg, cause);
 	}
 

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

@@ -21,6 +21,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.jspecify.annotations.NullUnmarked;
 import org.jspecify.annotations.Nullable;
 import org.springframework.data.redis.connection.BitFieldSubCommands.BitFieldSubCommand;
 import org.springframework.util.Assert;
@@ -573,10 +574,11 @@ public String toString() {
 	/**
 	 * @author Christoph Strobl
 	 */
+	@NullUnmarked
 	public static abstract class AbstractBitFieldSubCommand implements BitFieldSubCommand {
 
-		BitFieldType type;
-		Offset offset;
+		 BitFieldType type;
+		 Offset offset;
 
 		@Override
 		public BitFieldType getType() {

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

@@ -15,7 +15,19 @@
  */
 package org.springframework.data.redis.connection;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Random;
+import java.util.TreeMap;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -255,8 +267,7 @@ <T> MultiNodeResult<T> collectResults(Map<NodeExecution, Future<NodeResult<T>>>
 				} catch (ExecutionException ex) {
 					entryIterator.remove();
 					exceptionCollector.addException(nodeExecution, ex.getCause());
-				} catch (TimeoutException ignore) {
-				} catch (InterruptedException ex) {
+				} catch (TimeoutException ignore) {} catch (InterruptedException ex) {
 					Thread.currentThread().interrupt();
 					exceptionCollector.addException(nodeExecution, ex);
 					break OUT;
@@ -413,7 +424,8 @@ RedisClusterNode getNode() {
 		 *
 		 * @since 2.0.3
 		 */
-		@Nullable PositionalKey getPositionalKey() {
+		@Nullable
+		PositionalKey getPositionalKey() {
 			return this.positionalKey;
 		}
 
@@ -488,6 +500,19 @@ public byte[] getKey() {
 			return this.value;
 		}
 
+		/**
+		 * Get the actual value of the command execution or raise an error if {@literal null}.
+		 *
+		 * @return can be {@literal null}.
+		 * @throws IllegalArgumentException in case the value is {@literal null}.
+		 * @since 4.0
+		 */
+		public T getRequiredValue() {
+
+			Assert.notNull(this.value, "Expected non null value, but was null");
+			return this.value;
+		}
+
 		/**
 		 * Apply the {@link Function mapper function} to the value and return the mapped value.
 		 *

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

@@ -183,8 +183,8 @@ default Mono<Long> geoAdd(ByteBuffer key, Collection<GeoLocation<ByteBuffer>> lo
 	 */
 	class GeoDistCommand extends KeyCommand {
 
-		private final ByteBuffer from;
-		private final ByteBuffer to;
+		private final @Nullable ByteBuffer from;
+		private final @Nullable ByteBuffer to;
 		private final Metric metric;
 
 		private GeoDistCommand(@Nullable ByteBuffer key, @Nullable ByteBuffer from, @Nullable ByteBuffer to,

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

@@ -15,6 +15,7 @@
  */
 package org.springframework.data.redis.connection;
 
+import org.jspecify.annotations.Nullable;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -50,7 +51,7 @@ class PfAddCommand extends KeyCommand {
 
 		private final List<ByteBuffer> values;
 
-		private PfAddCommand(ByteBuffer key, List<ByteBuffer> values) {
+		private PfAddCommand(@Nullable ByteBuffer key, List<ByteBuffer> values) {
 
 			super(key);
 			this.values = values;
@@ -193,7 +194,7 @@ public List<ByteBuffer> getKeys() {
 		}
 
 		@Override
-		public ByteBuffer getKey() {
+		public @Nullable ByteBuffer getKey() {
 			return null;
 		}
 	}
@@ -245,7 +246,7 @@ class PfMergeCommand extends KeyCommand {
 
 		private final List<ByteBuffer> sourceKeys;
 
-		private PfMergeCommand(ByteBuffer key, List<ByteBuffer> sourceKeys) {
+		private PfMergeCommand(@Nullable ByteBuffer key, List<ByteBuffer> sourceKeys) {
 
 			super(key);
 			this.sourceKeys = sourceKeys;

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

@@ -710,11 +710,11 @@ class ExpireAtCommand extends KeyCommand {
 		private @Nullable Instant expireAt;
 		private final ExpirationOptions options;
 
-		private ExpireAtCommand(ByteBuffer key, Instant expireAt) {
+		private ExpireAtCommand(@Nullable ByteBuffer key, @Nullable Instant expireAt) {
 			this(key, expireAt, ExpirationOptions.none());
 		}
 
-		private ExpireAtCommand(@Nullable ByteBuffer key, Instant expireAt, ExpirationOptions options) {
+		private ExpireAtCommand(@Nullable ByteBuffer key, @Nullable Instant expireAt, ExpirationOptions options) {
 
 			super(key);
 

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

@@ -1277,7 +1277,7 @@ public BPopCommand blockingFor(Duration timeout) {
 		}
 
 		@Override
-		public ByteBuffer getKey() {
+		public @Nullable ByteBuffer getKey() {
 			return null;
 		}
 
@@ -1316,11 +1316,11 @@ public PopResult(List<ByteBuffer> result) {
 			this.result = result;
 		}
 
-		public ByteBuffer getKey() {
+		public @Nullable ByteBuffer getKey() {
 			return ObjectUtils.isEmpty(result) ? null : result.get(0);
 		}
 
-		public ByteBuffer getValue() {
+		public @Nullable ByteBuffer getValue() {
 			return ObjectUtils.isEmpty(result) ? null : result.get(1);
 		}
 

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

@@ -205,7 +205,7 @@ public KeyCommand(@Nullable ByteBuffer key) {
 		}
 
 		@Override
-		public ByteBuffer getKey() {
+		public @Nullable ByteBuffer getKey() {
 			return key;
 		}
 	}

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

@@ -402,6 +402,7 @@ default Mono<RecordId> xAdd(ByteBufferRecord record) {
 	 * @see <a href="https://redis.io/commands/xadd">Redis Documentation: XADD</a>
 	 * @since 3.4
 	 */
+	@SuppressWarnings("nullAway")
 	default Mono<RecordId> xAdd(ByteBufferRecord record, XAddOptions xAddOptions) {
 
 		Assert.notNull(record, "Record must not be null");

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

@@ -61,8 +61,8 @@ public interface ReactiveStringCommands {
 	class SetCommand extends KeyCommand {
 
 		private @Nullable ByteBuffer value;
-		private Expiration expiration;
-		private SetOption option;
+		private @Nullable Expiration expiration;
+		private @Nullable SetOption option;
 
 		private SetCommand(ByteBuffer key, @Nullable ByteBuffer value, @Nullable Expiration expiration,
 				@Nullable SetOption option) {
@@ -859,7 +859,7 @@ class SetBitCommand extends KeyCommand {
 		private @Nullable Long offset;
 		private boolean value;
 
-		private SetBitCommand(ByteBuffer key, Long offset, boolean value) {
+		private SetBitCommand(ByteBuffer key, @Nullable Long offset, boolean value) {
 
 			super(key);
 
@@ -1078,7 +1078,7 @@ public BitFieldCommand commands(BitFieldSubCommands commands) {
 			return new BitFieldCommand(getKey(), commands);
 		}
 
-		public BitFieldSubCommands getSubCommands() {
+		public @Nullable BitFieldSubCommands getSubCommands() {
 			return subcommands;
 		}
 	}

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

@@ -264,6 +264,7 @@ public boolean isReturnTotalChanged() {
 	 * @return
 	 * @see <a href="https://redis.io/commands/zadd">Redis Documentation: ZADD</a>
 	 */
+	@SuppressWarnings("nullAway")
 	default Mono<Long> zAdd(ByteBuffer key, Double score, ByteBuffer value) {
 
 		Assert.notNull(key, "Key must not be null");
@@ -282,6 +283,7 @@ default Mono<Long> zAdd(ByteBuffer key, Double score, ByteBuffer value) {
 	 * @return
 	 * @see <a href="https://redis.io/commands/zadd">Redis Documentation: ZADD</a>
 	 */
+	@SuppressWarnings("nullAway")
 	default Mono<Long> zAdd(ByteBuffer key, Collection<? extends Tuple> tuples) {
 
 		Assert.notNull(key, "Key must not be null");
@@ -941,7 +943,7 @@ default Flux<Tuple> zRevRangeWithScores(ByteBuffer key, Range<Long> range) {
 	 */
 	class ZRangeStoreCommand extends KeyCommand {
 
-		private final ByteBuffer destKey;
+		private final @Nullable ByteBuffer destKey;
 		private final RangeMode rangeMode;
 		private final Range<?> range;
 		private final Direction direction;
@@ -2158,7 +2160,7 @@ class ZRemRangeByRankCommand extends KeyCommand {
 
 		private final Range<Long> range;
 
-		private ZRemRangeByRankCommand(ByteBuffer key, Range<Long> range) {
+		private ZRemRangeByRankCommand(@Nullable ByteBuffer key, Range<Long> range) {
 			super(key);
 			this.range = range;
 		}
@@ -2860,7 +2862,7 @@ Flux<CommandResponse<ZAggregateCommand, Flux<Tuple>>> zInterWithScores(
 	 */
 	class ZInterStoreCommand extends ZAggregateStoreCommand {
 
-		private ZInterStoreCommand(ByteBuffer key, List<ByteBuffer> sourceKeys, List<Double> weights,
+		private ZInterStoreCommand(@Nullable ByteBuffer key, List<ByteBuffer> sourceKeys, List<Double> weights,
 				@Nullable Aggregate aggregate) {
 			super(key, sourceKeys, weights, aggregate);
 		}

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

@@ -127,7 +127,7 @@ public interface RedisClusterCommands {
 	 * @param slots
 	 * @see <a href="https://redis.io/commands/cluster-delslots">Redis Documentation: CLUSTER DELSLOTS</a>
 	 */
-	void clusterDeleteSlots(RedisClusterNode node, int... slots);
+	void clusterDeleteSlots( @NonNull RedisClusterNode node, int @NonNull ... slots);
 
 	/**
 	 * Removes {@link SlotRange#getSlotsArray()} from given {@link RedisClusterNode}.

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

@@ -141,12 +141,12 @@ default Boolean exists(byte @NonNull [] key) {
 	/**
 	 * Use a {@link Cursor} to iterate over keys.
 	 *
-	 * @param options must not be {@literal null}.
+	 * @param options can be {@literal null}.
 	 * @return never {@literal null}.
 	 * @since 1.4
 	 * @see <a href="https://redis.io/commands/scan">Redis Documentation: SCAN</a>
 	 */
-	Cursor<byte @NonNull []> scan(@NonNull ScanOptions options);
+	Cursor<byte @NonNull []> scan(@Nullable ScanOptions options);
 
 	/**
 	 * Return a random key from the keyspace.

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

@@ -225,7 +225,7 @@ public String asString() {
 		return this.name;
 	}
 
-	public void setName(String name) {
+	public void setName(@Nullable String name) {
 		this.name = name;
 	}