move to jpsecify

Author: christophstrobl

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

@@ -15,8 +15,8 @@
  */
 package org.springframework.data.redis;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.dao.DataAccessException;
-import org.springframework.lang.Nullable;
 
 /**
  * Potentially translates an {@link Exception} into appropriate {@link DataAccessException}.

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

@@ -15,9 +15,9 @@
  */
 package org.springframework.data.redis;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.dao.DataAccessException;
-import org.springframework.lang.Nullable;
 
 /**
  * {@link PassThroughExceptionTranslationStrategy} returns {@literal null} for unknown {@link Exception}s.
@@ -34,9 +34,8 @@ public PassThroughExceptionTranslationStrategy(Converter<Exception, DataAccessEx
 		this.converter = converter;
 	}
 
-	@Nullable
 	@Override
-	public DataAccessException translate(Exception e) {
+	public @Nullable DataAccessException translate(Exception e) {
 		return this.converter.convert(e);
 	}
 

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

@@ -15,8 +15,8 @@
  */
 package org.springframework.data.redis;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.dao.UncategorizedDataAccessException;
-import org.springframework.lang.Nullable;
 
 /**
  * Exception thrown when we can't classify a Redis exception into one of Spring generic data access exceptions.

src/main/java/org/springframework/data/redis/aot/RedisRuntimeHints.java

@@ -18,6 +18,7 @@
 import java.util.Arrays;
 import java.util.function.Consumer;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.aot.hint.MemberCategory;
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
@@ -50,7 +51,6 @@
 import org.springframework.data.redis.repository.query.RedisPartTreeQuery;
 import org.springframework.data.redis.repository.query.RedisQueryCreator;
 import org.springframework.data.redis.repository.support.RedisRepositoryFactoryBean;
-import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;
 
 /**

src/main/java/org/springframework/data/redis/cache/DefaultRedisCacheWriter.java

@@ -28,6 +28,7 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.dao.PessimisticLockingFailureException;
 import org.springframework.data.redis.connection.ReactiveRedisConnection;
 import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory;
@@ -38,7 +39,6 @@
 import org.springframework.data.redis.connection.RedisStringCommands.SetOption;
 import org.springframework.data.redis.core.types.Expiration;
 import org.springframework.data.redis.util.ByteUtils;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
@@ -142,8 +142,8 @@ public byte[] get(String name, byte[] key, @Nullable Duration ttl) {
 		return execute(name, connection -> doGet(connection, name, key, ttl));
 	}
 
-	@Nullable
-	private byte[] doGet(RedisConnection connection, String name, byte[] key, @Nullable Duration ttl) {
+
+	private byte @Nullable[] doGet(RedisConnection connection, String name, byte[] key, @Nullable Duration ttl) {
 
 		byte[] result = shouldExpireWithin(ttl) ? connection.stringCommands().getEx(key, Expiration.from(ttl))
 				: connection.stringCommands().get(key);

src/main/java/org/springframework/data/redis/cache/FixedDurationTtlFunction.java

@@ -17,8 +17,8 @@
 
 import java.time.Duration;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.redis.cache.RedisCacheWriter.TtlFunction;
-import org.springframework.lang.Nullable;
 
 /**
  * {@link TtlFunction} implementation returning the given, predetermined {@link Duration} used for per cache entry

src/main/java/org/springframework/data/redis/cache/NoOpCacheStatisticsCollector.java

@@ -18,7 +18,7 @@
 import java.time.Instant;
 import java.util.concurrent.TimeUnit;
 
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.springframework.util.ObjectUtils;
 
 /**

src/main/java/org/springframework/data/redis/cache/RedisCache.java

@@ -27,6 +27,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Supplier;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.cache.Cache;
 import org.springframework.cache.support.AbstractValueAdaptingCache;
 import org.springframework.cache.support.NullValue;
@@ -37,7 +38,6 @@
 import org.springframework.data.redis.serializer.RedisSerializationContext;
 import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.data.redis.util.ByteUtils;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.ReflectionUtils;
@@ -311,8 +311,7 @@ private Object processAndCheckValue(@Nullable Object value) {
 	 * @param value can be {@literal null}.
 	 * @return preprocessed value. Can be {@literal null}.
 	 */
