Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b41e0fd
docs: create release notes for 4.0.0-RC4
sonus21 May 2, 2026
460527f
docs: update release notes to emphasize NATS backend support
sonus21 May 2, 2026
364e7c3
refactor: move service interfaces from rqueue-web to rqueue-core web …
sonus21 May 2, 2026
ae30092
refactor: reorganize service interfaces and utilities in rqueue-core …
sonus21 May 2, 2026
e48da7a
refactor: remove duplicate metrics aggregator service from rqueue-web
sonus21 May 2, 2026
65842f5
refactor: remove service interface files from rqueue-web
sonus21 May 2, 2026
a34658d
refactor: remove release notes file
sonus21 May 2, 2026
6385d01
fix: update test imports for service interfaces moved to rqueue-core
sonus21 May 2, 2026
d975062
fix: update test imports for service interfaces moved to rqueue-core
sonus21 May 2, 2026
b619680
ci: add coveralls integration to push coverage reports
sonus21 May 2, 2026
5ce48bd
ci: add conditional check and verbose logging for coveralls step
sonus21 May 2, 2026
b157aa6
ci: fail if COVERALLS_REPO_TOKEN is not set and add verbose logging
sonus21 May 2, 2026
5400d21
ci: add debug logging for coveralls integration
sonus21 May 2, 2026
c450641
ci: add environment variables for coveralls github actions detection
sonus21 May 2, 2026
c0a5903
ci: enable coveralls debug output to diagnose request payload
sonus21 May 2, 2026
d59a2d2
ci: fix coveralls integration for github actions
sonus21 May 2, 2026
130bfea
fix: use github.head_ref for CI_BRANCH in Coveralls integration
sonus21 May 2, 2026
6660aba
ci: wire GITHUB_TOKEN + BUILD_NUMBER for Coveralls (github-actions)
sonus21 May 2, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .github/workflows/java-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ coverallsJacoco {
reportSourceSets = publishedProjects.collectMany {
it.sourceSets.main.allSource.srcDirs
}
coverallsRequest = file("build/coveralls-request.json")
}

def javaFormatSources = providers.provider {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -57,7 +57,7 @@

@Component
@Slf4j
public class RqueueJobMetricsAggregatorService
public class RqueueMetricsAggregatorService
implements ApplicationListener<RqueueExecutionEvent>, DisposableBean, SmartLifecycle {

private final RqueueConfig rqueueConfig;
Expand All @@ -73,7 +73,7 @@ public class RqueueJobMetricsAggregatorService
private List<Future<?>> eventAggregatorTasks;

@Autowired
public RqueueJobMetricsAggregatorService(
public RqueueMetricsAggregatorService(
RqueueConfig rqueueConfig,
RqueueWebConfig rqueueWebConfig,
RqueueLockManager rqueueLockManager,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*
*/

package com.github.sonus21.rqueue.web.service;
package com.github.sonus21.rqueue.web;

import org.springframework.ui.Model;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
3 changes: 0 additions & 3 deletions rqueue-nats/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
3 changes: 0 additions & 3 deletions rqueue-redis/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading
Loading