Commit c3bd2a0ebe2e7c005cae7520cc1ab6bf4e7224f8

Authored by Bohdan Smetaniuk
Committed by Andrew Shvayka
1 parent 149ec280

Fixed incorrect params in the get timeseries request

@@ -1646,7 +1646,7 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable { @@ -1646,7 +1646,7 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable {
1646 addPageLinkToParam(params, pageLink); 1646 addPageLinkToParam(params, pageLink);
1647 1647
1648 Map<String, List<JsonNode>> timeseries = restTemplate.exchange( 1648 Map<String, List<JsonNode>> timeseries = restTemplate.exchange(
1649 - baseURL + "/api/plugins/telemetry/{entityType}/{entityId}/values/timeseries?keys={keys}&interval={interval}&agg={agg}&useStrictDataTypes={useStrictDataTypes}&" + getUrlParams(pageLink), 1649 + baseURL + "/api/plugins/telemetry/{entityType}/{entityId}/values/timeseries?keys={keys}&interval={interval}&agg={agg}&useStrictDataTypes={useStrictDataTypes}&" + getUrlParamsTs(pageLink),
1650 HttpMethod.GET, 1650 HttpMethod.GET,
1651 HttpEntity.EMPTY, 1651 HttpEntity.EMPTY,
1652 new ParameterizedTypeReference<Map<String, List<JsonNode>>>() { 1652 new ParameterizedTypeReference<Map<String, List<JsonNode>>>() {
@@ -1998,17 +1998,25 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable { @@ -1998,17 +1998,25 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable {
1998 } 1998 }
1999 1999
2000 private String getUrlParams(TimePageLink pageLink) { 2000 private String getUrlParams(TimePageLink pageLink) {
2001 - String urlParams = "limit={limit}&ascOrder={ascOrder}"; 2001 + return getUrlParams(pageLink, "startTime", "endTime");
  2002 + }
  2003 +
  2004 + private String getUrlParamsTs(TimePageLink pageLink) {
  2005 + return getUrlParams(pageLink, "startTs", "endTs");
  2006 + }
  2007 +
  2008 + private String getUrlParams(TimePageLink pageLink, String startTime, String endTime) {
  2009 + StringBuilder urlParams = new StringBuilder("limit={limit}&ascOrder={ascOrder}");
2002 if (pageLink.getStartTime() != null) { 2010 if (pageLink.getStartTime() != null) {
2003 - urlParams += "&startTime={startTime}"; 2011 + urlParams.append("&").append(startTime).append("={startTime}");
2004 } 2012 }
2005 if (pageLink.getEndTime() != null) { 2013 if (pageLink.getEndTime() != null) {
2006 - urlParams += "&endTime={endTime}"; 2014 + urlParams.append("&").append(endTime).append("={endTime}");
2007 } 2015 }
2008 if (pageLink.getIdOffset() != null) { 2016 if (pageLink.getIdOffset() != null) {
2009 - urlParams += "&offset={offset}"; 2017 + urlParams.append("&offset={offset}");
2010 } 2018 }
2011 - return urlParams; 2019 + return urlParams.toString();
2012 } 2020 }
2013 2021
2014 private String getUrlParams(TextPageLink pageLink) { 2022 private String getUrlParams(TextPageLink pageLink) {