From e3caf24a9b337805854d167b01535ff42023d573 Mon Sep 17 00:00:00 2001
From: AndrewVolosytnykhThingsboard <avolostnykh@thingsboard.io>
Date: Fri, 16 Apr 2021 20:57:05 +0300
Subject: [PATCH] Removed redundant parameter for AlarmController, AlarmQuery
 and RestClient.getAlarms

---
 .../server/controller/AlarmController.java            | 10 ++--------
 .../server/common/data/alarm/AlarmQuery.java          |  4 ----
 .../java/org/thingsboard/rest/client/RestClient.java  | 11 +++--------
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/controller/AlarmController.java b/application/src/main/java/org/thingsboard/server/controller/AlarmController.java
index 3f32e878f4..9453bd46b7 100644
--- a/application/src/main/java/org/thingsboard/server/controller/AlarmController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/AlarmController.java
@@ -46,8 +46,6 @@ import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
 
-import java.util.UUID;
-
 @RestController
 @TbCoreComponent
 @RequestMapping("/api")
@@ -177,7 +175,6 @@ public class AlarmController extends BaseController {
             @RequestParam(required = false) String sortOrder,
             @RequestParam(required = false) Long startTime,
             @RequestParam(required = false) Long endTime,
-            @RequestParam(required = false) String offset,
             @RequestParam(required = false) Boolean fetchOriginator
     ) throws ThingsboardException {
         checkParameter("EntityId", strEntityId);
@@ -191,12 +188,9 @@ public class AlarmController extends BaseController {
         }
         checkEntityId(entityId, Operation.READ);
         TimePageLink pageLink = createTimePageLink(pageSize, page, textSearch, sortProperty, sortOrder, startTime, endTime);
-        UUID idOffsetUuid = null;
-        if (StringUtils.isNotEmpty(offset)) {
-            idOffsetUuid = toUUID(offset);
-        }
+
         try {
-            return checkNotNull(alarmService.findAlarms(getCurrentUser().getTenantId(), new AlarmQuery(entityId, pageLink, alarmSearchStatus, alarmStatus, fetchOriginator, idOffsetUuid)).get());
+            return checkNotNull(alarmService.findAlarms(getCurrentUser().getTenantId(), new AlarmQuery(entityId, pageLink, alarmSearchStatus, alarmStatus, fetchOriginator)).get());
         } catch (Exception e) {
             throw handleException(e);
         }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmQuery.java b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmQuery.java
index 91bd902e9a..80e3730955 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmQuery.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmQuery.java
@@ -19,11 +19,8 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import org.thingsboard.server.common.data.id.EntityId;
-import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.TimePageLink;
 
-import java.util.UUID;
-
 /**
  * Created by ashvayka on 11.05.17.
  */
@@ -37,6 +34,5 @@ public class AlarmQuery {
     private AlarmSearchStatus searchStatus;
     private AlarmStatus status;
     private Boolean fetchOriginator;
-    private UUID idOffset;
 
 }
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 79b03d2958..0b48487a63 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
@@ -121,13 +121,11 @@ import org.thingsboard.server.common.data.widget.WidgetsBundle;
 import java.io.Closeable;
 import java.io.IOException;
 import java.net.URI;
-import java.util.Arrays;
 import java.util.Collections;
 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;
@@ -306,11 +304,12 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable {
         restTemplate.postForLocation(baseURL + "/api/alarm/{alarmId}/clear", null, alarmId.getId());
     }
 
-    public PageData<AlarmInfo> getAlarms(EntityId entityId, AlarmSearchStatus searchStatus, AlarmStatus status, TimePageLink pageLink, UUID offset, Boolean fetchOriginator) {
+    public PageData<AlarmInfo> getAlarms(EntityId entityId, AlarmSearchStatus searchStatus, AlarmStatus status, TimePageLink pageLink, Boolean 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}&";
@@ -319,11 +318,7 @@ public class RestClient implements ClientHttpRequestInterceptor, Closeable {
             params.put("status", status.name());
             urlSecondPart += "status={status}&";
         }
-        params.put("fetchOriginator", String.valueOf(fetchOriginator));
-        if(offset != null) {
-            params.put("offset", offset.toString());
-            urlSecondPart += "offset={offset}&";
-        }
+
         addTimePageLinkToParam(params, pageLink);
 
         return restTemplate.exchange(