chore: merged main

Author: sonus21

rqueue-core/src/main/java/com/github/sonus21/rqueue/config/RqueueListenerBaseConfig.java

@@ -26,14 +26,12 @@
 import com.github.sonus21.rqueue.utils.RedisUtils;
 import com.github.sonus21.rqueue.utils.condition.MissingRqueueMessageIdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.core.RedisTemplate;
 
 /**
  * This is a base configuration class for Rqueue, that is used in Spring and Spring boot Rqueue libs
@@ -186,5 +184,4 @@ protected RqueueMessageTemplate getMessageTemplate(RqueueConfig rqueueConfig) {
   public RqueueBeanProvider rqueueBeanProvider() {
     return new RqueueBeanProvider();
   }
-
 }

rqueue-nats/src/main/java/com/github/sonus21/rqueue/nats/metrics/NatsRqueueQueueMetricsProvider.java

@@ -75,8 +75,7 @@ public long getProcessingMessageCount(String queueName) {
   @Override
   public long getDeadLetterMessageCount(String queueName) {
     QueueDetail q = EndpointRegistry.get(queueName);
-    String dlqStream =
-        config.getStreamPrefix() + q.getName() + config.getDlqStreamSuffix();
+    String dlqStream = config.getStreamPrefix() + q.getName() + config.getDlqStreamSuffix();
     try {
       StreamInfo info = jsm.getStreamInfo(dlqStream);
       return info.getStreamState().getMsgCount();

rqueue-redis/src/main/java/com/github/sonus21/rqueue/redis/config/RqueueRedisListenerConfig.java

@@ -92,7 +92,8 @@ public RqueueInternalPubSubChannel rqueueInternalPubSubChannel(
       RqueueMessageListenerContainer rqueueMessageListenerContainer,
       RqueueConfig rqueueConfig,
       RqueueBeanProvider rqueueBeanProvider,
-      @Qualifier("stringRqueueRedisTemplate") RqueueRedisTemplate<String> stringRqueueRedisTemplate) {
+      @Qualifier("stringRqueueRedisTemplate")
+          RqueueRedisTemplate<String> stringRqueueRedisTemplate) {
     return new RqueueInternalPubSubChannel(
         rqueueRedisListenerContainerFactory,
         rqueueMessageListenerContainer,

rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/dao/RqueueQStatsDaoTest.java

@@ -26,11 +26,11 @@
 import static org.mockito.Mockito.verify;
 
 import com.github.sonus21.TestBase;
-import com.github.sonus21.rqueue.redis.RedisUnitTest;
 import com.github.sonus21.rqueue.common.RqueueRedisTemplate;
 import com.github.sonus21.rqueue.config.RqueueConfig;
 import com.github.sonus21.rqueue.dao.RqueueQStatsDao;
 import com.github.sonus21.rqueue.models.db.QueueStatistics;
+import com.github.sonus21.rqueue.redis.RedisUnitTest;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/dao/RqueueSystemConfigDaoTest.java

@@ -27,12 +27,12 @@
 import static org.mockito.Mockito.verify;
 
 import com.github.sonus21.TestBase;
-import com.github.sonus21.rqueue.redis.RedisUnitTest;
 import com.github.sonus21.rqueue.common.RqueueRedisTemplate;
 import com.github.sonus21.rqueue.config.RqueueConfig;
 import com.github.sonus21.rqueue.dao.RqueueSystemConfigDao;
 import com.github.sonus21.rqueue.models.db.QueueConfig;
 import com.github.sonus21.rqueue.redis.RedisTestUtils;
+import com.github.sonus21.rqueue.redis.RedisUnitTest;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -68,7 +68,9 @@ public void init() {
   void getQConfig() {
     // default return
     assertNull(rqueueSystemConfigDao.getQConfig(RedisTestUtils.getQueueConfigKey(queueName), true));
-    doReturn(queueConfig).when(rqueueRedisTemplate).get(RedisTestUtils.getQueueConfigKey(queueName));
+    doReturn(queueConfig)
+        .when(rqueueRedisTemplate)
+        .get(RedisTestUtils.getQueueConfigKey(queueName));
     assertEquals(
         queueConfig,
         rqueueSystemConfigDao.getQConfig(RedisTestUtils.getQueueConfigKey(queueName), false));
@@ -86,7 +88,8 @@ void getQConfig() {
   @Test
   void findAllQConfig() {
     List<String> keys = Arrays.asList(
-        RedisTestUtils.getQueueConfigKey(queueName), RedisTestUtils.getQueueConfigKey("notification"));
+        RedisTestUtils.getQueueConfigKey(queueName),
+        RedisTestUtils.getQueueConfigKey("notification"));
     doReturn(Arrays.asList(queueConfig, null)).when(rqueueRedisTemplate).mget(keys);
     assertEquals(
         Collections.singletonList(queueConfig), rqueueSystemConfigDao.findAllQConfig(keys));

rqueue-spring-boot-starter/src/main/java/com/github/sonus21/rqueue/spring/boot/RqueueListenerAutoConfig.java

@@ -16,6 +16,7 @@
 
 package com.github.sonus21.rqueue.spring.boot;
 
+import com.github.sonus21.rqueue.config.RedisBackendCondition;
 import com.github.sonus21.rqueue.config.RqueueConfig;
 import com.github.sonus21.rqueue.config.RqueueListenerBaseConfig;
 import com.github.sonus21.rqueue.core.ReactiveRqueueMessageEnqueuer;
@@ -28,14 +29,12 @@
 import com.github.sonus21.rqueue.core.impl.RqueueEndpointManagerImpl;
 import com.github.sonus21.rqueue.core.impl.RqueueMessageEnqueuerImpl;
 import com.github.sonus21.rqueue.core.impl.RqueueMessageManagerImpl;
-import com.github.sonus21.rqueue.config.RedisBackendCondition;
 import com.github.sonus21.rqueue.core.spi.MessageBroker;
 import com.github.sonus21.rqueue.listener.RqueueMessageHandler;
 import com.github.sonus21.rqueue.listener.RqueueMessageListenerContainer;
 import com.github.sonus21.rqueue.metrics.RqueueQueueMetricsProvider;
 import com.github.sonus21.rqueue.redis.config.RqueueRedisListenerConfig;
 import com.github.sonus21.rqueue.redis.metrics.RedisRqueueQueueMetricsProvider;
-import org.springframework.data.redis.core.StringRedisTemplate;
 import com.github.sonus21.rqueue.utils.condition.ReactiveEnabled;
 import com.github.sonus21.rqueue.utils.condition.RqueueEnabled;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
@@ -47,6 +46,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.context.annotation.Import;
+import org.springframework.data.redis.core.StringRedisTemplate;
 
 @Configuration
 @AutoConfigureAfter(DataRedisAutoConfiguration.class)