diff --git a/src/main/java/org/springframework/data/redis/cache/DefaultRedisCacheWriter.java b/src/main/java/org/springframework/data/redis/cache/DefaultRedisCacheWriter.java
index e541e2885..f1e9cce0b 100644
--- a/src/main/java/org/springframework/data/redis/cache/DefaultRedisCacheWriter.java
+++ b/src/main/java/org/springframework/data/redis/cache/DefaultRedisCacheWriter.java
@@ -427,7 +427,7 @@ class DefaultRedisCacheWriter implements RedisCacheWriter {
 		 * @param name the cache name from which to retrieve the cache entry.
 		 * @param key the cache entry key.
 		 * @param ttl optional TTL to set for Time-to-Idle eviction.
-		 * @return a future that completes either with a value if the value exists or completing with {@code null} if the
+		 * @return a future that completes either with a value if the value exists or completing with {@literal null} if the
 		 *         cache does not contain an entry.
 		 */
 		CompletableFuture<byte[]> retrieve(String name, byte[] key, @Nullable Duration ttl);
diff --git a/src/main/java/org/springframework/data/redis/cache/RedisCacheWriter.java b/src/main/java/org/springframework/data/redis/cache/RedisCacheWriter.java
index 04dd0e350..1db4ed8e3 100644
--- a/src/main/java/org/springframework/data/redis/cache/RedisCacheWriter.java
+++ b/src/main/java/org/springframework/data/redis/cache/RedisCacheWriter.java
@@ -293,7 +293,7 @@ public interface RedisCacheWriter extends CacheStatisticsProvider {
 		 * persistent value that does not expire.
 		 *
 		 * @param key the cache key.
-		 * @param value the cache value. Can be {@code null} if the cache supports {@code null} value caching.
+		 * @param value the cache value. Can be {@literal null} if the cache supports {@literal null} value caching.
 		 * @return the computed {@link Duration time-to-live (TTL)}. Can be {@link Duration#ZERO} for persistent values
 		 *         (i.e. cache entry does not expire).
 		 */
diff --git a/src/main/java/org/springframework/data/redis/connection/ReactiveHashCommands.java b/src/main/java/org/springframework/data/redis/connection/ReactiveHashCommands.java
index 063dd6e28..d75c2242a 100644
--- a/src/main/java/org/springframework/data/redis/connection/ReactiveHashCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/ReactiveHashCommands.java
@@ -289,7 +289,7 @@ public interface ReactiveHashCommands {
 
 	/**
 	 * Get values for given {@literal fields} from hash at {@literal key}. Values are in the order of the requested keys.
-	 * Absent field values are represented using {@code null} in the resulting {@link List}.
+	 * Absent field values are represented using {@literal null} in the resulting {@link List}.
 	 *
 	 * @param key must not be {@literal null}.
 	 * @param fields must not be {@literal null}.
@@ -306,7 +306,7 @@ public interface ReactiveHashCommands {
 
 	/**
 	 * Get values for given {@literal fields} from hash at {@literal key}. Values are in the order of the requested keys.
-	 * Absent field values are represented using {@code null} in the resulting {@link List}.
+	 * Absent field values are represented using {@literal null} in the resulting {@link List}.
 	 *
 	 * @param commands must not be {@literal null}.
 	 * @return
diff --git a/src/main/java/org/springframework/data/redis/connection/ReactiveStringCommands.java b/src/main/java/org/springframework/data/redis/connection/ReactiveStringCommands.java
index 493b055da..f6d18dbcf 100644
--- a/src/main/java/org/springframework/data/redis/connection/ReactiveStringCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/ReactiveStringCommands.java
@@ -350,7 +350,7 @@ public interface ReactiveStringCommands {
 
 	/**
 	 * Get multiple values in one batch. Values are in the order of the requested keys. Absent field values are
-	 * represented using {@code null} in the resulting {@link List}.
+	 * represented using {@literal null} in the resulting {@link List}.
 	 *
 	 * @param keys must not be {@literal null}.
 	 * @return
@@ -365,7 +365,7 @@ public interface ReactiveStringCommands {
 
 	/**
 	 * Get multiple values at for {@literal keysets} in batches. Values are in the order of the requested keys. Absent
-	 * field values are represented using {@code null} in the resulting {@link List}.
+	 * field values are represented using {@literal null} in the resulting {@link List}.
 	 *
 	 * @param keysets must not be {@literal null}.
 	 * @return
diff --git a/src/main/java/org/springframework/data/redis/connection/RedisHashCommands.java b/src/main/java/org/springframework/data/redis/connection/RedisHashCommands.java
index 8642fc837..d1587a791 100644
--- a/src/main/java/org/springframework/data/redis/connection/RedisHashCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/RedisHashCommands.java
@@ -69,7 +69,7 @@ public interface RedisHashCommands {
 
 	/**
 	 * Get values for given {@code fields} from hash at {@code key}. Values are in the order of the requested keys Absent
-	 * field values are represented using {@code null} in the resulting {@link List}.
+	 * field values are represented using {@literal null} in the resulting {@link List}.
 	 *
 	 * @param key must not be {@literal null}.
 	 * @param fields must not be {@literal empty}.
diff --git a/src/main/java/org/springframework/data/redis/connection/RedisStringCommands.java b/src/main/java/org/springframework/data/redis/connection/RedisStringCommands.java
index beac67398..fe2abfce8 100644
--- a/src/main/java/org/springframework/data/redis/connection/RedisStringCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/RedisStringCommands.java
@@ -86,10 +86,10 @@ public interface RedisStringCommands {
 
 	/**
 	 * Get multiple {@code keys}. Values are in the order of the requested keys Absent field values are represented using
-	 * {@code null} in the resulting {@link List}.
+	 * {@literal null} in the resulting {@link List}.
 	 *
 	 * @param keys must not be {@literal null}.
-	 * @return {@code null} when used in pipeline / transaction.
+	 * @return {@literal null} when used in pipeline / transaction.
 	 * @see <a href="https://redis.io/commands/mget">Redis Documentation: MGET</a>
 	 */
 	@Nullable
diff --git a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceFutureUtils.java b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceFutureUtils.java
index f1f56e1b5..764f6e7ff 100644
--- a/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceFutureUtils.java
+++ b/src/main/java/org/springframework/data/redis/connection/lettuce/LettuceFutureUtils.java
@@ -87,8 +87,8 @@ class LettuceFutureUtils {
 
 	/**
 	 * Returns a {@link Function} that ignores {@link CompletionStage#exceptionally(Function) exceptional completion} by
-	 * recovering to {@code null}. This allows to progress with a previously failed {@link CompletionStage} without regard
-	 * to the actual success/exception state.
+	 * recovering to {@literal null}. This allows to progress with a previously failed {@link CompletionStage} without
+	 * regard to the actual success/exception state.
 	 *
 	 * @return
 	 */
diff --git a/src/main/java/org/springframework/data/redis/core/BoundHashOperations.java b/src/main/java/org/springframework/data/redis/core/BoundHashOperations.java
index b7c30dc1b..90e77b9ae 100644
--- a/src/main/java/org/springframework/data/redis/core/BoundHashOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/BoundHashOperations.java
@@ -61,7 +61,7 @@ public interface BoundHashOperations<H, HK, HV> extends BoundKeyOperations<H> {
 
 	/**
 	 * Get values for given {@code keys} from the hash at the bound key. Values are in the order of the requested keys
-	 * Absent field values are represented using {@code null} in the resulting {@link List}.
+	 * Absent field values are represented using {@literal null} in the resulting {@link List}.
 	 *
 	 * @param keys must not be {@literal null}.
 	 * @return {@literal null} when used in pipeline / transaction.
diff --git a/src/main/java/org/springframework/data/redis/core/HashOperations.java b/src/main/java/org/springframework/data/redis/core/HashOperations.java
index 8e98e49f9..db97cdb10 100644
--- a/src/main/java/org/springframework/data/redis/core/HashOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/HashOperations.java
@@ -61,7 +61,7 @@ public interface HashOperations<H, HK, HV> {
 
 	/**
 	 * Get values for given {@code hashKeys} from hash at {@code key}. Values are in the order of the requested keys
-	 * Absent field values are represented using {@code null} in the resulting {@link List}.
+	 * Absent field values are represented using {@literal null} in the resulting {@link List}.
 	 *
 	 * @param key must not be {@literal null}.
 	 * @param hashKeys must not be {@literal null}.
diff --git a/src/main/java/org/springframework/data/redis/core/ReactiveHashOperations.java b/src/main/java/org/springframework/data/redis/core/ReactiveHashOperations.java
index 0f2950654..8e611e359 100644
--- a/src/main/java/org/springframework/data/redis/core/ReactiveHashOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/ReactiveHashOperations.java
@@ -28,8 +28,8 @@ import java.util.Map;
  * <p>
  * Streams of methods returning {@code Mono<K>} or {@code Flux<M>} are terminated with
  * {@link org.springframework.dao.InvalidDataAccessApiUsageException} when
- * {@link org.springframework.data.redis.serializer.RedisElementReader#read(ByteBuffer)} returns {@code null} for a
- * particular element as Reactive Streams prohibit the usage of {@code null} values.
+ * {@link org.springframework.data.redis.serializer.RedisElementReader#read(ByteBuffer)} returns {@literal null} for a
+ * particular element as Reactive Streams prohibit the usage of {@literal null} values.
  *
  * @author Mark Paluch
  * @author Christoph Strobl
@@ -66,7 +66,7 @@ public interface ReactiveHashOperations<H, HK, HV> {
 
 	/**
 	 * Get values for given {@code hashKeys} from hash at {@code key}. Values are in the order of the requested keys.
-	 * Absent field values are represented using {@code null} in the resulting {@link List}.
+	 * Absent field values are represented using {@literal null} in the resulting {@link List}.
 	 *
 	 * @param key must not be {@literal null}.
 	 * @param hashKeys must not be {@literal null}.
diff --git a/src/main/java/org/springframework/data/redis/core/ReactiveListOperations.java b/src/main/java/org/springframework/data/redis/core/ReactiveListOperations.java
index 6df9f39de..91e019b18 100644
--- a/src/main/java/org/springframework/data/redis/core/ReactiveListOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/ReactiveListOperations.java
@@ -33,8 +33,8 @@ import org.springframework.util.Assert;
  * <p>
  * Streams of methods returning {@code Mono<K>} or {@code Flux<M>} are terminated with
  * {@link org.springframework.dao.InvalidDataAccessApiUsageException} when
- * {@link org.springframework.data.redis.serializer.RedisElementReader#read(ByteBuffer)} returns {@code null} for a
- * particular element as Reactive Streams prohibit the usage of {@code null} values.
+ * {@link org.springframework.data.redis.serializer.RedisElementReader#read(ByteBuffer)} returns {@literal null} for a
+ * particular element as Reactive Streams prohibit the usage of {@literal null} values.
  *
  * @author Mark Paluch
  * @author Christoph Strobl
diff --git a/src/main/java/org/springframework/data/redis/core/ReactiveRedisOperations.java b/src/main/java/org/springframework/data/redis/core/ReactiveRedisOperations.java
index c02d1eea8..59221b4fe 100644
--- a/src/main/java/org/springframework/data/redis/core/ReactiveRedisOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/ReactiveRedisOperations.java
@@ -45,8 +45,8 @@ import org.springframework.util.Assert;
  * <p>
  * Streams of methods returning {@code Mono<K>} or {@code Flux<M>} are terminated with
  * {@link org.springframework.dao.InvalidDataAccessApiUsageException} when
- * {@link org.springframework.data.redis.serializer.RedisElementReader#read(ByteBuffer)} returns {@code null} for a
- * particular element as Reactive Streams prohibit the usage of {@code null} values.
+ * {@link org.springframework.data.redis.serializer.RedisElementReader#read(ByteBuffer)} returns {@literal null} for a
+ * particular element as Reactive Streams prohibit the usage of {@literal null} values.
  *
  * @author Mark Paluch
  * @author Christoph Strobl
diff --git a/src/main/java/org/springframework/data/redis/core/ReactiveRedisTemplate.java b/src/main/java/org/springframework/data/redis/core/ReactiveRedisTemplate.java
index 7816a744a..6e52ef0e7 100644
--- a/src/main/java/org/springframework/data/redis/core/ReactiveRedisTemplate.java
+++ b/src/main/java/org/springframework/data/redis/core/ReactiveRedisTemplate.java
@@ -58,8 +58,8 @@ import org.springframework.util.ClassUtils;
  * <p>
  * Streams of methods returning {@code Mono<K>} or {@code Flux<M>} are terminated with
  * {@link org.springframework.dao.InvalidDataAccessApiUsageException} when
- * {@link org.springframework.data.redis.serializer.RedisElementReader#read(ByteBuffer)} returns {@code null} for a
- * particular element as Reactive Streams prohibit the usage of {@code null} values.
+ * {@link org.springframework.data.redis.serializer.RedisElementReader#read(ByteBuffer)} returns {@literal null} for a
+ * particular element as Reactive Streams prohibit the usage of {@literal null} values.
  *
  * @author Mark Paluch
  * @author Christoph Strobl
diff --git a/src/main/java/org/springframework/data/redis/core/ReactiveSetOperations.java b/src/main/java/org/springframework/data/redis/core/ReactiveSetOperations.java
index eb9e55e43..f9d8ce784 100644
--- a/src/main/java/org/springframework/data/redis/core/ReactiveSetOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/ReactiveSetOperations.java
@@ -27,8 +27,8 @@ import java.util.Map;
  * <p>
  * Streams of methods returning {@code Mono<K>} or {@code Flux<M>} are terminated with
  * {@link org.springframework.dao.InvalidDataAccessApiUsageException} when
- * {@link org.springframework.data.redis.serializer.RedisElementReader#read(ByteBuffer)} returns {@code null} for a
- * particular element as Reactive Streams prohibit the usage of {@code null} values.
+ * {@link org.springframework.data.redis.serializer.RedisElementReader#read(ByteBuffer)} returns {@literal null} for a
+ * particular element as Reactive Streams prohibit the usage of {@literal null} values.
  *
  * @author Mark Paluch
  * @author Christoph Strobl
diff --git a/src/main/java/org/springframework/data/redis/core/ReactiveValueOperations.java b/src/main/java/org/springframework/data/redis/core/ReactiveValueOperations.java
index 2a0f44404..d1ded81ea 100644
--- a/src/main/java/org/springframework/data/redis/core/ReactiveValueOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/ReactiveValueOperations.java
@@ -30,8 +30,8 @@ import org.springframework.data.redis.connection.BitFieldSubCommands;
  * <p>
  * Streams of methods returning {@code Mono<K>} or {@code Flux<M>} are terminated with
  * {@link org.springframework.dao.InvalidDataAccessApiUsageException} when
- * {@link org.springframework.data.redis.serializer.RedisElementReader#read(ByteBuffer)} returns {@code null} for a
- * particular element as Reactive Streams prohibit the usage of {@code null} values.
+ * {@link org.springframework.data.redis.serializer.RedisElementReader#read(ByteBuffer)} returns {@literal null} for a
+ * particular element as Reactive Streams prohibit the usage of {@literal null} values.
  *
  * @author Mark Paluch
  * @author Jiahe Cai
@@ -162,7 +162,7 @@ public interface ReactiveValueOperations<K, V> {
 
 	/**
 	 * Get multiple {@code keys}. Values are in the order of the requested keys. Absent field values are represented using
-	 * {@code null} in the resulting {@link List}.
+	 * {@literal null} in the resulting {@link List}.
 	 *
 	 * @param keys must not be {@literal null}.
 	 * @see <a href="https://redis.io/commands/mget">Redis Documentation: MGET</a>
diff --git a/src/main/java/org/springframework/data/redis/core/ReactiveZSetOperations.java b/src/main/java/org/springframework/data/redis/core/ReactiveZSetOperations.java
index 552f008c2..1e77a2b1b 100644
--- a/src/main/java/org/springframework/data/redis/core/ReactiveZSetOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/ReactiveZSetOperations.java
@@ -37,8 +37,8 @@ import org.springframework.lang.Nullable;
  * <p>
  * Streams of methods returning {@code Mono<K>} or {@code Flux<M>} are terminated with
  * {@link org.springframework.dao.InvalidDataAccessApiUsageException} when
- * {@link org.springframework.data.redis.serializer.RedisElementReader#read(ByteBuffer)} returns {@code null} for a
- * particular element as Reactive Streams prohibit the usage of {@code null} values.
+ * {@link org.springframework.data.redis.serializer.RedisElementReader#read(ByteBuffer)} returns {@literal null} for a
+ * particular element as Reactive Streams prohibit the usage of {@literal null} values.
  *
  * @author Mark Paluch
  * @author Christoph Strobl
diff --git a/src/main/java/org/springframework/data/redis/core/RedisCallback.java b/src/main/java/org/springframework/data/redis/core/RedisCallback.java
index 0c40d0702..b506d6875 100644
--- a/src/main/java/org/springframework/data/redis/core/RedisCallback.java
+++ b/src/main/java/org/springframework/data/redis/core/RedisCallback.java
@@ -32,13 +32,13 @@ public interface RedisCallback<T> {
 	/**
 	 * Method called by {@link RedisTemplate} with an active {@link RedisConnection}.
 	 * <p>
-	 * Callback code need not care about activating/opening or closing the {@link RedisConnection},
-	 * nor handling {@link Exception exceptions}.
+	 * Callback code need not care about activating/opening or closing the {@link RedisConnection}, nor handling
+	 * {@link Exception exceptions}.
 	 *
 	 * @param connection active {@link RedisConnection Redis connection}.
-	 * @return the {@link Object result} of the operation performed in the callback or {@code null}.
+	 * @return the {@link Object result} of the operation performed in the callback or {@literal null}.
 	 * @throws DataAccessException if the operation performed by the callback fails to execute in the context of Redis
-	 * using the given {@link RedisConnection}.
+	 *           using the given {@link RedisConnection}.
 	 */
 	@Nullable
 	T doInRedis(RedisConnection connection) throws DataAccessException;
diff --git a/src/main/java/org/springframework/data/redis/core/RedisConnectionUtils.java b/src/main/java/org/springframework/data/redis/core/RedisConnectionUtils.java
index 767343557..3996f3c98 100644
--- a/src/main/java/org/springframework/data/redis/core/RedisConnectionUtils.java
+++ b/src/main/java/org/springframework/data/redis/core/RedisConnectionUtils.java
@@ -587,7 +587,7 @@ public abstract class RedisConnectionUtils {
 		 * Override the existing {@link RedisConnection} handle with the given {@link RedisConnection}. Reset the handle if
 		 * given {@literal null}.
 		 * <p>
-		 * Used for releasing the Connection on suspend (with a {@code null} argument) and setting a fresh Connection on
+		 * Used for releasing the Connection on suspend (with a {@literal null} argument) and setting a fresh Connection on
 		 * resume.
 		 */
 		protected void setConnection(@Nullable RedisConnection connection) {
diff --git a/src/main/java/org/springframework/data/redis/core/ScanCursor.java b/src/main/java/org/springframework/data/redis/core/ScanCursor.java
index 8c94ff726..2037cbfb4 100644
--- a/src/main/java/org/springframework/data/redis/core/ScanCursor.java
+++ b/src/main/java/org/springframework/data/redis/core/ScanCursor.java
@@ -86,7 +86,7 @@ public abstract class ScanCursor<T> implements Cursor<T> {
 	 * Crates new {@link ScanCursor}
 	 *
 	 * @param cursorId the cursor Id.
-	 * @param options Defaulted to {@link ScanOptions#NONE} if {@code null}.
+	 * @param options Defaulted to {@link ScanOptions#NONE} if {@literal null}.
 	 * @deprecated since 3.3.0 - Use {@link ScanCursor#ScanCursor(CursorId, ScanOptions)} instead.
 	 */
 	@Deprecated(since = "3.3.0")
@@ -125,7 +125,7 @@ public abstract class ScanCursor<T> implements Cursor<T> {
 
 	/**
 	 * Performs the actual scan command using the native client implementation. The given {@literal options} are never
-	 * {@code null}.
+	 * {@literal null}.
 	 *
 	 * @param cursorId
 	 * @param options
diff --git a/src/main/java/org/springframework/data/redis/core/ValueOperations.java b/src/main/java/org/springframework/data/redis/core/ValueOperations.java
index 546a83f8f..260bc7c4c 100644
--- a/src/main/java/org/springframework/data/redis/core/ValueOperations.java
+++ b/src/main/java/org/springframework/data/redis/core/ValueOperations.java
@@ -264,7 +264,7 @@ public interface ValueOperations<K, V> {
 
 	/**
 	 * Get multiple {@code keys}. Values are in the order of the requested keys Absent field values are represented using
-	 * {@code null} in the resulting {@link List}.
+	 * {@literal null} in the resulting {@link List}.
 	 *
 	 * @param keys must not be {@literal null}.
 	 * @return {@literal null} when used in pipeline / transaction.
diff --git a/src/main/java/org/springframework/data/redis/core/convert/Bucket.java b/src/main/java/org/springframework/data/redis/core/convert/Bucket.java
index 3599e8b5e..01be61b6e 100644
--- a/src/main/java/org/springframework/data/redis/core/convert/Bucket.java
+++ b/src/main/java/org/springframework/data/redis/core/convert/Bucket.java
@@ -108,10 +108,10 @@ public class Bucket {
 	}
 
 	/**
-	 * Return whether {@code path} is associated with a non-{@code null} value.
+	 * Return whether {@code path} is associated with a non-{@literal null} value.
 	 *
 	 * @param path must not be {@literal null} or {@link String#isEmpty()}.
-	 * @return {@literal true} if the {@code path} is associated with a non-{@code null} value.
+	 * @return {@literal true} if the {@code path} is associated with a non-{@literal null} value.
 	 * @since 2.5
 	 */
 	public boolean hasValue(String path) {
diff --git a/src/test/java/org/springframework/data/redis/test/condition/RedisConditions.java b/src/test/java/org/springframework/data/redis/test/condition/RedisConditions.java
index 26c5d1d29..003ade86c 100644
--- a/src/test/java/org/springframework/data/redis/test/condition/RedisConditions.java
+++ b/src/test/java/org/springframework/data/redis/test/condition/RedisConditions.java
@@ -65,7 +65,7 @@ class RedisConditions {
 	/**
 	 * Create {@link RedisCommands} given {@link StatefulRedisConnection}.
 	 *
-	 * @param connection must not be {@code null}.
+	 * @param connection must not be {@literal null}.
 	 * @return
 	 */
 	public static RedisConditions of(StatefulRedisConnection<String, String> connection) {
@@ -75,7 +75,7 @@ class RedisConditions {
 	/**
 	 * Create {@link RedisCommands} given {@link StatefulRedisClusterConnection}.
 	 *
-	 * @param connection must not be {@code null}.
+	 * @param connection must not be {@literal null}.
 	 * @return
 	 */
 	public static RedisConditions of(StatefulRedisClusterConnection<String, String> connection) {
@@ -85,7 +85,7 @@ class RedisConditions {
 	/**
 	 * Create {@link RedisConditions} given {@link RedisCommands}.
 	 *
-	 * @param commands must not be {@code null}.
+	 * @param commands must not be {@literal null}.
 	 * @return
 	 */
 	public static RedisConditions of(RedisClusterCommands<String, String> commands) {