From fad1040f249a74e2be3d4fcf63b6def20736230f Mon Sep 17 00:00:00 2001 From: AndrewVolosytnykhThingsboard Date: Wed, 14 Apr 2021 13:26:30 +0300 Subject: [PATCH] Refactoring: offset added to request URL --- .../main/java/org/thingsboard/rest/client/RestClient.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java b/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java index 0e04cc132e..e39284c547 100644 --- a/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java +++ b/rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java @@ -127,6 +127,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -305,7 +306,7 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable { restTemplate.postForLocation(baseURL + "/api/alarm/{alarmId}/clear", null, alarmId.getId()); } - public PageData getAlarms(EntityId entityId, AlarmSearchStatus searchStatus, AlarmStatus status, TimePageLink pageLink, String offset, Boolean fetchOriginator) { + public PageData getAlarms(EntityId entityId, AlarmSearchStatus searchStatus, AlarmStatus status, TimePageLink pageLink, UUID offset, Boolean fetchOriginator) { String urlSecondPart = "/api/alarm/{entityType}/{entityId}?fetchOriginator={fetchOriginator}&"; Map params = new HashMap<>(); params.put("entityType", entityId.getEntityType().name()); @@ -319,7 +320,10 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable { urlSecondPart += "status={status}&"; } params.put("fetchOriginator", String.valueOf(fetchOriginator)); - params.put("offset", offset); + if(offset != null) { + params.put("offset", offset.toString()); + urlSecondPart += "offset={offset}&"; + } addTimePageLinkToParam(params, pageLink); return restTemplate.exchange(