From 6f7d86f9206cf65b42ed04fa6e32bb8ff7ab41a3 Mon Sep 17 00:00:00 2001 From: Oleksandra Matviienko Date: Thu, 30 Apr 2026 14:23:10 +0200 Subject: [PATCH] Return 400 instead of 500 for invalid aggHistory time range --- .../thingsboard/server/controller/EntityQueryController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/src/main/java/org/thingsboard/server/controller/EntityQueryController.java b/application/src/main/java/org/thingsboard/server/controller/EntityQueryController.java index 46eaa509e3..49e7e6d1eb 100644 --- a/application/src/main/java/org/thingsboard/server/controller/EntityQueryController.java +++ b/application/src/main/java/org/thingsboard/server/controller/EntityQueryController.java @@ -32,6 +32,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.context.request.async.DeferredResult; import org.thingsboard.server.common.data.edqs.EdqsState; import org.thingsboard.server.common.data.edqs.ToCoreEdqsRequest; +import org.thingsboard.server.common.data.exception.ThingsboardErrorCode; import org.thingsboard.server.common.data.exception.ThingsboardException; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.UserId; @@ -165,7 +166,7 @@ public class EntityQueryController extends BaseController { checkNotNull(request.getAggHistoryCmd()); AggHistoryCmd cmd = request.getAggHistoryCmd(); if (cmd.getEndTs() < cmd.getStartTs()) { - throw new IllegalArgumentException("endTs must be >= startTs"); + throw new ThingsboardException("endTs must be >= startTs", ThingsboardErrorCode.BAD_REQUEST_PARAMS); } EntityDataPageLink pageLink = request.getQuery().getPageLink(); if (pageLink != null && pageLink.getPageSize() > MAX_PAGE_SIZE) {