diff --git a/.github/workflows/java-ci.yaml b/.github/workflows/java-ci.yaml index 7168ecd2..767cd567 100644 --- a/.github/workflows/java-ci.yaml +++ b/.github/workflows/java-ci.yaml @@ -463,3 +463,22 @@ jobs: build/reports/jacoco/test/jacocoTestReport.xml build/reports/jacoco/coverageReportOnly/html if-no-files-found: ignore + + - name: Push coverage to Coveralls + env: + COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + BUILD_NUMBER: ${{ github.run_id }} + CI_BRANCH: ${{ github.head_ref || github.ref_name }} + run: | + if [ -z "$COVERALLS_REPO_TOKEN" ]; then + echo "ERROR: COVERALLS_REPO_TOKEN is not set" + exit 1 + fi + ./gradlew coverallsJacoco -i + echo "=== Coveralls request payload ===" + if [ -f build/coveralls-request.json ]; then + cat build/coveralls-request.json | jq . 2>/dev/null || cat build/coveralls-request.json + else + echo "No coveralls-request.json found" + fi diff --git a/build.gradle b/build.gradle index c8c9ffa7..d2d4808e 100644 --- a/build.gradle +++ b/build.gradle @@ -206,6 +206,7 @@ coverallsJacoco { reportSourceSets = publishedProjects.collectMany { it.sourceSets.main.allSource.srcDirs } + coverallsRequest = file("build/coveralls-request.json") } def javaFormatSources = providers.provider { diff --git a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueJobMetricsAggregatorService.java b/rqueue-core/src/main/java/com/github/sonus21/rqueue/metrics/RqueueMetricsAggregatorService.java similarity index 98% rename from rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueJobMetricsAggregatorService.java rename to rqueue-core/src/main/java/com/github/sonus21/rqueue/metrics/RqueueMetricsAggregatorService.java index 3d0a14f9..5100f16f 100644 --- a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueJobMetricsAggregatorService.java +++ b/rqueue-core/src/main/java/com/github/sonus21/rqueue/metrics/RqueueMetricsAggregatorService.java @@ -14,7 +14,7 @@ * */ -package com.github.sonus21.rqueue.web.service; +package com.github.sonus21.rqueue.metrics; import com.github.sonus21.rqueue.common.RqueueLockManager; import com.github.sonus21.rqueue.config.RqueueConfig; @@ -57,7 +57,7 @@ @Component @Slf4j -public class RqueueJobMetricsAggregatorService +public class RqueueMetricsAggregatorService implements ApplicationListener, DisposableBean, SmartLifecycle { private final RqueueConfig rqueueConfig; @@ -73,7 +73,7 @@ public class RqueueJobMetricsAggregatorService private List> eventAggregatorTasks; @Autowired - public RqueueJobMetricsAggregatorService( + public RqueueMetricsAggregatorService( RqueueConfig rqueueConfig, RqueueWebConfig rqueueWebConfig, RqueueLockManager rqueueLockManager, diff --git a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueDashboardChartService.java b/rqueue-core/src/main/java/com/github/sonus21/rqueue/web/RqueueDashboardChartService.java similarity index 95% rename from rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueDashboardChartService.java rename to rqueue-core/src/main/java/com/github/sonus21/rqueue/web/RqueueDashboardChartService.java index c1632cd7..3e2d84b5 100644 --- a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueDashboardChartService.java +++ b/rqueue-core/src/main/java/com/github/sonus21/rqueue/web/RqueueDashboardChartService.java @@ -14,7 +14,7 @@ * */ -package com.github.sonus21.rqueue.web.service; +package com.github.sonus21.rqueue.web; import com.github.sonus21.rqueue.models.request.ChartDataRequest; import com.github.sonus21.rqueue.models.response.ChartDataResponse; diff --git a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueJobService.java b/rqueue-core/src/main/java/com/github/sonus21/rqueue/web/RqueueJobService.java similarity index 95% rename from rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueJobService.java rename to rqueue-core/src/main/java/com/github/sonus21/rqueue/web/RqueueJobService.java index 43990cc9..fe6738e8 100644 --- a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueJobService.java +++ b/rqueue-core/src/main/java/com/github/sonus21/rqueue/web/RqueueJobService.java @@ -14,7 +14,7 @@ * */ -package com.github.sonus21.rqueue.web.service; +package com.github.sonus21.rqueue.web; import com.github.sonus21.rqueue.exception.ProcessingException; import com.github.sonus21.rqueue.models.response.DataViewResponse; diff --git a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueQDetailService.java b/rqueue-core/src/main/java/com/github/sonus21/rqueue/web/RqueueQDetailService.java similarity index 97% rename from rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueQDetailService.java rename to rqueue-core/src/main/java/com/github/sonus21/rqueue/web/RqueueQDetailService.java index ccd16c26..5dde86b9 100644 --- a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueQDetailService.java +++ b/rqueue-core/src/main/java/com/github/sonus21/rqueue/web/RqueueQDetailService.java @@ -14,7 +14,7 @@ * */ -package com.github.sonus21.rqueue.web.service; +package com.github.sonus21.rqueue.web; import com.github.sonus21.rqueue.models.db.QueueConfig; import com.github.sonus21.rqueue.models.enums.DataType; diff --git a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueSystemManagerService.java b/rqueue-core/src/main/java/com/github/sonus21/rqueue/web/RqueueSystemManagerService.java similarity index 96% rename from rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueSystemManagerService.java rename to rqueue-core/src/main/java/com/github/sonus21/rqueue/web/RqueueSystemManagerService.java index dac69960..3acca57a 100644 --- a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueSystemManagerService.java +++ b/rqueue-core/src/main/java/com/github/sonus21/rqueue/web/RqueueSystemManagerService.java @@ -14,7 +14,7 @@ * */ -package com.github.sonus21.rqueue.web.service; +package com.github.sonus21.rqueue.web; import com.github.sonus21.rqueue.models.db.QueueConfig; import com.github.sonus21.rqueue.models.event.RqueueBootstrapEvent; diff --git a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueViewControllerService.java b/rqueue-core/src/main/java/com/github/sonus21/rqueue/web/RqueueViewControllerService.java similarity index 96% rename from rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueViewControllerService.java rename to rqueue-core/src/main/java/com/github/sonus21/rqueue/web/RqueueViewControllerService.java index 7fe2dcff..d4813e55 100644 --- a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueViewControllerService.java +++ b/rqueue-core/src/main/java/com/github/sonus21/rqueue/web/RqueueViewControllerService.java @@ -14,7 +14,7 @@ * */ -package com.github.sonus21.rqueue.web.service; +package com.github.sonus21.rqueue.web; import org.springframework.ui.Model; diff --git a/rqueue-web/src/test/java/com/github/sonus21/rqueue/web/service/RqueueTaskMetricsAggregatorServiceTest.java b/rqueue-core/src/test/java/com/github/sonus21/rqueue/metrics/RqueueTaskMetricsAggregatorServiceTest.java similarity index 97% rename from rqueue-web/src/test/java/com/github/sonus21/rqueue/web/service/RqueueTaskMetricsAggregatorServiceTest.java rename to rqueue-core/src/test/java/com/github/sonus21/rqueue/metrics/RqueueTaskMetricsAggregatorServiceTest.java index 27271474..d26d581e 100644 --- a/rqueue-web/src/test/java/com/github/sonus21/rqueue/web/service/RqueueTaskMetricsAggregatorServiceTest.java +++ b/rqueue-core/src/test/java/com/github/sonus21/rqueue/metrics/RqueueTaskMetricsAggregatorServiceTest.java @@ -14,7 +14,7 @@ * */ -package com.github.sonus21.rqueue.web.service; +package com.github.sonus21.rqueue.metrics; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -88,12 +88,12 @@ class RqueueTaskMetricsAggregatorServiceTest extends TestBase { @Mock private MessageBroker messageBroker; - private RqueueJobMetricsAggregatorService rqueueJobMetricsAggregatorService; + private RqueueMetricsAggregatorService rqueueJobMetricsAggregatorService; @BeforeEach public void initService() throws IllegalAccessException { MockitoAnnotations.openMocks(this); - rqueueJobMetricsAggregatorService = new RqueueJobMetricsAggregatorService( + rqueueJobMetricsAggregatorService = new RqueueMetricsAggregatorService( rqueueConfig, rqueueWebConfig, rqueueLockManager, rqueueQStatsDao); doReturn(true).when(rqueueWebConfig).isCollectListenerStats(); doReturn(1).when(rqueueWebConfig).getStatsAggregatorThreadCount(); diff --git a/rqueue-nats/build.gradle b/rqueue-nats/build.gradle index fb2665ce..d7d796a5 100644 --- a/rqueue-nats/build.gradle +++ b/rqueue-nats/build.gradle @@ -45,9 +45,6 @@ dependencies { // rqueue-spring-boot-starter (auto-config), both of which reference this module's // types via compileOnly and gate them behind @ConditionalOnClass(JetStream.class). api project(":rqueue-core") - // NATS-shaped web service impls (NatsRqueueQDetailService, etc.) implement interfaces - // declared in rqueue-web. Mirrors how rqueue-redis pulls rqueue-web for the same reason. - api project(":rqueue-web") api "io.nats:jnats:${natsVersion}" testImplementation project(":rqueue-test-util") testImplementation "org.testcontainers:testcontainers:${testcontainersVersion}" diff --git a/rqueue-redis/build.gradle b/rqueue-redis/build.gradle index b94b2129..302a267a 100644 --- a/rqueue-redis/build.gradle +++ b/rqueue-redis/build.gradle @@ -43,9 +43,6 @@ dependencies { // Broker-impl module mirroring rqueue-nats. spring-data-redis is inherited as `api` from // the root subprojects block, so consumers of rqueue-redis transitively get the Redis SDK. api project(":rqueue-core") - // Redis impls implement web service interfaces declared in rqueue-web (e.g. RqueueQDetailService). - // After the planned repository-interface refactor this dep can drop back to api(":rqueue-core"). - api project(":rqueue-web") testImplementation project(":rqueue-test-util") testImplementation "io.lettuce:lettuce-core:${lettuceVersion}" testImplementation "io.projectreactor:reactor-test:${projectReactorReactorTestVersion}" diff --git a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/config/RqueueWebViewConfig.java b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/config/RqueueWebViewConfig.java index 6e1447a9..51a64cc3 100644 --- a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/config/RqueueWebViewConfig.java +++ b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/config/RqueueWebViewConfig.java @@ -17,8 +17,8 @@ package com.github.sonus21.rqueue.web.config; import com.github.sonus21.rqueue.utils.condition.ReactiveEnabled; -import com.github.sonus21.rqueue.utils.pebble.ResourceLoader; -import com.github.sonus21.rqueue.utils.pebble.RqueuePebbleExtension; +import com.github.sonus21.rqueue.web.pebble.ResourceLoader; +import com.github.sonus21.rqueue.web.pebble.RqueuePebbleExtension; import io.pebbletemplates.pebble.PebbleEngine; import io.pebbletemplates.spring.extension.SpringExtension; import io.pebbletemplates.spring.reactive.PebbleReactiveViewResolver; diff --git a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/controller/ReactiveRqueueRestController.java b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/controller/ReactiveRqueueRestController.java index bbee5693..440ec408 100644 --- a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/controller/ReactiveRqueueRestController.java +++ b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/controller/ReactiveRqueueRestController.java @@ -37,10 +37,10 @@ import com.github.sonus21.rqueue.models.response.StringResponse; import com.github.sonus21.rqueue.service.RqueueUtilityService; import com.github.sonus21.rqueue.utils.condition.ReactiveEnabled; -import com.github.sonus21.rqueue.web.service.RqueueDashboardChartService; -import com.github.sonus21.rqueue.web.service.RqueueJobService; -import com.github.sonus21.rqueue.web.service.RqueueQDetailService; -import com.github.sonus21.rqueue.web.service.RqueueSystemManagerService; +import com.github.sonus21.rqueue.web.RqueueDashboardChartService; +import com.github.sonus21.rqueue.web.RqueueJobService; +import com.github.sonus21.rqueue.web.RqueueQDetailService; +import com.github.sonus21.rqueue.web.RqueueSystemManagerService; import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; import org.springframework.beans.factory.annotation.Autowired; diff --git a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/controller/ReactiveRqueueViewController.java b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/controller/ReactiveRqueueViewController.java index 858003af..2fdd4b04 100644 --- a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/controller/ReactiveRqueueViewController.java +++ b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/controller/ReactiveRqueueViewController.java @@ -18,7 +18,7 @@ import com.github.sonus21.rqueue.config.RqueueWebConfig; import com.github.sonus21.rqueue.utils.condition.ReactiveEnabled; -import com.github.sonus21.rqueue.web.service.RqueueViewControllerService; +import com.github.sonus21.rqueue.web.RqueueViewControllerService; import java.util.Locale; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/controller/RqueueRestController.java b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/controller/RqueueRestController.java index e55ad3d7..3436ffab 100644 --- a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/controller/RqueueRestController.java +++ b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/controller/RqueueRestController.java @@ -39,10 +39,10 @@ import com.github.sonus21.rqueue.models.response.StringResponse; import com.github.sonus21.rqueue.service.RqueueUtilityService; import com.github.sonus21.rqueue.utils.condition.ReactiveDisabled; -import com.github.sonus21.rqueue.web.service.RqueueDashboardChartService; -import com.github.sonus21.rqueue.web.service.RqueueJobService; -import com.github.sonus21.rqueue.web.service.RqueueQDetailService; -import com.github.sonus21.rqueue.web.service.RqueueSystemManagerService; +import com.github.sonus21.rqueue.web.RqueueDashboardChartService; +import com.github.sonus21.rqueue.web.RqueueJobService; +import com.github.sonus21.rqueue.web.RqueueQDetailService; +import com.github.sonus21.rqueue.web.RqueueSystemManagerService; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; diff --git a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/controller/RqueueViewController.java b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/controller/RqueueViewController.java index fc7a39df..9ee0f4e0 100644 --- a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/controller/RqueueViewController.java +++ b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/controller/RqueueViewController.java @@ -18,7 +18,7 @@ import com.github.sonus21.rqueue.config.RqueueWebConfig; import com.github.sonus21.rqueue.utils.condition.ReactiveDisabled; -import com.github.sonus21.rqueue.web.service.RqueueViewControllerService; +import com.github.sonus21.rqueue.web.RqueueViewControllerService; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import java.util.Locale; diff --git a/rqueue-web/src/main/java/com/github/sonus21/rqueue/utils/pebble/DateTimeFunction.java b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/pebble/DateTimeFunction.java similarity index 96% rename from rqueue-web/src/main/java/com/github/sonus21/rqueue/utils/pebble/DateTimeFunction.java rename to rqueue-web/src/main/java/com/github/sonus21/rqueue/web/pebble/DateTimeFunction.java index 86fda201..a61ac188 100644 --- a/rqueue-web/src/main/java/com/github/sonus21/rqueue/utils/pebble/DateTimeFunction.java +++ b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/pebble/DateTimeFunction.java @@ -14,7 +14,7 @@ * */ -package com.github.sonus21.rqueue.utils.pebble; +package com.github.sonus21.rqueue.web.pebble; import com.github.sonus21.rqueue.utils.DateTimeUtils; import io.pebbletemplates.pebble.extension.Function; diff --git a/rqueue-web/src/main/java/com/github/sonus21/rqueue/utils/pebble/DeadLetterQueuesFunction.java b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/pebble/DeadLetterQueuesFunction.java similarity index 97% rename from rqueue-web/src/main/java/com/github/sonus21/rqueue/utils/pebble/DeadLetterQueuesFunction.java rename to rqueue-web/src/main/java/com/github/sonus21/rqueue/web/pebble/DeadLetterQueuesFunction.java index 55dd0a25..30f5d1ad 100644 --- a/rqueue-web/src/main/java/com/github/sonus21/rqueue/utils/pebble/DeadLetterQueuesFunction.java +++ b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/pebble/DeadLetterQueuesFunction.java @@ -14,7 +14,7 @@ * */ -package com.github.sonus21.rqueue.utils.pebble; +package com.github.sonus21.rqueue.web.pebble; import com.github.sonus21.rqueue.models.db.DeadLetterQueue; import com.github.sonus21.rqueue.utils.Constants; diff --git a/rqueue-web/src/main/java/com/github/sonus21/rqueue/utils/pebble/DefaultFunction.java b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/pebble/DefaultFunction.java similarity index 96% rename from rqueue-web/src/main/java/com/github/sonus21/rqueue/utils/pebble/DefaultFunction.java rename to rqueue-web/src/main/java/com/github/sonus21/rqueue/web/pebble/DefaultFunction.java index 3de0d86c..7178ad1c 100644 --- a/rqueue-web/src/main/java/com/github/sonus21/rqueue/utils/pebble/DefaultFunction.java +++ b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/pebble/DefaultFunction.java @@ -14,7 +14,7 @@ * */ -package com.github.sonus21.rqueue.utils.pebble; +package com.github.sonus21.rqueue.web.pebble; import io.pebbletemplates.pebble.extension.Function; import io.pebbletemplates.pebble.template.EvaluationContext; diff --git a/rqueue-web/src/main/java/com/github/sonus21/rqueue/utils/pebble/DurationFunction.java b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/pebble/DurationFunction.java similarity index 96% rename from rqueue-web/src/main/java/com/github/sonus21/rqueue/utils/pebble/DurationFunction.java rename to rqueue-web/src/main/java/com/github/sonus21/rqueue/web/pebble/DurationFunction.java index 41b90bca..4f020bdb 100644 --- a/rqueue-web/src/main/java/com/github/sonus21/rqueue/utils/pebble/DurationFunction.java +++ b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/pebble/DurationFunction.java @@ -14,7 +14,7 @@ * */ -package com.github.sonus21.rqueue.utils.pebble; +package com.github.sonus21.rqueue.web.pebble; import com.github.sonus21.rqueue.utils.DateTimeUtils; import io.pebbletemplates.pebble.extension.Function; diff --git a/rqueue-web/src/main/java/com/github/sonus21/rqueue/utils/pebble/ReadableDateTimeFunction.java b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/pebble/ReadableDateTimeFunction.java similarity index 96% rename from rqueue-web/src/main/java/com/github/sonus21/rqueue/utils/pebble/ReadableDateTimeFunction.java rename to rqueue-web/src/main/java/com/github/sonus21/rqueue/web/pebble/ReadableDateTimeFunction.java index 0988de8f..e2d87304 100644 --- a/rqueue-web/src/main/java/com/github/sonus21/rqueue/utils/pebble/ReadableDateTimeFunction.java +++ b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/pebble/ReadableDateTimeFunction.java @@ -14,7 +14,7 @@ * */ -package com.github.sonus21.rqueue.utils.pebble; +package com.github.sonus21.rqueue.web.pebble; import com.github.sonus21.rqueue.utils.DateTimeUtils; import io.pebbletemplates.pebble.extension.Function; diff --git a/rqueue-web/src/main/java/com/github/sonus21/rqueue/utils/pebble/ResourceLoader.java b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/pebble/ResourceLoader.java similarity index 98% rename from rqueue-web/src/main/java/com/github/sonus21/rqueue/utils/pebble/ResourceLoader.java rename to rqueue-web/src/main/java/com/github/sonus21/rqueue/web/pebble/ResourceLoader.java index d0fc8b27..7dd1f91e 100644 --- a/rqueue-web/src/main/java/com/github/sonus21/rqueue/utils/pebble/ResourceLoader.java +++ b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/pebble/ResourceLoader.java @@ -14,7 +14,7 @@ * */ -package com.github.sonus21.rqueue.utils.pebble; +package com.github.sonus21.rqueue.web.pebble; import io.pebbletemplates.pebble.error.LoaderException; import io.pebbletemplates.pebble.loader.Loader; diff --git a/rqueue-web/src/main/java/com/github/sonus21/rqueue/utils/pebble/RqueuePebbleExtension.java b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/pebble/RqueuePebbleExtension.java similarity index 96% rename from rqueue-web/src/main/java/com/github/sonus21/rqueue/utils/pebble/RqueuePebbleExtension.java rename to rqueue-web/src/main/java/com/github/sonus21/rqueue/web/pebble/RqueuePebbleExtension.java index 8fd7ad64..5e9181bf 100644 --- a/rqueue-web/src/main/java/com/github/sonus21/rqueue/utils/pebble/RqueuePebbleExtension.java +++ b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/pebble/RqueuePebbleExtension.java @@ -14,7 +14,7 @@ * */ -package com.github.sonus21.rqueue.utils.pebble; +package com.github.sonus21.rqueue.web.pebble; import io.pebbletemplates.pebble.extension.AbstractExtension; import io.pebbletemplates.pebble.extension.Function; diff --git a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/impl/RqueueDashboardChartServiceImpl.java b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueDashboardChartServiceImpl.java similarity index 98% rename from rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/impl/RqueueDashboardChartServiceImpl.java rename to rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueDashboardChartServiceImpl.java index 678275bb..3b371cda 100644 --- a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/impl/RqueueDashboardChartServiceImpl.java +++ b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueDashboardChartServiceImpl.java @@ -14,7 +14,7 @@ * */ -package com.github.sonus21.rqueue.web.service.impl; +package com.github.sonus21.rqueue.web.service; import com.github.sonus21.rqueue.config.RqueueConfig; import com.github.sonus21.rqueue.config.RqueueWebConfig; @@ -31,8 +31,8 @@ import com.github.sonus21.rqueue.utils.Constants; import com.github.sonus21.rqueue.utils.DateTimeUtils; import com.github.sonus21.rqueue.utils.StringUtils; -import com.github.sonus21.rqueue.web.service.RqueueDashboardChartService; -import com.github.sonus21.rqueue.web.service.RqueueSystemManagerService; +import com.github.sonus21.rqueue.web.RqueueDashboardChartService; +import com.github.sonus21.rqueue.web.RqueueSystemManagerService; import java.io.Serializable; import java.time.LocalDate; import java.util.ArrayList; diff --git a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/impl/RqueueJobServiceImpl.java b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueJobServiceImpl.java similarity index 97% rename from rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/impl/RqueueJobServiceImpl.java rename to rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueJobServiceImpl.java index 0a9f16b3..fd83a358 100644 --- a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/impl/RqueueJobServiceImpl.java +++ b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueJobServiceImpl.java @@ -14,7 +14,7 @@ * */ -package com.github.sonus21.rqueue.web.service.impl; +package com.github.sonus21.rqueue.web.service; import com.github.sonus21.rqueue.dao.RqueueJobDao; import com.github.sonus21.rqueue.exception.ProcessingException; @@ -27,7 +27,7 @@ import com.github.sonus21.rqueue.utils.Constants; import com.github.sonus21.rqueue.utils.DateTimeUtils; import com.github.sonus21.rqueue.utils.StringUtils; -import com.github.sonus21.rqueue.web.service.RqueueJobService; +import com.github.sonus21.rqueue.web.RqueueJobService; import java.io.IOException; import java.util.Arrays; import java.util.LinkedList; diff --git a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/impl/RqueueQDetailServiceImpl.java b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueQDetailServiceImpl.java similarity index 99% rename from rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/impl/RqueueQDetailServiceImpl.java rename to rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueQDetailServiceImpl.java index a118f6dd..5200e1e6 100644 --- a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/impl/RqueueQDetailServiceImpl.java +++ b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueQDetailServiceImpl.java @@ -14,7 +14,7 @@ * */ -package com.github.sonus21.rqueue.web.service.impl; +package com.github.sonus21.rqueue.web.service; import static com.github.sonus21.rqueue.utils.StringUtils.clean; import static com.google.common.collect.Lists.newArrayList; @@ -47,8 +47,8 @@ import com.github.sonus21.rqueue.utils.Constants; import com.github.sonus21.rqueue.utils.DateTimeUtils; import com.github.sonus21.rqueue.utils.StringUtils; -import com.github.sonus21.rqueue.web.service.RqueueQDetailService; -import com.github.sonus21.rqueue.web.service.RqueueSystemManagerService; +import com.github.sonus21.rqueue.web.RqueueQDetailService; +import com.github.sonus21.rqueue.web.RqueueSystemManagerService; import com.github.sonus21.rqueue.worker.RqueueWorkerRegistry; import java.util.ArrayList; import java.util.Arrays; diff --git a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/impl/RqueueSystemManagerServiceImpl.java b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueSystemManagerServiceImpl.java similarity index 98% rename from rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/impl/RqueueSystemManagerServiceImpl.java rename to rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueSystemManagerServiceImpl.java index 45e95d75..064fc167 100644 --- a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/impl/RqueueSystemManagerServiceImpl.java +++ b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueSystemManagerServiceImpl.java @@ -14,7 +14,7 @@ * */ -package com.github.sonus21.rqueue.web.service.impl; +package com.github.sonus21.rqueue.web.service; import static com.google.common.collect.Lists.newArrayList; @@ -29,7 +29,7 @@ import com.github.sonus21.rqueue.models.response.BaseResponse; import com.github.sonus21.rqueue.service.RqueueMessageMetadataService; import com.github.sonus21.rqueue.utils.RetryableRunnable; -import com.github.sonus21.rqueue.web.service.RqueueSystemManagerService; +import com.github.sonus21.rqueue.web.RqueueSystemManagerService; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; diff --git a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/impl/RqueueViewControllerServiceImpl.java b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueViewControllerServiceImpl.java similarity index 98% rename from rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/impl/RqueueViewControllerServiceImpl.java rename to rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueViewControllerServiceImpl.java index 3e6365e1..7f993cc2 100644 --- a/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/impl/RqueueViewControllerServiceImpl.java +++ b/rqueue-web/src/main/java/com/github/sonus21/rqueue/web/service/RqueueViewControllerServiceImpl.java @@ -14,7 +14,7 @@ * */ -package com.github.sonus21.rqueue.web.service.impl; +package com.github.sonus21.rqueue.web.service; import com.github.sonus21.rqueue.config.RqueueConfig; import com.github.sonus21.rqueue.config.RqueueWebConfig; @@ -29,9 +29,9 @@ import com.github.sonus21.rqueue.models.response.RedisDataDetail; import com.github.sonus21.rqueue.service.RqueueUtilityService; import com.github.sonus21.rqueue.utils.DateTimeUtils; -import com.github.sonus21.rqueue.web.service.RqueueQDetailService; -import com.github.sonus21.rqueue.web.service.RqueueSystemManagerService; -import com.github.sonus21.rqueue.web.service.RqueueViewControllerService; +import com.github.sonus21.rqueue.web.RqueueQDetailService; +import com.github.sonus21.rqueue.web.RqueueSystemManagerService; +import com.github.sonus21.rqueue.web.RqueueViewControllerService; import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; diff --git a/rqueue-web/src/test/java/com/github/sonus21/rqueue/utils/pebble/RqueuePebbleExtensionTest.java b/rqueue-web/src/test/java/com/github/sonus21/rqueue/utils/pebble/RqueuePebbleExtensionTest.java index 23337298..0ebcd3dc 100644 --- a/rqueue-web/src/test/java/com/github/sonus21/rqueue/utils/pebble/RqueuePebbleExtensionTest.java +++ b/rqueue-web/src/test/java/com/github/sonus21/rqueue/utils/pebble/RqueuePebbleExtensionTest.java @@ -21,6 +21,10 @@ import com.github.sonus21.TestBase; import com.github.sonus21.rqueue.CoreUnitTest; +import com.github.sonus21.rqueue.web.pebble.DateTimeFunction; +import com.github.sonus21.rqueue.web.pebble.DurationFunction; +import com.github.sonus21.rqueue.web.pebble.ReadableDateTimeFunction; +import com.github.sonus21.rqueue.web.pebble.RqueuePebbleExtension; import io.pebbletemplates.pebble.extension.Function; import java.util.Collections; import java.util.Map; diff --git a/rqueue-web/src/test/java/com/github/sonus21/rqueue/web/service/RqueueDashboardChartServiceTest.java b/rqueue-web/src/test/java/com/github/sonus21/rqueue/web/service/RqueueDashboardChartServiceTest.java index 5d4a6246..bf34402b 100644 --- a/rqueue-web/src/test/java/com/github/sonus21/rqueue/web/service/RqueueDashboardChartServiceTest.java +++ b/rqueue-web/src/test/java/com/github/sonus21/rqueue/web/service/RqueueDashboardChartServiceTest.java @@ -38,7 +38,8 @@ import com.github.sonus21.rqueue.models.request.ChartDataRequest; import com.github.sonus21.rqueue.models.response.ChartDataResponse; import com.github.sonus21.rqueue.utils.DateTimeUtils; -import com.github.sonus21.rqueue.web.service.impl.RqueueDashboardChartServiceImpl; +import com.github.sonus21.rqueue.web.RqueueDashboardChartService; +import com.github.sonus21.rqueue.web.RqueueSystemManagerService; import java.io.Serializable; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/rqueue-web/src/test/java/com/github/sonus21/rqueue/web/service/RqueueQDetailServiceBrokerRoutingTest.java b/rqueue-web/src/test/java/com/github/sonus21/rqueue/web/service/RqueueQDetailServiceBrokerRoutingTest.java index ad1cbdb9..9563a5fe 100644 --- a/rqueue-web/src/test/java/com/github/sonus21/rqueue/web/service/RqueueQDetailServiceBrokerRoutingTest.java +++ b/rqueue-web/src/test/java/com/github/sonus21/rqueue/web/service/RqueueQDetailServiceBrokerRoutingTest.java @@ -43,7 +43,7 @@ import com.github.sonus21.rqueue.repository.MessageBrowsingRepository; import com.github.sonus21.rqueue.service.RqueueMessageMetadataService; import com.github.sonus21.rqueue.utils.TestUtils; -import com.github.sonus21.rqueue.web.service.impl.RqueueQDetailServiceImpl; +import com.github.sonus21.rqueue.web.RqueueSystemManagerService; import com.github.sonus21.rqueue.worker.RqueueWorkerRegistry; import java.util.Collections; import java.util.List; diff --git a/rqueue-web/src/test/java/com/github/sonus21/rqueue/web/service/RqueueQDetailServiceTest.java b/rqueue-web/src/test/java/com/github/sonus21/rqueue/web/service/RqueueQDetailServiceTest.java index 19cf3154..631ea4b3 100644 --- a/rqueue-web/src/test/java/com/github/sonus21/rqueue/web/service/RqueueQDetailServiceTest.java +++ b/rqueue-web/src/test/java/com/github/sonus21/rqueue/web/service/RqueueQDetailServiceTest.java @@ -48,7 +48,8 @@ import com.github.sonus21.rqueue.repository.MessageBrowsingRepository; import com.github.sonus21.rqueue.service.RqueueMessageMetadataService; import com.github.sonus21.rqueue.utils.RqueueMessageTestUtils; -import com.github.sonus21.rqueue.web.service.impl.RqueueQDetailServiceImpl; +import com.github.sonus21.rqueue.web.RqueueQDetailService; +import com.github.sonus21.rqueue.web.RqueueSystemManagerService; import com.github.sonus21.rqueue.worker.RqueueWorkerRegistry; import java.util.ArrayList; import java.util.Arrays; diff --git a/rqueue-web/src/test/java/com/github/sonus21/rqueue/web/service/RqueueSystemManagerServiceImplTest.java b/rqueue-web/src/test/java/com/github/sonus21/rqueue/web/service/RqueueSystemManagerServiceImplTest.java index 620b7dce..a4b2c916 100644 --- a/rqueue-web/src/test/java/com/github/sonus21/rqueue/web/service/RqueueSystemManagerServiceImplTest.java +++ b/rqueue-web/src/test/java/com/github/sonus21/rqueue/web/service/RqueueSystemManagerServiceImplTest.java @@ -38,7 +38,6 @@ import com.github.sonus21.rqueue.models.event.RqueueBootstrapEvent; import com.github.sonus21.rqueue.service.RqueueMessageMetadataService; import com.github.sonus21.rqueue.utils.TestUtils; -import com.github.sonus21.rqueue.web.service.impl.RqueueSystemManagerServiceImpl; import java.util.Arrays; import java.util.List; import org.junit.jupiter.api.BeforeEach; diff --git a/rqueue-web/src/test/java/com/github/sonus21/rqueue/web/service/RqueueSystemManagerServiceTest.java b/rqueue-web/src/test/java/com/github/sonus21/rqueue/web/service/RqueueSystemManagerServiceTest.java index b74b7941..3bc1a0c5 100644 --- a/rqueue-web/src/test/java/com/github/sonus21/rqueue/web/service/RqueueSystemManagerServiceTest.java +++ b/rqueue-web/src/test/java/com/github/sonus21/rqueue/web/service/RqueueSystemManagerServiceTest.java @@ -35,7 +35,7 @@ import com.github.sonus21.rqueue.models.response.BaseResponse; import com.github.sonus21.rqueue.service.RqueueMessageMetadataService; import com.github.sonus21.rqueue.utils.TestUtils; -import com.github.sonus21.rqueue.web.service.impl.RqueueSystemManagerServiceImpl; +import com.github.sonus21.rqueue.web.RqueueSystemManagerService; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; diff --git a/rqueue-web/src/test/java/com/github/sonus21/rqueue/web/view/DateTimeFunctionTest.java b/rqueue-web/src/test/java/com/github/sonus21/rqueue/web/view/DateTimeFunctionTest.java index 4673a9b5..ad1b06f2 100644 --- a/rqueue-web/src/test/java/com/github/sonus21/rqueue/web/view/DateTimeFunctionTest.java +++ b/rqueue-web/src/test/java/com/github/sonus21/rqueue/web/view/DateTimeFunctionTest.java @@ -20,7 +20,7 @@ import com.github.sonus21.TestBase; import com.github.sonus21.rqueue.CoreUnitTest; -import com.github.sonus21.rqueue.utils.pebble.DateTimeFunction; +import com.github.sonus21.rqueue.web.pebble.DateTimeFunction; import java.util.Collections; import java.util.TimeZone; import org.junit.jupiter.api.BeforeAll;