From 91e0a77afd5d34ab324681ceee3db2c164cebd37 Mon Sep 17 00:00:00 2001
From: AndrewVolosytnykhThingsboard <avolostnykh@thingsboard.io>
Date: Mon, 19 Apr 2021 15:36:38 +0300
Subject: [PATCH] Fixed incorrect adding of additional parameters to URL in
 getAlarms method

---
 .../main/java/org/thingsboard/rest/client/RestClient.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 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 0b48487a63..e51117c080 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
@@ -305,18 +305,18 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable {
     }
 
     public PageData<AlarmInfo> getAlarms(EntityId entityId, AlarmSearchStatus searchStatus, AlarmStatus status, TimePageLink pageLink, Boolean fetchOriginator) {
-        String urlSecondPart = "/api/alarm/{entityType}/{entityId}?fetchOriginator={fetchOriginator}&";
+        String urlSecondPart = "/api/alarm/{entityType}/{entityId}?fetchOriginator={fetchOriginator}";
         Map<String, String> params = new HashMap<>();
         params.put("entityType", entityId.getEntityType().name());
         params.put("entityId", entityId.getId().toString());
         params.put("fetchOriginator", String.valueOf(fetchOriginator));
         if(searchStatus != null) {
             params.put("searchStatus", searchStatus.name());
-            urlSecondPart += "searchStatus={searchStatus}&";
+            urlSecondPart += "&searchStatus={searchStatus}";
         }
         if(status != null) {
             params.put("status", status.name());
-            urlSecondPart += "status={status}&";
+            urlSecondPart += "&status={status}";
         }
 
         addTimePageLinkToParam(params, pageLink);