From 599e79fc27b99ab0a43061b99f8e0fa14a2a01be Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Wed, 4 Dec 2019 17:18:39 +0200 Subject: [PATCH] Rest Client fix --- .../thingsboard/client/tools/RestClient.java | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/tools/src/main/java/org/thingsboard/client/tools/RestClient.java b/tools/src/main/java/org/thingsboard/client/tools/RestClient.java index e2d1326380..e8dd83d1fe 100644 --- a/tools/src/main/java/org/thingsboard/client/tools/RestClient.java +++ b/tools/src/main/java/org/thingsboard/client/tools/RestClient.java @@ -1962,16 +1962,30 @@ public class RestClient implements ClientHttpRequestInterceptor { private void addPageLinkToParam(Map params, TimePageLink pageLink) { params.put("limit", String.valueOf(pageLink.getLimit())); - params.put("startTime", String.valueOf(pageLink.getStartTime())); - params.put("endTime", String.valueOf(pageLink.getEndTime())); + if (pageLink.getStartTime() != null) { + params.put("startTime", String.valueOf(pageLink.getStartTime())); + } + if (pageLink.getEndTime() != null) { + params.put("endTime", String.valueOf(pageLink.getEndTime())); + } params.put("ascOrder", String.valueOf(pageLink.isAscOrder())); - params.put("offset", pageLink.getIdOffset().toString()); + if (pageLink.getIdOffset() != null) { + params.put("offset", pageLink.getIdOffset().toString()); + } } private void addPageLinkToParam(Map params, TextPageLink pageLink) { params.put("limit", String.valueOf(pageLink.getLimit())); - params.put("textSearch", pageLink.getTextSearch()); - params.put("idOffset", pageLink.getIdOffset().toString()); - params.put("textOffset", pageLink.getTextOffset()); + if (pageLink.getTextSearch() != null) { + params.put("textSearch", pageLink.getTextSearch()); + } + + if (pageLink.getIdOffset() != null) { + params.put("idOffset", pageLink.getIdOffset().toString()); + + } + if (pageLink.getTextOffset() != null) { + params.put("textOffset", pageLink.getTextOffset()); + } } }