-	@Nullable
-	protected Object preProcessCacheValue(@Nullable Object value) {
+	protected @Nullable Object preProcessCacheValue(@Nullable Object value) {
 		return value != null ? value : isAllowNullValues() ? NullValue.INSTANCE : null;
 	}
 
@@ -351,8 +350,7 @@ protected byte[] serializeCacheValue(Object value) {
 	 *         {@link RedisSerializationContext.SerializationPair}; can be {@literal null}.
 	 * @see RedisCacheConfiguration#getValueSerializationPair()
 	 */
-	@Nullable
-	protected Object deserializeCacheValue(byte[] value) {
+	protected @Nullable Object deserializeCacheValue(byte[] value) {
 
 		if (isAllowNullValues() && ObjectUtils.nullSafeEquals(value, BINARY_NULL_VALUE)) {
 			return NullValue.INSTANCE;
@@ -425,8 +423,7 @@ private CompletableFuture<ValueWrapper> retrieveValue(Object key) {
 				.thenApply(this::toValueWrapper);
 	}
 
-	@Nullable
-	private Object nullSafeDeserializedStoreValue(@Nullable byte[] value) {
+	private @Nullable Object nullSafeDeserializedStoreValue(byte @Nullable[] value) {
 		return value != null ? fromStoreValue(deserializeCacheValue(value)) : null;
 	}
 

src/main/java/org/springframework/data/redis/cache/RedisCacheConfiguration.java

@@ -19,6 +19,7 @@
 import java.time.Duration;
 import java.util.function.Consumer;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.cache.Cache;
 import org.springframework.cache.interceptor.SimpleKey;
 import org.springframework.core.convert.ConversionService;
@@ -28,7 +29,6 @@
 import org.springframework.data.redis.serializer.RedisSerializationContext.SerializationPair;
 import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.format.support.DefaultFormattingConversionService;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**

src/main/java/org/springframework/data/redis/cache/RedisCacheManager.java

@@ -23,11 +23,11 @@
 import java.util.Optional;
 import java.util.Set;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.transaction.AbstractTransactionSupportingCacheManager;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**

src/main/java/org/springframework/data/redis/cache/RedisCacheWriter.java

@@ -19,8 +19,8 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Supplier;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -119,8 +119,8 @@ static RedisCacheWriter lockingRedisCacheWriter(RedisConnectionFactory connectio
 	 * @return {@literal null} if key does not exist.
 	 * @see #get(String, byte[], Duration)
 	 */
-	@Nullable
-	byte[] get(String name, byte[] key);
+	byte @Nullable[] get(String name, byte[] key);
+
 
 	/**
 	 * Get the binary value representation from Redis stored for the given key and set the given {@link Duration TTL
@@ -131,8 +131,7 @@ static RedisCacheWriter lockingRedisCacheWriter(RedisConnectionFactory connectio
 	 * @param ttl {@link Duration} specifying the {@literal expiration timeout} for the cache entry.
 	 * @return {@literal null} if key does not exist or has {@literal expired}.
 	 */
-	@Nullable
-	default byte[] get(String name, byte[] key, @Nullable Duration ttl) {
+	default byte @Nullable[] get(String name, byte[] key, @Nullable Duration ttl) {
 		return get(name, key);
 	}
 
@@ -242,8 +241,7 @@ default CompletableFuture<byte[]> retrieve(String name, byte[] key) {
 	 * @param ttl optional expiration time. Can be {@literal null}.
 	 * @return {@literal null} if the value has been written, the value stored for the key if it already exists.
 	 */
-	@Nullable
-	byte[] putIfAbsent(String name, byte[] key, byte[] value, @Nullable Duration ttl);
+	byte @Nullable[] putIfAbsent(String name, byte[] key, byte[] value, @Nullable Duration ttl);
 
 	/**
 	 * Remove the given key from Redis.

src/main/java/org/springframework/data/redis/cache/package-info.java

@@ -3,6 +3,5 @@
  * <a href="https://docs.spring.io/spring/docs/current/spring-framework-reference/integration.html#cache">cache
  * abstraction</a>.
  */
-@org.springframework.lang.NonNullApi
-@org.springframework.lang.NonNullFields
+@org.jspecify.annotations.NullMarked
 package org.springframework.data.redis.cache;

src/main/java/org/springframework/data/redis/config/package-info.java

@@ -1,6 +1,5 @@
 /**
  * Namespace and configuration.
  */
-@org.springframework.lang.NonNullApi
-@org.springframework.lang.NonNullFields
+@org.jspecify.annotations.NullMarked
 package org.springframework.data.redis.config;

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

@@ -21,11 +21,10 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
+import org.jspecify.annotations.Nullable;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.dao.InvalidDataAccessResourceUsageException;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**

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

@@ -21,8 +21,8 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.redis.connection.BitFieldSubCommands.BitFieldSubCommand;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
@@ -809,8 +809,7 @@ public long getValue() {
 		 *
 		 * @return can be {@literal null}.
 		 */
-		@Nullable
-		public Overflow getOverflow() {
+		public @Nullable Overflow getOverflow() {
 			return overflow;
 		}
 

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

@@ -24,6 +24,7 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.core.task.AsyncTaskExecutor;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
@@ -34,7 +35,6 @@
 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.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
@@ -332,8 +332,7 @@ private ClusterTopology getClusterTopology() {
 		return this.topologyProvider.getTopology();
 	}
 
-	@Nullable
-	private DataAccessException convertToDataAccessException(Exception cause) {
+	private @Nullable DataAccessException convertToDataAccessException(Exception cause) {
 		return this.exceptionTranslationStrategy.translate(cause);
 	}
 
@@ -484,8 +483,7 @@ public byte[] getKey() {
 		 *
 		 * @return can be {@literal null}.
 		 */
-		@Nullable
-		public T getValue() {
+		public @Nullable T getValue() {
 			return this.value;
 		}
 
@@ -497,8 +495,7 @@ public T getValue() {
 		 * @return the mapped value.
 		 * @since 2.1
 		 */
-		@Nullable
-		public <U> U mapValue(Function<? super T, ? extends U> mapper) {
+		public <U> @Nullable U mapValue(Function<? super T, ? extends U> mapper) {
 
 			Assert.notNull(mapper, "Mapper function must not be null");
 
@@ -601,8 +598,7 @@ public List<T> resultsAsListSortBy(byte[]... keys) {
 		 * @param returnValue can be {@literal null}.
 		 * @return can be {@literal null}.
 		 */
-		@Nullable
-		public T getFirstNonNullNotEmptyOrDefault(@Nullable T returnValue) {
+		public @Nullable T getFirstNonNullNotEmptyOrDefault(@Nullable T returnValue) {
 
 			for (NodeResult<T> nodeResult : nodeResults) {
 				if (nodeResult.getValue() != null) {