Showing
15 changed files
with
15 additions
and
14 deletions
| ... | ... | @@ -48,6 +48,7 @@ import org.thingsboard.server.common.data.id.TenantId; |
| 48 | 48 | import org.thingsboard.server.common.data.page.PageData; |
| 49 | 49 | import org.thingsboard.server.common.data.page.PageLink; |
| 50 | 50 | import org.thingsboard.common.util.JacksonUtil; |
| 51 | +import org.thingsboard.server.common.data.page.TimePageLink; | |
| 51 | 52 | import org.thingsboard.server.queue.util.TbCoreComponent; |
| 52 | 53 | import org.thingsboard.server.service.security.model.SecurityUser; |
| 53 | 54 | import org.thingsboard.server.service.security.permission.Operation; | ... | ... |
| ... | ... | @@ -71,7 +71,7 @@ import org.thingsboard.server.common.data.security.UserCredentials; |
| 71 | 71 | import org.thingsboard.server.common.data.widget.WidgetType; |
| 72 | 72 | import org.thingsboard.server.common.data.widget.WidgetsBundle; |
| 73 | 73 | import org.thingsboard.server.common.transport.util.JsonUtils; |
| 74 | -import org.thingsboard.server.dao.util.mapping.JacksonUtil; | |
| 74 | +import org.thingsboard.common.util.JacksonUtil; | |
| 75 | 75 | import org.thingsboard.server.gen.edge.AdminSettingsUpdateMsg; |
| 76 | 76 | import org.thingsboard.server.gen.edge.AlarmUpdateMsg; |
| 77 | 77 | import org.thingsboard.server.gen.edge.AssetUpdateMsg; | ... | ... |
| ... | ... | @@ -17,7 +17,7 @@ package org.thingsboard.server.service.edge.rpc.constructor; |
| 17 | 17 | |
| 18 | 18 | import org.springframework.stereotype.Component; |
| 19 | 19 | import org.thingsboard.server.common.data.AdminSettings; |
| 20 | -import org.thingsboard.server.dao.util.mapping.JacksonUtil; | |
| 20 | +import org.thingsboard.common.util.JacksonUtil; | |
| 21 | 21 | import org.thingsboard.server.gen.edge.AdminSettingsUpdateMsg; |
| 22 | 22 | import org.thingsboard.server.queue.util.TbCoreComponent; |
| 23 | 23 | ... | ... |
| ... | ... | @@ -25,7 +25,7 @@ import org.thingsboard.server.common.data.id.TenantId; |
| 25 | 25 | import org.thingsboard.server.dao.asset.AssetService; |
| 26 | 26 | import org.thingsboard.server.dao.device.DeviceService; |
| 27 | 27 | import org.thingsboard.server.dao.entityview.EntityViewService; |
| 28 | -import org.thingsboard.server.dao.util.mapping.JacksonUtil; | |
| 28 | +import org.thingsboard.common.util.JacksonUtil; | |
| 29 | 29 | import org.thingsboard.server.gen.edge.AlarmUpdateMsg; |
| 30 | 30 | import org.thingsboard.server.gen.edge.UpdateMsgType; |
| 31 | 31 | import org.thingsboard.server.queue.util.TbCoreComponent; | ... | ... |
| ... | ... | @@ -19,7 +19,7 @@ import org.springframework.stereotype.Component; |
| 19 | 19 | import org.thingsboard.server.common.data.asset.Asset; |
| 20 | 20 | import org.thingsboard.server.common.data.id.AssetId; |
| 21 | 21 | import org.thingsboard.server.common.data.id.CustomerId; |
| 22 | -import org.thingsboard.server.dao.util.mapping.JacksonUtil; | |
| 22 | +import org.thingsboard.common.util.JacksonUtil; | |
| 23 | 23 | import org.thingsboard.server.gen.edge.AssetUpdateMsg; |
| 24 | 24 | import org.thingsboard.server.gen.edge.UpdateMsgType; |
| 25 | 25 | import org.thingsboard.server.queue.util.TbCoreComponent; | ... | ... |
| ... | ... | @@ -18,7 +18,7 @@ package org.thingsboard.server.service.edge.rpc.constructor; |
| 18 | 18 | import org.springframework.stereotype.Component; |
| 19 | 19 | import org.thingsboard.server.common.data.Customer; |
| 20 | 20 | import org.thingsboard.server.common.data.id.CustomerId; |
| 21 | -import org.thingsboard.server.dao.util.mapping.JacksonUtil; | |
| 21 | +import org.thingsboard.common.util.JacksonUtil; | |
| 22 | 22 | import org.thingsboard.server.gen.edge.CustomerUpdateMsg; |
| 23 | 23 | import org.thingsboard.server.gen.edge.UpdateMsgType; |
| 24 | 24 | import org.thingsboard.server.queue.util.TbCoreComponent; | ... | ... |
| ... | ... | @@ -19,7 +19,7 @@ import org.springframework.stereotype.Component; |
| 19 | 19 | import org.thingsboard.server.common.data.Dashboard; |
| 20 | 20 | import org.thingsboard.server.common.data.id.CustomerId; |
| 21 | 21 | import org.thingsboard.server.common.data.id.DashboardId; |
| 22 | -import org.thingsboard.server.dao.util.mapping.JacksonUtil; | |
| 22 | +import org.thingsboard.common.util.JacksonUtil; | |
| 23 | 23 | import org.thingsboard.server.gen.edge.DashboardUpdateMsg; |
| 24 | 24 | import org.thingsboard.server.gen.edge.UpdateMsgType; |
| 25 | 25 | import org.thingsboard.server.queue.util.TbCoreComponent; | ... | ... |
| ... | ... | @@ -18,11 +18,11 @@ package org.thingsboard.server.service.edge.rpc.constructor; |
| 18 | 18 | import com.fasterxml.jackson.databind.JsonNode; |
| 19 | 19 | import com.fasterxml.jackson.databind.ObjectMapper; |
| 20 | 20 | import org.springframework.stereotype.Component; |
| 21 | +import org.thingsboard.common.util.JacksonUtil; | |
| 21 | 22 | import org.thingsboard.server.common.data.Device; |
| 22 | 23 | import org.thingsboard.server.common.data.id.CustomerId; |
| 23 | 24 | import org.thingsboard.server.common.data.id.DeviceId; |
| 24 | 25 | import org.thingsboard.server.common.data.security.DeviceCredentials; |
| 25 | -import org.thingsboard.server.dao.util.mapping.JacksonUtil; | |
| 26 | 26 | import org.thingsboard.server.gen.edge.DeviceCredentialsUpdateMsg; |
| 27 | 27 | import org.thingsboard.server.gen.edge.DeviceRpcCallMsg; |
| 28 | 28 | import org.thingsboard.server.gen.edge.DeviceUpdateMsg; | ... | ... |
| ... | ... | @@ -19,7 +19,7 @@ import org.springframework.stereotype.Component; |
| 19 | 19 | import org.thingsboard.server.common.data.EntityView; |
| 20 | 20 | import org.thingsboard.server.common.data.id.CustomerId; |
| 21 | 21 | import org.thingsboard.server.common.data.id.EntityViewId; |
| 22 | -import org.thingsboard.server.dao.util.mapping.JacksonUtil; | |
| 22 | +import org.thingsboard.common.util.JacksonUtil; | |
| 23 | 23 | import org.thingsboard.server.gen.edge.EdgeEntityType; |
| 24 | 24 | import org.thingsboard.server.gen.edge.EntityViewUpdateMsg; |
| 25 | 25 | import org.thingsboard.server.gen.edge.UpdateMsgType; | ... | ... |
| ... | ... | @@ -17,7 +17,7 @@ package org.thingsboard.server.service.edge.rpc.constructor; |
| 17 | 17 | |
| 18 | 18 | import org.springframework.stereotype.Component; |
| 19 | 19 | import org.thingsboard.server.common.data.relation.EntityRelation; |
| 20 | -import org.thingsboard.server.dao.util.mapping.JacksonUtil; | |
| 20 | +import org.thingsboard.common.util.JacksonUtil; | |
| 21 | 21 | import org.thingsboard.server.gen.edge.RelationUpdateMsg; |
| 22 | 22 | import org.thingsboard.server.gen.edge.UpdateMsgType; |
| 23 | 23 | import org.thingsboard.server.queue.util.TbCoreComponent; | ... | ... |
| ... | ... | @@ -25,7 +25,7 @@ import org.thingsboard.server.common.data.rule.RuleChain; |
| 25 | 25 | import org.thingsboard.server.common.data.rule.RuleChainConnectionInfo; |
| 26 | 26 | import org.thingsboard.server.common.data.rule.RuleChainMetaData; |
| 27 | 27 | import org.thingsboard.server.common.data.rule.RuleNode; |
| 28 | -import org.thingsboard.server.dao.util.mapping.JacksonUtil; | |
| 28 | +import org.thingsboard.common.util.JacksonUtil; | |
| 29 | 29 | import org.thingsboard.server.gen.edge.NodeConnectionInfoProto; |
| 30 | 30 | import org.thingsboard.server.gen.edge.RuleChainConnectionInfoProto; |
| 31 | 31 | import org.thingsboard.server.gen.edge.RuleChainMetadataUpdateMsg; | ... | ... |
| ... | ... | @@ -20,7 +20,7 @@ import org.thingsboard.server.common.data.User; |
| 20 | 20 | import org.thingsboard.server.common.data.id.CustomerId; |
| 21 | 21 | import org.thingsboard.server.common.data.id.UserId; |
| 22 | 22 | import org.thingsboard.server.common.data.security.UserCredentials; |
| 23 | -import org.thingsboard.server.dao.util.mapping.JacksonUtil; | |
| 23 | +import org.thingsboard.common.util.JacksonUtil; | |
| 24 | 24 | import org.thingsboard.server.gen.edge.UpdateMsgType; |
| 25 | 25 | import org.thingsboard.server.gen.edge.UserCredentialsUpdateMsg; |
| 26 | 26 | import org.thingsboard.server.gen.edge.UserUpdateMsg; | ... | ... |
| ... | ... | @@ -19,7 +19,7 @@ import org.springframework.stereotype.Component; |
| 19 | 19 | import org.thingsboard.server.common.data.id.TenantId; |
| 20 | 20 | import org.thingsboard.server.common.data.id.WidgetTypeId; |
| 21 | 21 | import org.thingsboard.server.common.data.widget.WidgetType; |
| 22 | -import org.thingsboard.server.dao.util.mapping.JacksonUtil; | |
| 22 | +import org.thingsboard.common.util.JacksonUtil; | |
| 23 | 23 | import org.thingsboard.server.gen.edge.UpdateMsgType; |
| 24 | 24 | import org.thingsboard.server.gen.edge.WidgetTypeUpdateMsg; |
| 25 | 25 | import org.thingsboard.server.queue.util.TbCoreComponent; | ... | ... |
| ... | ... | @@ -47,7 +47,7 @@ import org.thingsboard.server.common.msg.TbMsg; |
| 47 | 47 | import org.thingsboard.server.common.msg.TbMsgDataType; |
| 48 | 48 | import org.thingsboard.server.common.msg.TbMsgMetaData; |
| 49 | 49 | import org.thingsboard.server.dao.model.ModelConstants; |
| 50 | -import org.thingsboard.server.dao.util.mapping.JacksonUtil; | |
| 50 | +import org.thingsboard.common.util.JacksonUtil; | |
| 51 | 51 | import org.thingsboard.server.gen.edge.DeviceCredentialsUpdateMsg; |
| 52 | 52 | import org.thingsboard.server.gen.edge.DeviceRpcCallMsg; |
| 53 | 53 | import org.thingsboard.server.gen.edge.DeviceUpdateMsg; | ... | ... |
| ... | ... | @@ -71,7 +71,7 @@ import org.thingsboard.server.common.data.widget.WidgetsBundle; |
| 71 | 71 | import org.thingsboard.server.common.transport.adaptor.JsonConverter; |
| 72 | 72 | import org.thingsboard.server.controller.AbstractControllerTest; |
| 73 | 73 | import org.thingsboard.server.dao.edge.EdgeEventService; |
| 74 | -import org.thingsboard.server.dao.util.mapping.JacksonUtil; | |
| 74 | +import org.thingsboard.common.util.JacksonUtil; | |
| 75 | 75 | import org.thingsboard.server.edge.imitator.EdgeImitator; |
| 76 | 76 | import org.thingsboard.server.gen.edge.AlarmUpdateMsg; |
| 77 | 77 | import org.thingsboard.server.gen.edge.AssetUpdateMsg; | ... | ... |