简柏林 / thingskit · Commits

Commit 5b8ce2fb69f18486643c195cdbd241a5e5044ffd

Authored by hamza.slama
Committed by Andrew Shvayka
1 parent 7869fb5e

Move AlarmId To Id Package

Inline Side-by-side
Showing 15 changed files with 14 additions and 17 deletions
@@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.ResponseStatus; @@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.ResponseStatus;
28 import org.springframework.web.bind.annotation.RestController; 28 import org.springframework.web.bind.annotation.RestController;
29 import org.thingsboard.server.common.data.EntityType; 29 import org.thingsboard.server.common.data.EntityType;
30 import org.thingsboard.server.common.data.alarm.Alarm; 30 import org.thingsboard.server.common.data.alarm.Alarm;
31 -import org.thingsboard.server.common.data.alarm.AlarmId; 31 +import org.thingsboard.server.common.data.id.AlarmId;
32 import org.thingsboard.server.common.data.alarm.AlarmInfo; 32 import org.thingsboard.server.common.data.alarm.AlarmInfo;
33 import org.thingsboard.server.common.data.alarm.AlarmQuery; 33 import org.thingsboard.server.common.data.alarm.AlarmQuery;
34 import org.thingsboard.server.common.data.alarm.AlarmSearchStatus; 34 import org.thingsboard.server.common.data.alarm.AlarmSearchStatus;
@@ -38,7 +38,7 @@ import org.thingsboard.server.common.data.HasName; @@ -38,7 +38,7 @@ import org.thingsboard.server.common.data.HasName;
38 import org.thingsboard.server.common.data.Tenant; 38 import org.thingsboard.server.common.data.Tenant;
39 import org.thingsboard.server.common.data.User; 39 import org.thingsboard.server.common.data.User;
40 import org.thingsboard.server.common.data.alarm.Alarm; 40 import org.thingsboard.server.common.data.alarm.Alarm;
41 -import org.thingsboard.server.common.data.alarm.AlarmId; 41 +import org.thingsboard.server.common.data.id.AlarmId;
42 import org.thingsboard.server.common.data.alarm.AlarmInfo; 42 import org.thingsboard.server.common.data.alarm.AlarmInfo;
43 import org.thingsboard.server.common.data.asset.Asset; 43 import org.thingsboard.server.common.data.asset.Asset;
44 import org.thingsboard.server.common.data.audit.ActionType; 44 import org.thingsboard.server.common.data.audit.ActionType;
@@ -18,7 +18,7 @@ package org.thingsboard.server.dao.alarm; @@ -18,7 +18,7 @@ package org.thingsboard.server.dao.alarm;
18 import com.fasterxml.jackson.databind.JsonNode; 18 import com.fasterxml.jackson.databind.JsonNode;
19 import com.google.common.util.concurrent.ListenableFuture; 19 import com.google.common.util.concurrent.ListenableFuture;
20 import org.thingsboard.server.common.data.alarm.Alarm; 20 import org.thingsboard.server.common.data.alarm.Alarm;
21 -import org.thingsboard.server.common.data.alarm.AlarmId; 21 +import org.thingsboard.server.common.data.id.AlarmId;
22 import org.thingsboard.server.common.data.alarm.AlarmInfo; 22 import org.thingsboard.server.common.data.alarm.AlarmInfo;
23 import org.thingsboard.server.common.data.alarm.AlarmQuery; 23 import org.thingsboard.server.common.data.alarm.AlarmQuery;
24 import org.thingsboard.server.common.data.alarm.AlarmSearchStatus; 24 import org.thingsboard.server.common.data.alarm.AlarmSearchStatus;
@@ -23,6 +23,7 @@ import lombok.Data; @@ -23,6 +23,7 @@ import lombok.Data;
23 import org.thingsboard.server.common.data.BaseData; 23 import org.thingsboard.server.common.data.BaseData;
24 import org.thingsboard.server.common.data.HasName; 24 import org.thingsboard.server.common.data.HasName;
25 import org.thingsboard.server.common.data.HasTenantId; 25 import org.thingsboard.server.common.data.HasTenantId;
  26 +import org.thingsboard.server.common.data.id.AlarmId;
