Polishing.

Add missing property editors to inject requested operations.

See #2828

Author: mp911de

src/main/java/org/springframework/data/redis/core/ClusterOperationsEditor.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2016-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.redis.core;
+
+import java.beans.PropertyEditorSupport;
+
+/**
+ * PropertyEditor allowing for easy injection of {@link ClusterOperations} from {@link RedisOperations}.
+ *
+ * @author Mark Paluch
+ */
+class ClusterOperationsEditor extends PropertyEditorSupport {
+
+	public void setValue(Object value) {
+
+		if (value instanceof RedisOperations<?, ?> redisOperations) {
+			super.setValue(redisOperations.opsForCluster());
+		} else {
+			throw new IllegalArgumentException("Editor supports only conversion of type " + RedisOperations.class);
+		}
+	}
+}

src/main/java/org/springframework/data/redis/core/HyperLogLogOperationsEditor.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2016-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.redis.core;
+
+import java.beans.PropertyEditorSupport;
+
+/**
+ * PropertyEditor allowing for easy injection of {@link HyperLogLogOperations} from {@link RedisOperations}.
+ *
+ * @author Mark Paluch
+ */
+class HyperLogLogOperationsEditor extends PropertyEditorSupport {
+
+	public void setValue(Object value) {
+
+		if (value instanceof RedisOperations<?, ?> redisOperations) {
+			super.setValue(redisOperations.opsForHyperLogLog());
+		} else {
+			throw new IllegalArgumentException("Editor supports only conversion of type " + RedisOperations.class);
+		}
+	}
+}

src/main/java/org/springframework/data/redis/core/StreamOperationsEditor.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2016-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.redis.core;
+
+import java.beans.PropertyEditorSupport;
+
+/**
+ * PropertyEditor allowing for easy injection of {@link StreamOperations} from {@link RedisOperations}.
+ *
+ * @author Mark Paluch
+ */
+class StreamOperationsEditor extends PropertyEditorSupport {
+
+	public void setValue(Object value) {
+
+		if (value instanceof RedisOperations<?, ?> redisOperations) {
+			super.setValue(redisOperations.opsForStream());
+		} else {
+			throw new IllegalArgumentException("Editor supports only conversion of type " + RedisOperations.class);
+		}
+	}
+}

src/test/java/org/springframework/data/redis/config/NamespaceIntegrationTests.java

@@ -17,10 +17,15 @@
 
 import static org.assertj.core.api.Assertions.*;
 
+import jakarta.annotation.Resource;
+
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.HashOperations;
+import org.springframework.data.redis.core.StreamOperations;
 import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.data.redis.listener.RedisMessageListenerContainer;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 

src/test/java/org/springframework/data/redis/config/PropertyEditorSupportIntegrationTests.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.redis.config;
+
+import static org.assertj.core.api.Assertions.*;
+
+import jakarta.annotation.Resource;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.data.redis.core.ClusterOperations;
+import org.springframework.data.redis.core.GeoOperations;
+import org.springframework.data.redis.core.HashOperations;
+import org.springframework.data.redis.core.HyperLogLogOperations;
+import org.springframework.data.redis.core.SetOperations;
+import org.springframework.data.redis.core.StreamOperations;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.data.redis.core.ZSetOperations;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+/**
+ * Integration tests to obtain various template resources through {@code @Resource} injection.
+ *
+ * @author Mark Paluch
+ */
+@SpringJUnitConfig(locations = "namespace.xml")
+class PropertyEditorSupportIntegrationTests {
+
+	@Resource(name = "redisTemplate") ClusterOperations<String, String> cluster;
+	@Resource(name = "redisTemplate") GeoOperations<String, String> geo;
+	@Resource(name = "redisTemplate") HashOperations<String, String, String> hash;
+	@Resource(name = "redisTemplate") HyperLogLogOperations<String, String> hll;
+	@Resource(name = "redisTemplate") SetOperations<String, String> set;
+	@Resource(name = "redisTemplate") StreamOperations<String, String, String> stream;
+	@Resource(name = "redisTemplate") ValueOperations<String, String> value;
+	@Resource(name = "redisTemplate") ZSetOperations<String, String> zSet;
+
+	@Test // GH-2828, GH-2825
+	void shouldInjectResources() {
+
+		assertThat(cluster).isNotNull();
+		assertThat(geo).isNotNull();
+		assertThat(hash).isNotNull();
+		assertThat(hll).isNotNull();
+		assertThat(set).isNotNull();
+		assertThat(stream).isNotNull();
+		assertThat(value).isNotNull();
+		assertThat(zSet).isNotNull();
+	}
+}