--wip-- [skip ci]

Author: bsbodden

tests/src/test/java/com/redis/om/spring/annotations/hash/Issue322TestContainerBeanCreationTest.java

@@ -0,0 +1,83 @@
+package com.redis.om.spring.annotations.hash;
+
+import com.redis.om.spring.AbstractBaseEnhancedRedisTest;
+import com.redis.om.spring.fixtures.hash.model.Issue322User;
+import com.redis.om.spring.fixtures.hash.repository.Issue322UserRepository;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Test to verify issue #322 is resolved: @EnableRedisEnhancedRepositories creating bean 
+ * with potential ambiguous RedisOperations beans.
+ * 
+ * This test verifies that enhanced repositories work correctly even when multiple 
+ * RedisTemplate beans are present in the application context.
+ */
+@Import(Issue322TestContainerBeanCreationTest.AdditionalRedisConfig.class)
+public class Issue322TestContainerBeanCreationTest extends AbstractBaseEnhancedRedisTest {
+
+    @Autowired
+    private Issue322UserRepository userRepository;
+    
+    @Autowired(required = false)
+    private RedisTemplate<String, String> stringRedisTemplate;
+    
+    @Autowired
+    private RedisTemplate<Object, Object> redisTemplate;
+    
+    @BeforeEach
+    void setup() {
+        userRepository.deleteAll();
+    }
+
+    @Test
+    void testRepositoryBeanCreationWithMultipleRedisTemplates() {
+        // This test verifies that the repository bean is created successfully
+        // even when multiple RedisTemplate beans are available
+        assertThat(userRepository).isNotNull();
+        
+        // Verify that multiple Redis templates can coexist
+        assertThat(stringRedisTemplate).isNotNull();
+        assertThat(redisTemplate).isNotNull();
+        
+        // Test basic repository functionality
+        Issue322User user = new Issue322User();
+        user.setFirstName("TestFirst");
+        user.setLastName("TestLast");
+        user.setEmail("[email protected]");
+        
+        Issue322User savedUser = userRepository.save(user);
+        assertThat(savedUser).isNotNull();
+        assertThat(savedUser.getId()).isNotNull();
+        
+        // Verify we can find the user
+        assertThat(userRepository.findById(savedUser.getId())).isPresent();
+        
+        // Test finding by indexed field
+        assertThat(userRepository.findByEmail("[email protected]")).isPresent();
+    }
+
+    @Configuration
+    static class AdditionalRedisConfig {
+        
+        // Create a secondary RedisTemplate that could potentially cause ambiguity
+        // This simulates the scenario described in issue #322 where multiple
+        // RedisTemplate beans exist
+        @Bean
+        public RedisTemplate<String, String> stringRedisTemplate(RedisConnectionFactory connectionFactory) {
+            RedisTemplate<String, String> template = new RedisTemplate<>();
+            template.setConnectionFactory(connectionFactory);
+            template.afterPropertiesSet();
+            return template;
+        }
+    }
+}

tests/src/test/java/com/redis/om/spring/fixtures/hash/model/Issue322User.java

@@ -0,0 +1,45 @@
+package com.redis.om.spring.fixtures.hash.model;
+
+import com.redis.om.spring.annotations.Indexed;
+import com.redis.om.spring.annotations.Bloom;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.redis.core.RedisHash;
+
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@RequiredArgsConstructor
+@RedisHash
+public class Issue322User {
+    @Id
+    private String id;
+
+    @Indexed
+    @NonNull
+    private String firstName;
+
+    @Indexed
+    private String middleName;
+
+    @Indexed
+    @NonNull
+    private String lastName;
+
+    @NonNull
+    @Indexed
+    @Bloom(name = "bf_user_email_322", capacity = 100000, errorRate = 0.001)
+    private String email;
+
+    @CreatedDate
+    private Date createdDate;
+
+    @LastModifiedDate
+    private Date lastModifiedDate;
+}

tests/src/test/java/com/redis/om/spring/fixtures/hash/repository/Issue322UserRepository.java

@@ -0,0 +1,10 @@
+package com.redis.om.spring.fixtures.hash.repository;
+
+import com.redis.om.spring.fixtures.hash.model.Issue322User;
+import com.redis.om.spring.repository.RedisEnhancedRepository;
+
+import java.util.Optional;
+
+public interface Issue322UserRepository extends RedisEnhancedRepository<Issue322User, String> {
+    Optional<Issue322User> findByEmail(String email);
+}