Add JedisConnectionFactory

Updating Spring boot v3.4.1

Author: ChildrenGreens

README.adoc

@@ -17,7 +17,7 @@ To use Redis multi-data sources, you need to add the Redis Multi Sources Spring
 <dependency>
     <groupId>com.childrengreens</groupId>
     <artifactId>redis-multi-source-spring-boot-starter</artifactId>
-    <version>2.1</version>
+    <version>2.2</version>
 </dependency>
 ----
 Add the following configuration to your properties file.
@@ -121,7 +121,7 @@ To use RabbitMQ multi-data sources, you need to add the AMQP Multi Sources Sprin
 <dependency>
     <groupId>com.childrengreens</groupId>
     <artifactId>amqp-multi-source-spring-boot-starter</artifactId>
-    <version>2.1</version>
+    <version>2.2</version>
 </dependency>
 ----
 Add the following configuration to your properties file.

amqp-multi-source-spring-boot-starter/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.childrengreens</groupId>
         <artifactId>multi-source-spring-boot-starter</artifactId>
-        <version>2.1</version>
+        <version>2.2</version>
     </parent>
 
     <artifactId>amqp-multi-source-spring-boot-starter</artifactId>
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>com.childrengreens</groupId>
             <artifactId>context-multi-source-spring-boot-starter</artifactId>
-            <version>2.1</version>
+            <version>2.2</version>
         </dependency>
     </dependencies>
 </project>

context-multi-source-spring-boot-starter/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.childrengreens</groupId>
         <artifactId>multi-source-spring-boot-starter</artifactId>
-        <version>2.1</version>
+        <version>2.2</version>
     </parent>
 
     <artifactId>context-multi-source-spring-boot-starter</artifactId>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.childrengreens</groupId>
     <artifactId>multi-source-spring-boot-starter</artifactId>
-    <version>2.1</version>
+    <version>2.2</version>
     <packaging>pom</packaging>
 
     <name>Spring Boot Starter for Multi Source</name>
@@ -66,7 +66,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <spring-boot-dependencies.version>3.4.0</spring-boot-dependencies.version>
+        <spring-boot-dependencies.version>3.4.1</spring-boot-dependencies.version>
     </properties>
 
     <dependencyManagement>

redis-multi-source-spring-boot-starter/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.childrengreens</groupId>
         <artifactId>multi-source-spring-boot-starter</artifactId>
-        <version>2.1</version>
+        <version>2.2</version>
     </parent>
 
     <artifactId>redis-multi-source-spring-boot-starter</artifactId>
@@ -37,14 +37,21 @@
         <dependency>
             <groupId>com.childrengreens</groupId>
             <artifactId>context-multi-source-spring-boot-starter</artifactId>
-            <version>2.1</version>
+            <version>2.2</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
             <optional>true</optional>
         </dependency>
+
+
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
 

redis-multi-source-spring-boot-starter/src/main/java/com/childrengreens/multi/source/LettuceConnectionMultiSourcesRegistrar.java renamed to redis-multi-source-spring-boot-starter/src/main/java/com/childrengreens/multi/source/RedisConnectionMultiSourcesRegistrar.java

@@ -19,34 +19,39 @@
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.boot.autoconfigure.data.redis.LettuceClientConfigurationBuilderCustomizer;
-import org.springframework.boot.autoconfigure.data.redis.LettuceClientOptionsBuilderCustomizer;
-import org.springframework.boot.autoconfigure.data.redis.RedisConnectionDetails;
-import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
+import org.springframework.boot.autoconfigure.data.redis.*;
 import org.springframework.boot.ssl.SslBundles;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
 import org.springframework.data.redis.connection.RedisClusterConfiguration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.connection.RedisSentinelConfiguration;
 import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
 import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
 import org.springframework.util.ClassUtils;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Objects;
 
 /**
- * Dynamically create multiple {@link RedisConnectionDetails} and {@link LettuceConnectionFactory} based on Environment.
+ * Dynamically create multiple {@link RedisConnectionDetails} and {@link LettuceConnectionFactory} or {@link JedisConnectionFactory} based on Environment.
  *
  * @author ChildrenGreens
  */