26 import org.thingsboard.server.common.data.id.EntityId; 27 import org.thingsboard.server.common.data.id.EntityId;
27 import org.thingsboard.server.common.data.id.TenantId; 28 import org.thingsboard.server.common.data.id.TenantId;
28 29
common/data/src/main/java/org/thingsboard/server/common/data/id/AlarmId.java renamed from common/data/src/main/java/org/thingsboard/server/common/data/alarm/AlarmId.java
@@ -13,14 +13,12 @@ @@ -13,14 +13,12 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.thingsboard.server.common.data.alarm; 16 +package org.thingsboard.server.common.data.id;
17 17
18 import com.fasterxml.jackson.annotation.JsonCreator; 18 import com.fasterxml.jackson.annotation.JsonCreator;
19 import com.fasterxml.jackson.annotation.JsonIgnore; 19 import com.fasterxml.jackson.annotation.JsonIgnore;
20 import com.fasterxml.jackson.annotation.JsonProperty; 20 import com.fasterxml.jackson.annotation.JsonProperty;
21 import org.thingsboard.server.common.data.EntityType; 21 import org.thingsboard.server.common.data.EntityType;
22 -import org.thingsboard.server.common.data.id.EntityId;  
23 -import org.thingsboard.server.common.data.id.UUIDBased;  
24 22
25 import java.util.UUID; 23 import java.util.UUID;
26 24
@@ -16,7 +16,6 @@ @@ -16,7 +16,6 @@
16 package org.thingsboard.server.common.data.id; 16 package org.thingsboard.server.common.data.id;
17 17
18 import org.thingsboard.server.common.data.EntityType; 18 import org.thingsboard.server.common.data.EntityType;
19 -import org.thingsboard.server.common.data.alarm.AlarmId;  
20 19
21 import java.util.UUID; 20 import java.util.UUID;
22 21
@@ -29,7 +29,7 @@ import org.springframework.util.StringUtils; @@ -29,7 +29,7 @@ import org.springframework.util.StringUtils;
29 import org.thingsboard.common.util.ThingsBoardThreadFactory; 29 import org.thingsboard.common.util.ThingsBoardThreadFactory;
30 import org.thingsboard.server.common.data.Tenant; 30 import org.thingsboard.server.common.data.Tenant;
31 import org.thingsboard.server.common.data.alarm.Alarm; 31 import org.thingsboard.server.common.data.alarm.Alarm;
32 -import org.thingsboard.server.common.data.alarm.AlarmId; 32 +import org.thingsboard.server.common.data.id.AlarmId;
33 import org.thingsboard.server.common.data.alarm.AlarmInfo; 33 import org.thingsboard.server.common.data.alarm.AlarmInfo;
34 import org.thingsboard.server.common.data.alarm.AlarmQuery; 34 import org.thingsboard.server.common.data.alarm.AlarmQuery;
35 import org.thingsboard.server.common.data.alarm.AlarmSearchStatus; 35 import org.thingsboard.server.common.data.alarm.AlarmSearchStatus;
@@ -23,7 +23,7 @@ import lombok.extern.slf4j.Slf4j; @@ -23,7 +23,7 @@ import lombok.extern.slf4j.Slf4j;
23 import org.springframework.beans.factory.annotation.Autowired; 23 import org.springframework.beans.factory.annotation.Autowired;
24 import org.springframework.stereotype.Service; 24 import org.springframework.stereotype.Service;
25 import org.thingsboard.server.common.data.HasName; 25 import org.thingsboard.server.common.data.HasName;
26 -import org.thingsboard.server.common.data.alarm.AlarmId; 26 +import org.thingsboard.server.common.data.id.AlarmId;
27 import org.thingsboard.server.common.data.id.AssetId; 27 import org.thingsboard.server.common.data.id.AssetId;
28 import org.thingsboard.server.common.data.id.CustomerId; 28 import org.thingsboard.server.common.data.id.CustomerId;
29 import org.thingsboard.server.common.data.id.DashboardId; 29 import org.thingsboard.server.common.data.id.DashboardId;
@@ -27,7 +27,7 @@ import org.springframework.util.CollectionUtils; @@ -27,7 +27,7 @@ import org.springframework.util.CollectionUtils;
27 import org.springframework.util.StringUtils; 27 import org.springframework.util.StringUtils;
28 import org.thingsboard.server.common.data.EntityType; 28 import org.thingsboard.server.common.data.EntityType;
29 import org.thingsboard.server.common.data.alarm.Alarm; 29 import org.thingsboard.server.common.data.alarm.Alarm;
30 -import org.thingsboard.server.common.data.alarm.AlarmId; 30 +import org.thingsboard.server.common.data.id.AlarmId;
31 import org.thingsboard.server.common.data.alarm.AlarmSeverity; 31 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
32 import org.thingsboard.server.common.data.alarm.AlarmStatus; 32 import org.thingsboard.server.common.data.alarm.AlarmStatus;
33 import org.thingsboard.server.common.data.id.EntityIdFactory; 33 import org.thingsboard.server.common.data.id.EntityIdFactory;
@@ -26,7 +26,7 @@ import org.springframework.util.StringUtils; @@ -26,7 +26,7 @@ import org.springframework.util.StringUtils;
26 import org.thingsboard.server.common.data.EntityType; 26 import org.thingsboard.server.common.data.EntityType;
27 import org.thingsboard.server.common.data.UUIDConverter; 27 import org.thingsboard.server.common.data.UUIDConverter;
28 import org.thingsboard.server.common.data.alarm.Alarm; 28 import org.thingsboard.server.common.data.alarm.Alarm;
29 -import org.thingsboard.server.common.data.alarm.AlarmId; 29 +import org.thingsboard.server.common.data.id.AlarmId;
30 import org.thingsboard.server.common.data.alarm.AlarmSeverity; 30 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
31 import org.thingsboard.server.common.data.alarm.AlarmStatus; 31 import org.thingsboard.server.common.data.alarm.AlarmStatus;
32 import org.thingsboard.server.common.data.id.EntityIdFactory; 32 import org.thingsboard.server.common.data.id.EntityIdFactory;
@@ -19,7 +19,7 @@ import com.google.common.util.concurrent.ListenableFuture; @@ -19,7 +19,7 @@ import com.google.common.util.concurrent.ListenableFuture;
19 import org.junit.Test; 19 import org.junit.Test;
20 import org.springframework.beans.factory.annotation.Autowired; 20 import org.springframework.beans.factory.annotation.Autowired;
21 import org.thingsboard.server.common.data.alarm.Alarm; 21 import org.thingsboard.server.common.data.alarm.Alarm;
22 -import org.thingsboard.server.common.data.alarm.AlarmId; 22 +import org.thingsboard.server.common.data.id.AlarmId;
23 import org.thingsboard.server.common.data.alarm.AlarmStatus; 23 import org.thingsboard.server.common.data.alarm.AlarmStatus;
24 import org.thingsboard.server.common.data.id.DeviceId; 24 import org.thingsboard.server.common.data.id.DeviceId;
25 import org.thingsboard.server.common.data.id.TenantId; 25 import org.thingsboard.server.common.data.id.TenantId;
@@ -45,7 +45,7 @@ import org.thingsboard.server.common.data.Tenant; @@ -45,7 +45,7 @@ import org.thingsboard.server.common.data.Tenant;
45 import org.thingsboard.server.common.data.UpdateMessage; 45 import org.thingsboard.server.common.data.UpdateMessage;
46 import org.thingsboard.server.common.data.User; 46 import org.thingsboard.server.common.data.User;
47 import org.thingsboard.server.common.data.alarm.Alarm; 47 import org.thingsboard.server.common.data.alarm.Alarm;
48 -import org.thingsboard.server.common.data.alarm.AlarmId; 48 +import org.thingsboard.server.common.data.id.AlarmId;
49 import org.thingsboard.server.common.data.alarm.AlarmInfo; 49 import org.thingsboard.server.common.data.alarm.AlarmInfo;
50 import org.thingsboard.server.common.data.alarm.AlarmSearchStatus; 50 import org.thingsboard.server.common.data.alarm.AlarmSearchStatus;
51 import org.thingsboard.server.common.data.alarm.AlarmSeverity; 51 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
@@ -98,7 +98,6 @@ import java.util.HashMap; @@ -98,7 +98,6 @@ import java.util.HashMap;
98 import java.util.List; 98 import java.util.List;
99 import java.util.Map; 99 import java.util.Map;
100 import java.util.Optional; 100 import java.util.Optional;
101 -import java.util.UUID;  
102 import java.util.concurrent.ExecutorService; 101 import java.util.concurrent.ExecutorService;
103 import java.util.concurrent.Executors; 102 import java.util.concurrent.Executors;
104 import java.util.concurrent.Future; 103 import java.util.concurrent.Future;
@@ -21,7 +21,7 @@ import com.google.common.util.concurrent.MoreExecutors; @@ -21,7 +21,7 @@ import com.google.common.util.concurrent.MoreExecutors;
21 import org.thingsboard.rule.engine.api.TbContext; 21 import org.thingsboard.rule.engine.api.TbContext;
22 import org.thingsboard.rule.engine.api.TbNodeException; 22 import org.thingsboard.rule.engine.api.TbNodeException;
23 import org.thingsboard.server.common.data.alarm.Alarm; 23 import org.thingsboard.server.common.data.alarm.Alarm;
24 -import org.thingsboard.server.common.data.alarm.AlarmId; 24 +import org.thingsboard.server.common.data.id.AlarmId;
25 import org.thingsboard.server.common.data.id.EntityId; 25 import org.thingsboard.server.common.data.id.EntityId;
26 26
27 public class EntitiesAlarmOriginatorIdAsyncLoader { 27 public class EntitiesAlarmOriginatorIdAsyncLoader {
@@ -22,7 +22,7 @@ import org.thingsboard.rule.engine.api.TbContext; @@ -22,7 +22,7 @@ import org.thingsboard.rule.engine.api.TbContext;
22 import org.thingsboard.rule.engine.api.TbNodeException; 22 import org.thingsboard.rule.engine.api.TbNodeException;
23 import org.thingsboard.server.common.data.BaseData; 23 import org.thingsboard.server.common.data.BaseData;
24 import org.thingsboard.server.common.data.EntityFieldsData; 24 import org.thingsboard.server.common.data.EntityFieldsData;
25 -import org.thingsboard.server.common.data.alarm.AlarmId; 25 +import org.thingsboard.server.common.data.id.AlarmId;
26 import org.thingsboard.server.common.data.id.AssetId; 26 import org.thingsboard.server.common.data.id.AssetId;
27 import org.thingsboard.server.common.data.id.CustomerId; 27 import org.thingsboard.server.common.data.id.CustomerId;
28 import org.thingsboard.server.common.data.id.DeviceId; 28 import org.thingsboard.server.common.data.id.DeviceId;
@@ -21,7 +21,7 @@ import com.google.common.util.concurrent.MoreExecutors; @@ -21,7 +21,7 @@ import com.google.common.util.concurrent.MoreExecutors;
21 import org.thingsboard.rule.engine.api.TbContext; 21 import org.thingsboard.rule.engine.api.TbContext;
22 import org.thingsboard.rule.engine.api.TbNodeException; 22 import org.thingsboard.rule.engine.api.TbNodeException;
23 import org.thingsboard.server.common.data.HasTenantId; 23 import org.thingsboard.server.common.data.HasTenantId;
24 -import org.thingsboard.server.common.data.alarm.AlarmId; 24 +import org.thingsboard.server.common.data.id.AlarmId;
25 import org.thingsboard.server.common.data.id.AssetId; 25 import org.thingsboard.server.common.data.id.AssetId;
26 import org.thingsboard.server.common.data.id.CustomerId; 26 import org.thingsboard.server.common.data.id.CustomerId;
27 import org.thingsboard.server.common.data.id.DeviceId; 27 import org.thingsboard.server.common.data.id.DeviceId;