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

Author: sonus21

rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/web/service/RqueueDashboardChartServiceTest.java

@@ -39,6 +39,8 @@
 import com.github.sonus21.rqueue.models.response.ChartDataResponse;
 import com.github.sonus21.rqueue.redis.web.service.impl.RqueueDashboardChartServiceImpl;
 import com.github.sonus21.rqueue.utils.DateTimeUtils;
+import com.github.sonus21.rqueue.web.service.RqueueDashboardChartService;
+import com.github.sonus21.rqueue.web.service.RqueueSystemManagerService;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -50,8 +52,6 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import com.github.sonus21.rqueue.web.service.RqueueDashboardChartService;
-import com.github.sonus21.rqueue.web.service.RqueueSystemManagerService;
 
 @Slf4j
 @CoreUnitTest

rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/web/service/RqueueMessageMetadataServiceTest.java

@@ -38,6 +38,7 @@
 import com.github.sonus21.rqueue.models.db.MessageMetadata;
 import com.github.sonus21.rqueue.models.enums.MessageStatus;
 import com.github.sonus21.rqueue.redis.web.service.impl.RqueueMessageMetadataServiceImpl;
+import com.github.sonus21.rqueue.service.RqueueMessageMetadataService;
 import com.github.sonus21.rqueue.utils.Constants;
 import java.time.Duration;
 import java.util.Arrays;
@@ -49,7 +50,6 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.mockito.stubbing.Answer;
-import com.github.sonus21.rqueue.service.RqueueMessageMetadataService;
 
 @CoreUnitTest
 class RqueueMessageMetadataServiceTest extends TestBase {

rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/web/service/RqueueQDetailServiceBrokerRoutingTest.java

@@ -42,7 +42,9 @@
 import com.github.sonus21.rqueue.models.response.DataViewResponse;
 import com.github.sonus21.rqueue.models.response.RedisDataDetail;
 import com.github.sonus21.rqueue.redis.web.service.impl.RqueueQDetailServiceImpl;
+import com.github.sonus21.rqueue.service.RqueueMessageMetadataService;
 import com.github.sonus21.rqueue.utils.TestUtils;
+import com.github.sonus21.rqueue.web.service.RqueueSystemManagerService;
 import com.github.sonus21.rqueue.worker.RqueueWorkerRegistry;
 import java.util.Collections;
 import java.util.List;
@@ -52,8 +54,6 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import com.github.sonus21.rqueue.web.service.RqueueSystemManagerService;
-import com.github.sonus21.rqueue.service.RqueueMessageMetadataService;
 
 @CoreUnitTest
 class RqueueQDetailServiceBrokerRoutingTest extends TestBase {

rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/web/service/RqueueQDetailServiceTest.java

@@ -48,7 +48,10 @@
 import com.github.sonus21.rqueue.models.response.TableColumn;
 import com.github.sonus21.rqueue.models.response.TableRow;
 import com.github.sonus21.rqueue.redis.web.service.impl.RqueueQDetailServiceImpl;
+import com.github.sonus21.rqueue.service.RqueueMessageMetadataService;
 import com.github.sonus21.rqueue.utils.RqueueMessageTestUtils;
+import com.github.sonus21.rqueue.web.service.RqueueQDetailService;
+import com.github.sonus21.rqueue.web.service.RqueueSystemManagerService;
 import com.github.sonus21.rqueue.worker.RqueueWorkerRegistry;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -70,9 +73,6 @@
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ZSetOperations.TypedTuple;
 import org.springframework.messaging.converter.MessageConverter;
-import com.github.sonus21.rqueue.web.service.RqueueQDetailService;
-import com.github.sonus21.rqueue.web.service.RqueueSystemManagerService;
-import com.github.sonus21.rqueue.service.RqueueMessageMetadataService;
 
 @CoreUnitTest
 class RqueueQDetailServiceTest extends TestBase {

rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/web/service/RqueueSystemManagerServiceImplTest.java

@@ -40,8 +40,8 @@
 import com.github.sonus21.rqueue.models.db.QueueConfig;
 import com.github.sonus21.rqueue.models.event.RqueueBootstrapEvent;
 import com.github.sonus21.rqueue.redis.web.service.impl.RqueueSystemManagerServiceImpl;
-import com.github.sonus21.rqueue.utils.TestUtils;
 import com.github.sonus21.rqueue.service.RqueueMessageMetadataService;
+import com.github.sonus21.rqueue.utils.TestUtils;
 import java.util.Arrays;
 import java.util.List;
 import org.junit.jupiter.api.BeforeEach;

rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/web/service/RqueueSystemManagerServiceTest.java

@@ -33,7 +33,9 @@
 import com.github.sonus21.rqueue.models.db.QueueConfig;
 import com.github.sonus21.rqueue.models.response.BaseResponse;
 import com.github.sonus21.rqueue.redis.web.service.impl.RqueueSystemManagerServiceImpl;
+import com.github.sonus21.rqueue.service.RqueueMessageMetadataService;
 import com.github.sonus21.rqueue.utils.TestUtils;
+import com.github.sonus21.rqueue.web.service.RqueueSystemManagerService;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -44,8 +46,6 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import com.github.sonus21.rqueue.web.service.RqueueSystemManagerService;
-import com.github.sonus21.rqueue.service.RqueueMessageMetadataService;
 
 @CoreUnitTest
 class RqueueSystemManagerServiceTest extends TestBase {

rqueue-redis/src/test/java/com/github/sonus21/rqueue/redis/web/service/RqueueUtilityServiceTest.java

@@ -47,6 +47,8 @@
 import com.github.sonus21.rqueue.models.response.MessageMoveResponse;
 import com.github.sonus21.rqueue.models.response.StringResponse;
 import com.github.sonus21.rqueue.redis.web.service.impl.RqueueUtilityServiceImpl;
+import com.github.sonus21.rqueue.service.RqueueMessageMetadataService;
+import com.github.sonus21.rqueue.service.RqueueUtilityService;
 import java.io.Serializable;
 import java.time.Duration;
 import java.util.Collections;
@@ -57,8 +59,6 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import com.github.sonus21.rqueue.service.RqueueMessageMetadataService;
-import com.github.sonus21.rqueue.service.RqueueUtilityService;
 
 @CoreUnitTest
 class RqueueUtilityServiceTest extends TestBase {