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