Showing
1 changed file
with
1 additions
and
7 deletions
| @@ -23,7 +23,6 @@ import com.google.common.util.concurrent.ListenableFuture; | @@ -23,7 +23,6 @@ import com.google.common.util.concurrent.ListenableFuture; | ||
| 23 | import com.google.common.util.concurrent.MoreExecutors; | 23 | import com.google.common.util.concurrent.MoreExecutors; |
| 24 | import lombok.extern.slf4j.Slf4j; | 24 | import lombok.extern.slf4j.Slf4j; |
| 25 | import org.apache.commons.codec.binary.Base64; | 25 | import org.apache.commons.codec.binary.Base64; |
| 26 | -import org.bouncycastle.util.test.FixedSecureRandom; | ||
| 27 | import org.springframework.beans.factory.annotation.Autowired; | 26 | import org.springframework.beans.factory.annotation.Autowired; |
| 28 | import org.springframework.cache.Cache; | 27 | import org.springframework.cache.Cache; |
| 29 | import org.springframework.cache.CacheManager; | 28 | import org.springframework.cache.CacheManager; |
| @@ -33,14 +32,12 @@ import org.springframework.stereotype.Service; | @@ -33,14 +32,12 @@ import org.springframework.stereotype.Service; | ||
| 33 | import org.springframework.util.StringUtils; | 32 | import org.springframework.util.StringUtils; |
| 34 | import org.thingsboard.server.common.data.Customer; | 33 | import org.thingsboard.server.common.data.Customer; |
| 35 | import org.thingsboard.server.common.data.Dashboard; | 34 | import org.thingsboard.server.common.data.Dashboard; |
| 36 | -import org.thingsboard.server.common.data.DashboardInfo; | ||
| 37 | import org.thingsboard.server.common.data.DataConstants; | 35 | import org.thingsboard.server.common.data.DataConstants; |
| 38 | import org.thingsboard.server.common.data.Device; | 36 | import org.thingsboard.server.common.data.Device; |
| 39 | import org.thingsboard.server.common.data.EntitySubtype; | 37 | import org.thingsboard.server.common.data.EntitySubtype; |
| 40 | import org.thingsboard.server.common.data.EntityType; | 38 | import org.thingsboard.server.common.data.EntityType; |
| 41 | import org.thingsboard.server.common.data.EntityView; | 39 | import org.thingsboard.server.common.data.EntityView; |
| 42 | import org.thingsboard.server.common.data.Event; | 40 | import org.thingsboard.server.common.data.Event; |
| 43 | -import org.thingsboard.server.common.data.ShortEdgeInfo; | ||
| 44 | import org.thingsboard.server.common.data.Tenant; | 41 | import org.thingsboard.server.common.data.Tenant; |
| 45 | import org.thingsboard.server.common.data.alarm.Alarm; | 42 | import org.thingsboard.server.common.data.alarm.Alarm; |
| 46 | import org.thingsboard.server.common.data.asset.Asset; | 43 | import org.thingsboard.server.common.data.asset.Asset; |
| @@ -48,13 +45,10 @@ import org.thingsboard.server.common.data.edge.Edge; | @@ -48,13 +45,10 @@ import org.thingsboard.server.common.data.edge.Edge; | ||
| 48 | import org.thingsboard.server.common.data.edge.EdgeQueueEntityType; | 45 | import org.thingsboard.server.common.data.edge.EdgeQueueEntityType; |
| 49 | import org.thingsboard.server.common.data.edge.EdgeQueueEntry; | 46 | import org.thingsboard.server.common.data.edge.EdgeQueueEntry; |
| 50 | import org.thingsboard.server.common.data.edge.EdgeSearchQuery; | 47 | import org.thingsboard.server.common.data.edge.EdgeSearchQuery; |
| 51 | -import org.thingsboard.server.common.data.id.AssetId; | ||
| 52 | import org.thingsboard.server.common.data.id.CustomerId; | 48 | import org.thingsboard.server.common.data.id.CustomerId; |
| 53 | import org.thingsboard.server.common.data.id.DashboardId; | 49 | import org.thingsboard.server.common.data.id.DashboardId; |
| 54 | -import org.thingsboard.server.common.data.id.DeviceId; | ||
| 55 | import org.thingsboard.server.common.data.id.EdgeId; | 50 | import org.thingsboard.server.common.data.id.EdgeId; |
| 56 | import org.thingsboard.server.common.data.id.EntityId; | 51 | import org.thingsboard.server.common.data.id.EntityId; |
| 57 | -import org.thingsboard.server.common.data.id.EntityViewId; | ||
| 58 | import org.thingsboard.server.common.data.id.RuleChainId; | 52 | import org.thingsboard.server.common.data.id.RuleChainId; |
| 59 | import org.thingsboard.server.common.data.id.TenantId; | 53 | import org.thingsboard.server.common.data.id.TenantId; |
| 60 | import org.thingsboard.server.common.data.page.TextPageData; | 54 | import org.thingsboard.server.common.data.page.TextPageData; |
| @@ -762,7 +756,7 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic | @@ -762,7 +756,7 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic | ||
| 762 | @Override | 756 | @Override |
| 763 | protected void validateDataImpl(TenantId tenantId, Edge edge) { | 757 | protected void validateDataImpl(TenantId tenantId, Edge edge) { |
| 764 | if (StringUtils.isEmpty(edge.getType())) { | 758 | if (StringUtils.isEmpty(edge.getType())) { |
| 765 | - throw new DataValidationException("Edge typeshould be specified!"); | 759 | + throw new DataValidationException("Edge type should be specified!"); |
| 766 | } | 760 | } |
| 767 | if (StringUtils.isEmpty(edge.getName())) { | 761 | if (StringUtils.isEmpty(edge.getName())) { |
| 768 | throw new DataValidationException("Edge name should be specified!"); | 762 | throw new DataValidationException("Edge name should be specified!"); |