Commit 91e0a77afd5d34ab324681ceee3db2c164cebd37

Authored by AndrewVolosytnykhThingsboard
Committed by Andrew Shvayka
1 parent e3caf24a

Fixed incorrect adding of additional parameters to URL in getAlarms method

@@ -305,18 +305,18 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable { @@ -305,18 +305,18 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable {
305 } 305 }
306 306
307 public PageData<AlarmInfo> getAlarms(EntityId entityId, AlarmSearchStatus searchStatus, AlarmStatus status, TimePageLink pageLink, Boolean fetchOriginator) { 307 public PageData<AlarmInfo> getAlarms(EntityId entityId, AlarmSearchStatus searchStatus, AlarmStatus status, TimePageLink pageLink, Boolean fetchOriginator) {
308 - String urlSecondPart = "/api/alarm/{entityType}/{entityId}?fetchOriginator={fetchOriginator}&"; 308 + String urlSecondPart = "/api/alarm/{entityType}/{entityId}?fetchOriginator={fetchOriginator}";
309 Map<String, String> params = new HashMap<>(); 309 Map<String, String> params = new HashMap<>();
310 params.put("entityType", entityId.getEntityType().name()); 310 params.put("entityType", entityId.getEntityType().name());
311 params.put("entityId", entityId.getId().toString()); 311 params.put("entityId", entityId.getId().toString());
312 params.put("fetchOriginator", String.valueOf(fetchOriginator)); 312 params.put("fetchOriginator", String.valueOf(fetchOriginator));
313 if(searchStatus != null) { 313 if(searchStatus != null) {
314 params.put("searchStatus", searchStatus.name()); 314 params.put("searchStatus", searchStatus.name());
315 - urlSecondPart += "searchStatus={searchStatus}&"; 315 + urlSecondPart += "&searchStatus={searchStatus}";
316 } 316 }
317 if(status != null) { 317 if(status != null) {
318 params.put("status", status.name()); 318 params.put("status", status.name());
319 - urlSecondPart += "status={status}&"; 319 + urlSecondPart += "&status={status}";
320 } 320 }
321 321
322 addTimePageLinkToParam(params, pageLink); 322 addTimePageLinkToParam(params, pageLink);