Merge branch 'nats-backend' of github.com:/sonus21/rqueue into nats-backend

sonus21 · sonus21 · commit 768a7915ba1e · 2026-05-01T09:26:05.000+05:30
diff --git a/rqueue-nats/src/main/java/com/github/sonus21/rqueue/nats/dao/NatsRqueueSystemConfigDao.java b/rqueue-nats/src/main/java/com/github/sonus21/rqueue/nats/dao/NatsRqueueSystemConfigDao.java
@@ -12,8 +12,8 @@
 
 import com.github.sonus21.rqueue.config.NatsBackendCondition;
 import com.github.sonus21.rqueue.dao.RqueueSystemConfigDao;
-import com.github.sonus21.rqueue.nats.kv.NatsKvBuckets;
 import com.github.sonus21.rqueue.models.db.QueueConfig;
+import com.github.sonus21.rqueue.nats.kv.NatsKvBuckets;
 import io.nats.client.Connection;
 import io.nats.client.JetStreamApiException;
 import io.nats.client.KeyValue;
diff --git a/rqueue-nats/src/main/java/com/github/sonus21/rqueue/nats/kv/NatsKvBucketValidator.java b/rqueue-nats/src/main/java/com/github/sonus21/rqueue/nats/kv/NatsKvBucketValidator.java
@@ -89,9 +89,8 @@ public void afterPropertiesSet() {
    */
   public static void validate(Connection connection, boolean autoCreate) {
     if (autoCreate) {
-      log.fine(
-          "rqueue.nats.autoCreateKvBuckets=true; skipping startup KV bucket validation, stores"
-              + " will lazily create buckets as needed.");
+      log.fine("rqueue.nats.autoCreateKvBuckets=true; skipping startup KV bucket validation, stores"
+          + " will lazily create buckets as needed.");
       return;
     }
     KeyValueManagement kvm;
diff --git a/rqueue-nats/src/main/java/com/github/sonus21/rqueue/nats/kv/NatsKvBuckets.java b/rqueue-nats/src/main/java/com/github/sonus21/rqueue/nats/kv/NatsKvBuckets.java
@@ -50,8 +50,8 @@ public final class NatsKvBuckets {
   public static final String WORKER_HEARTBEATS = "rqueue-worker-heartbeats";
 
   /** All buckets the NATS backend will use, in stable order. */
-  public static final List<String> ALL_BUCKETS = Collections.unmodifiableList(Arrays.asList(
-      QUEUE_CONFIG, JOBS, LOCKS, MESSAGE_METADATA, WORKERS, WORKER_HEARTBEATS));
+  public static final List<String> ALL_BUCKETS = Collections.unmodifiableList(
+      Arrays.asList(QUEUE_CONFIG, JOBS, LOCKS, MESSAGE_METADATA, WORKERS, WORKER_HEARTBEATS));
 
   private NatsKvBuckets() {}
 }
diff --git a/rqueue-nats/src/main/java/com/github/sonus21/rqueue/nats/service/NatsRqueueMessageMetadataService.java b/rqueue-nats/src/main/java/com/github/sonus21/rqueue/nats/service/NatsRqueueMessageMetadataService.java
@@ -63,8 +63,7 @@ public class NatsRqueueMessageMetadataService implements RqueueMessageMetadataSe
 
   private static final Logger log =
       Logger.getLogger(NatsRqueueMessageMetadataService.class.getName());
-  private static final String BUCKET_NAME =
-      NatsKvBuckets.MESSAGE_METADATA;
+  private static final String BUCKET_NAME = NatsKvBuckets.MESSAGE_METADATA;
 
   private final Connection connection;
   private final KeyValueManagement kvm;
diff --git a/rqueue-nats/src/test/java/com/github/sonus21/rqueue/nats/JetStreamMessageBrokerCompetingConsumersIT.java b/rqueue-nats/src/test/java/com/github/sonus21/rqueue/nats/JetStreamMessageBrokerCompetingConsumersIT.java
@@ -13,14 +13,13 @@
 
 import com.github.sonus21.rqueue.core.RqueueMessage;
 import com.github.sonus21.rqueue.listener.QueueDetail;
+import com.github.sonus21.rqueue.nats.js.JetStreamMessageBroker;
 import java.time.Duration;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executors;
-
-import com.github.sonus21.rqueue.nats.js.JetStreamMessageBroker;
 import org.junit.jupiter.api.Test;
 
 @NatsIntegrationTest
diff --git a/rqueue-nats/src/test/java/com/github/sonus21/rqueue/nats/JetStreamMessageBrokerEnqueueAckIT.java b/rqueue-nats/src/test/java/com/github/sonus21/rqueue/nats/JetStreamMessageBrokerEnqueueAckIT.java
@@ -14,11 +14,10 @@
 
 import com.github.sonus21.rqueue.core.RqueueMessage;
 import com.github.sonus21.rqueue.listener.QueueDetail;
+import com.github.sonus21.rqueue.nats.js.JetStreamMessageBroker;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
-
-import com.github.sonus21.rqueue.nats.js.JetStreamMessageBroker;
 import org.junit.jupiter.api.Test;
 
 @NatsIntegrationTest
diff --git a/rqueue-nats/src/test/java/com/github/sonus21/rqueue/nats/JetStreamMessageBrokerFactoryTest.java b/rqueue-nats/src/test/java/com/github/sonus21/rqueue/nats/JetStreamMessageBrokerFactoryTest.java
@@ -16,11 +16,10 @@
 
 import com.github.sonus21.rqueue.core.spi.MessageBrokerFactory;
 import com.github.sonus21.rqueue.core.spi.MessageBrokerLoader;
+import com.github.sonus21.rqueue.nats.js.JetStreamMessageBrokerFactory;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.ServiceLoader;
-
-import com.github.sonus21.rqueue.nats.js.JetStreamMessageBrokerFactory;
 import org.junit.jupiter.api.Test;
 
 /** ServiceLoader and configuration-parsing tests for {@link JetStreamMessageBrokerFactory}. */
diff --git a/rqueue-nats/src/test/java/com/github/sonus21/rqueue/nats/JetStreamMessageBrokerIndependentConsumersIT.java b/rqueue-nats/src/test/java/com/github/sonus21/rqueue/nats/JetStreamMessageBrokerIndependentConsumersIT.java
@@ -13,12 +13,11 @@
 
 import com.github.sonus21.rqueue.core.RqueueMessage;
 import com.github.sonus21.rqueue.listener.QueueDetail;
+import com.github.sonus21.rqueue.nats.js.JetStreamMessageBroker;
 import java.time.Duration;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
-import com.github.sonus21.rqueue.nats.js.JetStreamMessageBroker;
 import org.junit.jupiter.api.Test;
 
 @NatsIntegrationTest
diff --git a/rqueue-nats/src/test/java/com/github/sonus21/rqueue/nats/JetStreamMessageBrokerPubSubIT.java b/rqueue-nats/src/test/java/com/github/sonus21/rqueue/nats/JetStreamMessageBrokerPubSubIT.java
@@ -12,10 +12,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import com.github.sonus21.rqueue.nats.js.JetStreamMessageBroker;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.TimeUnit;
-
-import com.github.sonus21.rqueue.nats.js.JetStreamMessageBroker;
 import org.junit.jupiter.api.Test;
 
 @NatsIntegrationTest
diff --git a/rqueue-nats/src/test/java/com/github/sonus21/rqueue/nats/JetStreamMessageBrokerRetryDlqIT.java b/rqueue-nats/src/test/java/com/github/sonus21/rqueue/nats/JetStreamMessageBrokerRetryDlqIT.java
@@ -13,10 +13,9 @@
 
 import com.github.sonus21.rqueue.core.RqueueMessage;
 import com.github.sonus21.rqueue.listener.QueueDetail;
+import com.github.sonus21.rqueue.nats.js.JetStreamMessageBroker;
 import java.time.Duration;
 import java.util.List;
-
-import com.github.sonus21.rqueue.nats.js.JetStreamMessageBroker;
 import org.junit.jupiter.api.Test;
 
 @NatsIntegrationTest
diff --git a/rqueue-redis/src/main/java/com/github/sonus21/rqueue/redis/config/RqueueRedisListenerConfig.java b/rqueue-redis/src/main/java/com/github/sonus21/rqueue/redis/config/RqueueRedisListenerConfig.java
@@ -25,10 +25,10 @@
 import com.github.sonus21.rqueue.dao.RqueueStringDao;
 import com.github.sonus21.rqueue.listener.RqueueMessageListenerContainer;
 import com.github.sonus21.rqueue.metrics.RqueueQueueMetricsProvider;
-import com.github.sonus21.rqueue.redis.lock.RqueueRedisLock;
 import com.github.sonus21.rqueue.redis.core.ProcessingQueueMessageScheduler;
 import com.github.sonus21.rqueue.redis.core.ScheduledQueueMessageScheduler;
 import com.github.sonus21.rqueue.redis.dao.RqueueStringDaoImpl;
+import com.github.sonus21.rqueue.redis.lock.RqueueRedisLock;
 import com.github.sonus21.rqueue.redis.metrics.RedisRqueueQueueMetricsProvider;
 import com.github.sonus21.rqueue.redis.worker.RedisWorkerRegistryStore;
 import com.github.sonus21.rqueue.utils.RedisUtils;
@@ -55,7 +55,7 @@
 @Configuration
 @Conditional(RedisBackendCondition.class)
 @ComponentScan({
-    "com.github.sonus21.rqueue.redis",
+  "com.github.sonus21.rqueue.redis",
 })
 public class RqueueRedisListenerConfig {
 
@@ -91,7 +91,7 @@ public RqueueInternalPubSubChannel rqueueInternalPubSubChannel(
       RqueueConfig rqueueConfig,
       RqueueBeanProvider rqueueBeanProvider,
       @Qualifier("stringRqueueRedisTemplate")
-      RqueueRedisTemplate<String> stringRqueueRedisTemplate) {
+          RqueueRedisTemplate<String> stringRqueueRedisTemplate) {
     return new RqueueInternalPubSubChannel(
         rqueueRedisListenerContainerFactory,
         rqueueMessageListenerContainer,
@@ -148,7 +148,7 @@ public RqueueLockManager rqueueLockManager(RqueueStringDao rqueueStringDao) {
   @Conditional(RedisBackendCondition.class)
   public RqueueQueueMetricsProvider rqueueQueueMetricsProvider(
       @Qualifier("stringRqueueRedisTemplate")
-      RqueueRedisTemplate<String> stringRqueueRedisTemplate) {
+          RqueueRedisTemplate<String> stringRqueueRedisTemplate) {
     return new RedisRqueueQueueMetricsProvider(stringRqueueRedisTemplate);
   }
 }
diff --git a/rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/common/RqueueRedisLockTest.java b/rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/common/RqueueRedisLockTest.java
@@ -22,10 +22,10 @@
 
 import com.github.sonus21.TestBase;
 import com.github.sonus21.rqueue.CoreUnitTest;
-import com.github.sonus21.rqueue.dao.RqueueStringDao;
 import com.github.sonus21.rqueue.common.RqueueLockManager;
-import java.time.Duration;
+import com.github.sonus21.rqueue.dao.RqueueStringDao;
 import com.github.sonus21.rqueue.redis.lock.RqueueRedisLock;
+import java.time.Duration;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;

Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,8 @@ public final class NatsKvBuckets {`
`50`	`50`	`public static final String WORKER_HEARTBEATS = "rqueue-worker-heartbeats";`
`51`	`51`
`52`	`52`	`/** All buckets the NATS backend will use, in stable order. */`
`53`		`- public static final List<String> ALL_BUCKETS = Collections.unmodifiableList(Arrays.asList(`
`54`		`- QUEUE_CONFIG, JOBS, LOCKS, MESSAGE_METADATA, WORKERS, WORKER_HEARTBEATS));`
	`53`	`+ public static final List<String> ALL_BUCKETS = Collections.unmodifiableList(`
	`54`	`+ Arrays.asList(QUEUE_CONFIG, JOBS, LOCKS, MESSAGE_METADATA, WORKERS, WORKER_HEARTBEATS));`
`55`	`55`
`56`	`56`	`private NatsKvBuckets() {}`
`57`	`57`	`}`