Polishing.

Fix inconsistencies, bugs, documentation, move types around, make specs immutable.
Fix DataType literal. Refine exception guards. Enable CI for Valkey (bare, without JSON).

Remove StringRedisJsonTemplate for now, update docs, introduce fluent delete/unlink API for key removal.

See #3390

Author: mp911de

src/main/antora/modules/ROOT/pages/redis/template.adoc

@@ -8,6 +8,9 @@ While `[Reactive]RedisConnection` offers low-level methods that accept and retur
 
 The javadoc:org.springframework.data.redis.core.RedisTemplate[] class implements the javadoc:org.springframework.data.redis.core.RedisOperations[]  interface and its reactive variant javadoc:org.springframework.data.redis.core.ReactiveRedisTemplate[] implements javadoc:org.springframework.data.redis.core.ReactiveRedisOperations[].
 
+To use https://redis.io/json/[Redis JSON], use javadoc:org.springframework.data.redis.core.RedisJsonTemplate[].
+You can use Redis JSON (being an additional module) through a separate entry point featuring a fluent API that is different from the existing `RedisTemplate` approach.
+
 NOTE: The preferred way to reference operations on a `[Reactive]RedisTemplate` instance is through the
 `[Reactive]RedisOperations` interface.
 
@@ -48,6 +51,9 @@ Imperative::
 |javadoc:org.springframework.data.redis.core.ZSetOperations[]
 |Redis zset (or sorted set) operations
 
+|javadoc:org.springframework.data.redis.core.RedisJsonOperations[]
+|Redis JSON operations
+
 2+^|_Key Bound Operations_
 
 |javadoc:org.springframework.data.redis.core.BoundGeoOperations[]

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

@@ -111,7 +111,8 @@ public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader)
 						TypeReference.of(ReactiveClusterHyperLogLogCommands.class), TypeReference.of(ReactiveRedisOperations.class),
 						TypeReference.of(ReactiveRedisConnectionFactory.class), TypeReference.of(ReactiveRedisTemplate.class),
 						TypeReference.of(RedisOperations.class), TypeReference.of(RedisTemplate.class),
-						TypeReference.of(StringRedisTemplate.class), TypeReference.of(KeyspaceConfiguration.class),
+						TypeReference.of(StringRedisTemplate.class), TypeReference.of(RedisJsonTemplate.class),
+						TypeReference.of(StringRedisJsonTemplate.class), TypeReference.of(KeyspaceConfiguration.class),
 						TypeReference.of(MappingConfiguration.class), TypeReference.of(MappingRedisConverter.class),
 						TypeReference.of(RedisConverter.class), TypeReference.of(RedisCustomConversions.class),
 						TypeReference.of(ReferenceResolver.class), TypeReference.of(ReferenceResolverImpl.class),
@@ -133,7 +134,6 @@ public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader)
 						TypeReference.of("org.springframework.data.redis.core.DefaultStreamOperations"),
 						TypeReference.of("org.springframework.data.redis.core.DefaultValueOperations"),
 						TypeReference.of("org.springframework.data.redis.core.DefaultZSetOperations"),
-						TypeReference.of("org.springframework.data.redis.core.DefaultJsonOperations"),
 
 						TypeReference.of(RedisKeyValueAdapter.class), TypeReference.of(RedisKeyValueTemplate.class),
 

src/main/java/org/springframework/data/redis/config/RedisListenerEndpointRegistrar.java

@@ -73,7 +73,7 @@ public void setEndpointRegistry(@Nullable RedisListenerEndpointRegistry endpoint
 	}
 
 	/**
-	 * Return the {@link RedisListenerEndpointRegistry} instance for this registrar, may be {@code null}.
+	 * Return the {@link RedisListenerEndpointRegistry} instance for this registrar, may be {@literal null}.
 	 */
 	public @Nullable RedisListenerEndpointRegistry getEndpointRegistry() {
 		return this.endpointRegistry;

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

@@ -29,14 +29,16 @@
 public enum DataType {
 
 	NONE("none"), STRING("string"), LIST("list"), SET("set"), ZSET("zset"), HASH("hash"),
+
 	/**
 	 * @since 2.2
 	 */
 	STREAM("stream"),
+
 	/**
 	 * @since 4.2
 	 */
-	JSON("json");
+	JSON("ReJSON-RL");
 
 	private static final Map<String, DataType> codeLookup = new ConcurrentHashMap<>(7);
 
@@ -75,4 +77,5 @@ public static DataType fromCode(String code) {
 		}
 		return data;
 	}
+
 }

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

@@ -209,6 +209,11 @@ public RedisHyperLogLogCommands hyperLogLogCommands() {
 		return this;
 	}
 
+	@Override
+	public RedisJsonCommands jsonCommands() {
+		return delegate.jsonCommands();
+	}
+
 	@Override
 	public RedisKeyCommands keyCommands() {
 		return this;
@@ -249,11 +254,6 @@ public RedisZSetCommands zSetCommands() {
 		return this;
 	}
 
-	@Override
-	public RedisJsonCommands jsonCommands() {
-		return delegate.jsonCommands();
-	}
-
 	@Override
 	public Long append(byte[] key, byte[] value) {
 		return convertAndReturn(delegate.append(key, value), Converters.identityConverter());

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

@@ -32,6 +32,8 @@
 import org.springframework.data.geo.Metric;
 import org.springframework.data.geo.Point;
 import org.springframework.data.redis.connection.json.JsonPath;
+import org.springframework.data.redis.connection.json.JsonSetCondition;
+import org.springframework.data.redis.connection.json.JsonType;
 import org.springframework.data.redis.connection.json.JsonValue;
 import org.springframework.data.redis.connection.stream.ByteRecord;
 import org.springframework.data.redis.connection.stream.Consumer;

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

@@ -26,10 +26,10 @@
  * @author Mark Paluch
  */
 @NullUnmarked
-public interface RedisCommands extends RedisKeyCommands, RedisStringCommands, RedisListCommands, RedisSetCommands,
+public interface RedisCommands
+		extends RedisKeyCommands, RedisJsonCommands, RedisStringCommands, RedisListCommands, RedisSetCommands,
 		RedisZSetCommands, RedisHashCommands, RedisTxCommands, RedisPubSubCommands, RedisConnectionCommands,
-		RedisServerCommands, RedisStreamCommands, RedisScriptingCommands, RedisGeoCommands, RedisHyperLogLogCommands,
-		RedisJsonCommands {
+		RedisServerCommands, RedisStreamCommands, RedisScriptingCommands, RedisGeoCommands, RedisHyperLogLogCommands {
 
 	/**
 	 * {@literal Native} or {@literal raw} execution of the given Redis command along with the given arguments.

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

@@ -55,6 +55,14 @@ public interface RedisCommandsProvider {
 	 */
 	RedisHyperLogLogCommands hyperLogLogCommands();
 
+	/**
+	 * Get {@link RedisJsonCommands}.
+	 *
+	 * @return never {@literal null}.
+	 * @since 4.2
+	 */
+	RedisJsonCommands jsonCommands();
+
 	/**
 	 * Get {@link RedisKeyCommands}.
 	 *
@@ -119,12 +127,4 @@ public interface RedisCommandsProvider {
 	 */
 	RedisZSetCommands zSetCommands();
 
-	/**
-	 * Get {@link RedisJsonCommands}.
-	 *
-	 * @return never {@literal null}.
-	 * @since 4.2
-	 */
-	RedisJsonCommands jsonCommands();
-
 }