-public class LettuceConnectionMultiSourcesRegistrar extends AbstractMultiSourcesRegistrar<RedisProperties> {
+public class RedisConnectionMultiSourcesRegistrar extends AbstractMultiSourcesRegistrar<RedisProperties> {
 
 
     private static final String redisConnectionDetailsClassName = "org.springframework.boot.autoconfigure.data.redis.PropertiesRedisConnectionDetails";
 
     private static final String lettuceConnectionConfigurationClassName = "org.springframework.boot.autoconfigure.data.redis.LettuceConnectionConfiguration";
 
+    private static final String jedisConnectionConfigurationClassName = "org.springframework.boot.autoconfigure.data.redis.JedisConnectionConfiguration";
+
+    private static final boolean JEDIS_AVAILABLE = ClassUtils.isPresent("redis.clients.jedis.Jedis", ClassUtils.getDefaultClassLoader());
+
+
     @Override
     void registerBeanDefinitionsForSource(String name, RedisProperties source, BeanDefinitionRegistry registry, Boolean isPrimary) {
 
@@ -59,24 +64,29 @@ void registerBeanDefinitionsForSource(String name, RedisProperties source, BeanD
                     isPrimary,
                     () -> (RedisConnectionDetails) newInstance(redisConnectionDetailsClassName, new Class[]{RedisProperties.class}, source));
 
+            // JedisConnectionFactory or LettuceConnectionFactory
+            boolean isJedisConnectionFactory = Objects.nonNull(source.getClientType())
+                    && source.getClientType() == RedisProperties.ClientType.JEDIS
+                    && JEDIS_AVAILABLE;
+            Class<? extends RedisConnectionFactory> redisConnectionFactory = isJedisConnectionFactory ? JedisConnectionFactory.class : LettuceConnectionFactory.class;
 
-            // register LettuceConnectionFactory
+            // register RedisConnectionFactory
             registerBeanDefinition(registry,
-                    LettuceConnectionFactory.class,
-                    generateBeanName(LettuceConnectionFactory.class, name),
+                    RedisConnectionFactory.class,
+                    generateBeanName(redisConnectionFactory, name),
                     isPrimary,
                     () -> {
-                        // new LettuceConnectionConfiguration
+                        // new JedisConnectionFactory or LettuceConnectionFactory
                         RedisConnectionDetails connectionDetails = beanFactory.getBean(redisConnectionDetailsBeanName, RedisConnectionDetails.class);
                         ObjectProvider<RedisStandaloneConfiguration> standaloneProvider = beanFactory.getBeanProvider(RedisStandaloneConfiguration.class);
                         ObjectProvider<RedisSentinelConfiguration> sentinelProvider = beanFactory.getBeanProvider(RedisSentinelConfiguration.class);
                         ObjectProvider<RedisClusterConfiguration> clusterProvider = beanFactory.getBeanProvider(RedisClusterConfiguration.class);
                         ObjectProvider<SslBundles> sslBundlesProvider = beanFactory.getBeanProvider(SslBundles.class);
 
                         try {
-                            Class<?> clazz = ClassUtils.forName(lettuceConnectionConfigurationClassName, ClassUtils.getDefaultClassLoader());
+                            String connectionConfigurationClassName = isJedisConnectionFactory ? lettuceConnectionConfigurationClassName : jedisConnectionConfigurationClassName;
+                            Class<?> clazz = ClassUtils.forName(connectionConfigurationClassName, ClassUtils.getDefaultClassLoader());
                             Constructor<?> constructor = clazz.getDeclaredConstructors()[0];
-                            Method createConnectionFactory = clazz.getDeclaredMethod("createConnectionFactory", ObjectProvider.class, ObjectProvider.class, ClientResources.class);
                             constructor.setAccessible(true);
                             Object configuration = constructor.newInstance(source,
                                     standaloneProvider,
@@ -86,19 +96,33 @@ void registerBeanDefinitionsForSource(String name, RedisProperties source, BeanD
                                     sslBundlesProvider);
 
 
-                            ObjectProvider<LettuceClientConfigurationBuilderCustomizer> clientConfigurationBuilderCustomizers = beanFactory.getBeanProvider(LettuceClientConfigurationBuilderCustomizer.class);
-                            ObjectProvider<LettuceClientOptionsBuilderCustomizer> clientOptionsBuilderCustomizers = beanFactory.getBeanProvider(LettuceClientOptionsBuilderCustomizer.class);
-                            ClientResources clientResources = beanFactory.getBean(ClientResources.class);
-
-                            createConnectionFactory.setAccessible(true);
-                            LettuceConnectionFactory factory = (LettuceConnectionFactory) createConnectionFactory.invoke(configuration, clientConfigurationBuilderCustomizers, clientOptionsBuilderCustomizers, clientResources);
-
-                            if (isVirtualThreads()) {
-                                SimpleAsyncTaskExecutor executor = new SimpleAsyncTaskExecutor("redis-");
-                                executor.setVirtualThreads(true);
-                                factory.setExecutor(executor);
+                            if (isJedisConnectionFactory) {
+                                ObjectProvider<JedisClientConfigurationBuilderCustomizer> builderCustomizers = beanFactory.getBeanProvider(JedisClientConfigurationBuilderCustomizer.class);
+
+                                Method createJedisConnectionFactory = clazz.getDeclaredMethod("createJedisConnectionFactory", ObjectProvider.class);
+                                createJedisConnectionFactory.setAccessible(true);
+                                JedisConnectionFactory factory = (JedisConnectionFactory) createJedisConnectionFactory.invoke(configuration, builderCustomizers);
+                                if (isVirtualThreads()) {
+                                    SimpleAsyncTaskExecutor executor = new SimpleAsyncTaskExecutor("redis-");
+                                    executor.setVirtualThreads(true);
+                                    factory.setExecutor(executor);
+                                }
+                                return factory;
+                            } else {
+                                ObjectProvider<LettuceClientConfigurationBuilderCustomizer> clientConfigurationBuilderCustomizers = beanFactory.getBeanProvider(LettuceClientConfigurationBuilderCustomizer.class);
+                                ObjectProvider<LettuceClientOptionsBuilderCustomizer> clientOptionsBuilderCustomizers = beanFactory.getBeanProvider(LettuceClientOptionsBuilderCustomizer.class);
+                                ClientResources clientResources = beanFactory.getBean(ClientResources.class);
+
+                                Method createConnectionFactory = clazz.getDeclaredMethod("createConnectionFactory", ObjectProvider.class, ObjectProvider.class, ClientResources.class);
+                                createConnectionFactory.setAccessible(true);
+                                LettuceConnectionFactory factory = (LettuceConnectionFactory) createConnectionFactory.invoke(configuration, clientConfigurationBuilderCustomizers, clientOptionsBuilderCustomizers, clientResources);
+                                if (isVirtualThreads()) {
+                                    SimpleAsyncTaskExecutor executor = new SimpleAsyncTaskExecutor("redis-");
+                                    executor.setVirtualThreads(true);
+                                    factory.setExecutor(executor);
+                                }
+                                return factory;
                             }
-                            return factory;
                         } catch (InstantiationException | IllegalAccessException | InvocationTargetException |
                                  ClassNotFoundException | NoSuchMethodException e) {
                             throw new RuntimeException(e);

redis-multi-source-spring-boot-starter/src/main/java/com/childrengreens/multi/source/RedisMultiSourcesAutoConfiguration.java

@@ -28,7 +28,7 @@
  */
 
 @AutoConfiguration(before = RedisAutoConfiguration.class)
-@Import({LettuceConnectionMultiSourcesRegistrar.class, RedisTemplateRegistryPostProcessor.class})
+@Import({RedisConnectionMultiSourcesRegistrar.class, RedisTemplateRegistryPostProcessor.class})
 public class RedisMultiSourcesAutoConfiguration {
 
 }