Showing
1 changed file
with
2 additions
and
3 deletions
@@ -19,7 +19,6 @@ import com.fasterxml.jackson.core.JsonProcessingException; | @@ -19,7 +19,6 @@ import com.fasterxml.jackson.core.JsonProcessingException; | ||
19 | import com.fasterxml.jackson.databind.ObjectMapper; | 19 | import com.fasterxml.jackson.databind.ObjectMapper; |
20 | import com.fasterxml.jackson.databind.node.ArrayNode; | 20 | import com.fasterxml.jackson.databind.node.ArrayNode; |
21 | import com.fasterxml.jackson.databind.node.ObjectNode; | 21 | import com.fasterxml.jackson.databind.node.ObjectNode; |
22 | -import com.google.common.util.concurrent.ListenableFuture; | ||
23 | import lombok.Getter; | 22 | import lombok.Getter; |
24 | import lombok.extern.slf4j.Slf4j; | 23 | import lombok.extern.slf4j.Slf4j; |
25 | import org.apache.commons.lang3.StringUtils; | 24 | import org.apache.commons.lang3.StringUtils; |
@@ -51,9 +50,9 @@ import org.thingsboard.server.common.data.asset.Asset; | @@ -51,9 +50,9 @@ import org.thingsboard.server.common.data.asset.Asset; | ||
51 | import org.thingsboard.server.common.data.asset.AssetInfo; | 50 | import org.thingsboard.server.common.data.asset.AssetInfo; |
52 | import org.thingsboard.server.common.data.audit.ActionType; | 51 | import org.thingsboard.server.common.data.audit.ActionType; |
53 | import org.thingsboard.server.common.data.edge.Edge; | 52 | import org.thingsboard.server.common.data.edge.Edge; |
54 | -import org.thingsboard.server.common.data.edge.EdgeInfo; | ||
55 | import org.thingsboard.server.common.data.edge.EdgeEventActionType; | 53 | import org.thingsboard.server.common.data.edge.EdgeEventActionType; |
56 | import org.thingsboard.server.common.data.edge.EdgeEventType; | 54 | import org.thingsboard.server.common.data.edge.EdgeEventType; |
55 | +import org.thingsboard.server.common.data.edge.EdgeInfo; | ||
57 | import org.thingsboard.server.common.data.exception.ThingsboardErrorCode; | 56 | import org.thingsboard.server.common.data.exception.ThingsboardErrorCode; |
58 | import org.thingsboard.server.common.data.exception.ThingsboardException; | 57 | import org.thingsboard.server.common.data.exception.ThingsboardException; |
59 | import org.thingsboard.server.common.data.id.AlarmId; | 58 | import org.thingsboard.server.common.data.id.AlarmId; |
@@ -107,6 +106,7 @@ import org.thingsboard.server.dao.oauth2.OAuth2ConfigTemplateService; | @@ -107,6 +106,7 @@ import org.thingsboard.server.dao.oauth2.OAuth2ConfigTemplateService; | ||
107 | import org.thingsboard.server.dao.oauth2.OAuth2Service; | 106 | import org.thingsboard.server.dao.oauth2.OAuth2Service; |
108 | import org.thingsboard.server.dao.relation.RelationService; | 107 | import org.thingsboard.server.dao.relation.RelationService; |
109 | import org.thingsboard.server.dao.rule.RuleChainService; | 108 | import org.thingsboard.server.dao.rule.RuleChainService; |
109 | +import org.thingsboard.server.dao.tenant.TbTenantProfileCache; | ||
110 | import org.thingsboard.server.dao.tenant.TenantProfileService; | 110 | import org.thingsboard.server.dao.tenant.TenantProfileService; |
111 | import org.thingsboard.server.dao.tenant.TenantService; | 111 | import org.thingsboard.server.dao.tenant.TenantService; |
112 | import org.thingsboard.server.dao.user.UserService; | 112 | import org.thingsboard.server.dao.user.UserService; |
@@ -123,7 +123,6 @@ import org.thingsboard.server.service.edge.rpc.EdgeGrpcService; | @@ -123,7 +123,6 @@ import org.thingsboard.server.service.edge.rpc.EdgeGrpcService; | ||
123 | import org.thingsboard.server.service.edge.rpc.init.SyncEdgeService; | 123 | import org.thingsboard.server.service.edge.rpc.init.SyncEdgeService; |
124 | import org.thingsboard.server.service.lwm2m.LwM2MModelsRepository; | 124 | import org.thingsboard.server.service.lwm2m.LwM2MModelsRepository; |
125 | import org.thingsboard.server.service.profile.TbDeviceProfileCache; | 125 | import org.thingsboard.server.service.profile.TbDeviceProfileCache; |
126 | -import org.thingsboard.server.dao.tenant.TbTenantProfileCache; | ||
127 | import org.thingsboard.server.service.queue.TbClusterService; | 126 | import org.thingsboard.server.service.queue.TbClusterService; |
128 | import org.thingsboard.server.service.security.model.SecurityUser; | 127 | import org.thingsboard.server.service.security.model.SecurityUser; |
129 | import org.thingsboard.server.service.security.permission.AccessControlService; | 128 | import org.thingsboard.server.service.security.permission.AccessControlService; |