Skip to content

Commit 769af87

Browse files
committed
Merge branch 'nats-backend' of github.com:/sonus21/rqueue into nats-backend
2 parents d2c21f6 + 6d0ffba commit 769af87

9 files changed

Lines changed: 19 additions & 19 deletions

File tree

rqueue-nats/src/main/java/com/github/sonus21/rqueue/nats/worker/NatsWorkerRegistryStore.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@ public Map<String, RqueueWorkerInfo> getWorkerInfos(Collection<String> workerKey
136136
@Override
137137
public void putQueueHeartbeat(String queueKey, String workerId, String metadataJson) {
138138
if (heartbeatBucketTtl == null) {
139-
// Best-effort default — overwritten by refreshQueueTtl when the registry computes the real value.
139+
// Best-effort default — overwritten by refreshQueueTtl when the registry computes the real
140+
// value.
140141
heartbeatBucketTtl = Duration.ofHours(1);
141142
}
142143
try {
@@ -202,8 +203,7 @@ public void refreshQueueTtl(String queueKey, Duration ttl) {
202203

203204
// ---- helpers ----------------------------------------------------------
204205

205-
private KeyValue ensureBucket(
206-
AtomicReference<KeyValue> ref, String bucketName, Duration maxAge)
206+
private KeyValue ensureBucket(AtomicReference<KeyValue> ref, String bucketName, Duration maxAge)
207207
throws IOException, JetStreamApiException {
208208
KeyValue cached = ref.get();
209209
if (cached != null) {

rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/common/RqueueLockManagerImplTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
import com.github.sonus21.TestBase;
2424
import com.github.sonus21.rqueue.CoreUnitTest;
25-
import com.github.sonus21.rqueue.redis.common.impl.RqueueLockManagerImpl;
26-
import com.github.sonus21.rqueue.dao.RqueueStringDao;
2725
import com.github.sonus21.rqueue.common.RqueueLockManager;
26+
import com.github.sonus21.rqueue.dao.RqueueStringDao;
27+
import com.github.sonus21.rqueue.redis.common.impl.RqueueLockManagerImpl;
2828
import java.time.Duration;
2929
import org.junit.jupiter.api.BeforeEach;
3030
import org.junit.jupiter.api.Test;

rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/core/MessageSchedulerDisabledTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
import com.github.sonus21.rqueue.CoreUnitTest;
2525
import com.github.sonus21.rqueue.config.RqueueConfig;
2626
import com.github.sonus21.rqueue.config.RqueueSchedulerConfig;
27+
import com.github.sonus21.rqueue.core.EndpointRegistry;
2728
import com.github.sonus21.rqueue.listener.QueueDetail;
2829
import com.github.sonus21.rqueue.models.event.RqueueBootstrapEvent;
2930
import com.github.sonus21.rqueue.utils.TestUtils;
3031
import com.github.sonus21.rqueue.utils.ThreadUtils;
3132
import com.github.sonus21.test.TestTaskScheduler;
32-
import com.github.sonus21.rqueue.core.EndpointRegistry;
3333
import org.apache.commons.lang3.reflect.FieldUtils;
3434
import org.junit.jupiter.api.BeforeEach;
3535
import org.junit.jupiter.api.Test;

rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/core/MessageSchedulerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
import com.github.sonus21.rqueue.CoreUnitTest;
2424
import com.github.sonus21.rqueue.config.RqueueConfig;
2525
import com.github.sonus21.rqueue.config.RqueueSchedulerConfig;
26-
import com.github.sonus21.rqueue.redis.core.ScheduledQueueMessageSchedulerTest.TestScheduledQueueMessageScheduler;
26+
import com.github.sonus21.rqueue.core.EndpointRegistry;
2727
import com.github.sonus21.rqueue.listener.QueueDetail;
2828
import com.github.sonus21.rqueue.models.event.RqueueBootstrapEvent;
29+
import com.github.sonus21.rqueue.redis.core.ScheduledQueueMessageSchedulerTest.TestScheduledQueueMessageScheduler;
2930
import com.github.sonus21.rqueue.utils.TestUtils;
3031
import com.github.sonus21.test.TestTaskScheduler;
31-
import com.github.sonus21.rqueue.core.EndpointRegistry;
3232
import java.util.HashMap;
3333
import java.util.Map;
3434
import org.apache.commons.lang3.reflect.FieldUtils;

rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/core/MessageSchedulingTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
import com.github.sonus21.rqueue.CoreUnitTest;
2828
import com.github.sonus21.rqueue.config.RqueueConfig;
2929
import com.github.sonus21.rqueue.config.RqueueSchedulerConfig;
30-
import com.github.sonus21.rqueue.redis.core.ProcessingQueueMessageSchedulerTest.ProcessingQTestMessageScheduler;
30+
import com.github.sonus21.rqueue.core.EndpointRegistry;
31+
import com.github.sonus21.rqueue.core.RqueueRedisListenerContainerFactory;
3132
import com.github.sonus21.rqueue.listener.QueueDetail;
3233
import com.github.sonus21.rqueue.models.event.RqueueBootstrapEvent;
34+
import com.github.sonus21.rqueue.redis.core.ProcessingQueueMessageSchedulerTest.ProcessingQTestMessageScheduler;
3335
import com.github.sonus21.rqueue.utils.TestUtils;
3436
import com.github.sonus21.rqueue.utils.ThreadUtils;
3537
import com.github.sonus21.test.TestTaskScheduler;
36-
import com.github.sonus21.rqueue.core.RqueueRedisListenerContainerFactory;
37-
import com.github.sonus21.rqueue.core.EndpointRegistry;
3838
import java.util.concurrent.atomic.AtomicInteger;
3939
import org.junit.jupiter.api.BeforeEach;
4040
import org.junit.jupiter.api.Test;

rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/core/ProcessingQueueMessageSchedulerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
import com.github.sonus21.TestBase;
2525
import com.github.sonus21.rqueue.CoreUnitTest;
2626
import com.github.sonus21.rqueue.config.RqueueSchedulerConfig;
27+
import com.github.sonus21.rqueue.core.EndpointRegistry;
2728
import com.github.sonus21.rqueue.listener.QueueDetail;
2829
import com.github.sonus21.rqueue.utils.TestUtils;
29-
import com.github.sonus21.rqueue.core.EndpointRegistry;
3030
import java.util.concurrent.Future;
3131
import java.util.concurrent.atomic.AtomicInteger;
3232
import org.junit.jupiter.api.BeforeEach;

rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/core/RedisAndNormalSchedulingTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111
import com.github.sonus21.rqueue.CoreUnitTest;
1212
import com.github.sonus21.rqueue.config.RqueueConfig;
1313
import com.github.sonus21.rqueue.config.RqueueSchedulerConfig;
14-
import com.github.sonus21.rqueue.redis.core.ScheduledQueueMessageSchedulerTest.TestScheduledQueueMessageScheduler;
14+
import com.github.sonus21.rqueue.core.EndpointRegistry;
15+
import com.github.sonus21.rqueue.core.RqueueRedisListenerContainerFactory;
1516
import com.github.sonus21.rqueue.listener.QueueDetail;
1617
import com.github.sonus21.rqueue.models.event.RqueueBootstrapEvent;
18+
import com.github.sonus21.rqueue.redis.core.ScheduledQueueMessageSchedulerTest.TestScheduledQueueMessageScheduler;
1719
import com.github.sonus21.rqueue.utils.Constants;
1820
import com.github.sonus21.rqueue.utils.TestUtils;
1921
import com.github.sonus21.rqueue.utils.ThreadUtils;
2022
import com.github.sonus21.rqueue.utils.TimeoutUtils;
2123
import com.github.sonus21.test.TestTaskScheduler;
22-
import com.github.sonus21.rqueue.core.RqueueRedisListenerContainerFactory;
23-
import com.github.sonus21.rqueue.core.EndpointRegistry;
2424
import java.util.concurrent.atomic.AtomicBoolean;
2525
import java.util.concurrent.atomic.AtomicInteger;
2626
import lombok.extern.slf4j.Slf4j;

rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/core/RedisScheduleTriggerHandlerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
import com.github.sonus21.TestBase;
1111
import com.github.sonus21.rqueue.CoreUnitTest;
1212
import com.github.sonus21.rqueue.config.RqueueSchedulerConfig;
13+
import com.github.sonus21.rqueue.core.EndpointRegistry;
14+
import com.github.sonus21.rqueue.core.RqueueRedisListenerContainerFactory;
1315
import com.github.sonus21.rqueue.listener.QueueDetail;
1416
import com.github.sonus21.rqueue.utils.TestUtils;
1517
import com.github.sonus21.rqueue.utils.TimeoutUtils;
16-
import com.github.sonus21.rqueue.core.RqueueRedisListenerContainerFactory;
17-
import com.github.sonus21.rqueue.core.EndpointRegistry;
1818
import java.util.List;
1919
import java.util.concurrent.Callable;
2020
import java.util.concurrent.ExecutorService;

rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/core/ScheduledQueueMessageSchedulerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@
3434
import com.github.sonus21.rqueue.CoreUnitTest;
3535
import com.github.sonus21.rqueue.config.RqueueConfig;
3636
import com.github.sonus21.rqueue.config.RqueueSchedulerConfig;
37+
import com.github.sonus21.rqueue.core.EndpointRegistry;
38+
import com.github.sonus21.rqueue.core.RqueueRedisListenerContainerFactory;
3739
import com.github.sonus21.rqueue.listener.QueueDetail;
3840
import com.github.sonus21.rqueue.models.event.RqueueBootstrapEvent;
3941
import com.github.sonus21.rqueue.utils.TestUtils;
4042
import com.github.sonus21.rqueue.utils.ThreadUtils;
4143
import com.github.sonus21.rqueue.utils.TimeoutUtils;
4244
import com.github.sonus21.test.TestTaskScheduler;
43-
import com.github.sonus21.rqueue.core.RqueueRedisListenerContainerFactory;
44-
import com.github.sonus21.rqueue.core.EndpointRegistry;
4545
import java.util.Map;
4646
import java.util.concurrent.Future;
4747
import java.util.concurrent.atomic.AtomicInteger;

0 commit comments

Comments
 (0)