MOSIP-42419

cache-provider-redis/src/main/java/io/mosip/commons/packet/cache/provider/redis/config/RedisConfig.java

@@ -3,8 +3,13 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
+import org.springframework.data.redis.connection.jedis.JedisClientConfiguration;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
+import redis.clients.jedis.JedisPoolConfig;
+
+import java.time.Duration;
 
 @Configuration
 public class RedisConfig {
@@ -18,14 +23,61 @@ public class RedisConfig {
     @Value("${redis.cache.port}")
     private int port;
 
+    @Value("${redis.cache.max.total:500}")
+    private int maxTotal;
+
+    @Value("${redis.cache.max.idle:70}")
+    private int maxIdle;
+
+    @Value("${redis.cache.min.idle:10}")
+    private int minIdle;
+
+    @Value("${redis.cache.connect.timeout:2000}")
+    private int connectTimeout;
+
+    @Value("${redis.cache.read.timeout:3500}")
+    private int readTimeout;
+
+    @Value("${redis.cache.test.while.idle:true}")
+    private boolean testWhileIdle;
+
+    @Value("${redis.cache.eviction.run.interval:60000}")
+    private long evictionRunIntervalMs;
+
+    @Value("${redis.cache.min.evictable.idle.time:300000}")
+    private long minEvictableIdleTimeMs;
+
+    @Value("${redis.cache.num.tests.per.eviction.run:20}")
+    private int numTestsPerEvictionRun;
+
     @Bean
-    JedisConnectionFactory jedisConnectionFactory() {
-        JedisConnectionFactory jedisConFactory
-                = new JedisConnectionFactory();
-        jedisConFactory.setHostName(hostname);
-        jedisConFactory.setPort(port);
-        jedisConFactory.setPassword(password);
-        return jedisConFactory;
+    public JedisConnectionFactory jedisConnectionFactory() {
+        RedisStandaloneConfiguration redisConfig = new RedisStandaloneConfiguration();
+        redisConfig.setHostName(hostname);
+        redisConfig.setPort(port);
+        redisConfig.setPassword(password);
+
+        JedisPoolConfig jedisPoolConfig = new JedisPoolConfig();
+        jedisPoolConfig.setMaxTotal(maxTotal);
+        jedisPoolConfig.setMaxIdle(maxIdle);
+        jedisPoolConfig.setMinIdle(minIdle);
+        jedisPoolConfig.setTestOnBorrow(true);
+        jedisPoolConfig.setTestWhileIdle(testWhileIdle);
+        jedisPoolConfig.setNumTestsPerEvictionRun(numTestsPerEvictionRun);
+
+        // ✅ Modern Jedis API uses Duration
+        jedisPoolConfig.setTimeBetweenEvictionRuns(Duration.ofMillis(evictionRunIntervalMs));
+        jedisPoolConfig.setMinEvictableIdleDuration(Duration.ofMillis(minEvictableIdleTimeMs));
+
+        JedisClientConfiguration clientConfig = JedisClientConfiguration.builder()
+                .usePooling()
+                .poolConfig(jedisPoolConfig)
+                .and()
+                .connectTimeout(Duration.ofMillis(connectTimeout))
+                .readTimeout(Duration.ofMillis(readTimeout))
+                .build();
+
+        return new JedisConnectionFactory(redisConfig, clientConfig);
     }
 
     @Bean
@@ -34,5 +86,4 @@ public RedisTemplate<String, Object> redisTemplate() {
         template.setConnectionFactory(jedisConnectionFactory());
         return template;
     }
-
-}
+}

pre-registration-booking-service/pom.xml

@@ -282,6 +282,7 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<version>${spring.boot.version}</version>
 				<configuration>
 					<executable>true</executable>
 					<layout>ZIP</layout>