Showing
3 changed files
with
4 additions
and
13 deletions
... | ... | @@ -15,9 +15,6 @@ |
15 | 15 | */ |
16 | 16 | package org.thingsboard.server.controller; |
17 | 17 | |
18 | -import com.fasterxml.jackson.databind.ObjectMapper; | |
19 | -import com.fasterxml.jackson.databind.node.ArrayNode; | |
20 | -import com.fasterxml.jackson.databind.node.ObjectNode; | |
21 | 18 | import com.google.common.util.concurrent.ListenableFuture; |
22 | 19 | import org.springframework.http.HttpStatus; |
23 | 20 | import org.springframework.security.access.prepost.PreAuthorize; |
... | ... | @@ -34,8 +31,8 @@ import org.thingsboard.server.common.data.EntitySubtype; |
34 | 31 | import org.thingsboard.server.common.data.EntityType; |
35 | 32 | import org.thingsboard.server.common.data.audit.ActionType; |
36 | 33 | import org.thingsboard.server.common.data.edge.Edge; |
37 | -import org.thingsboard.server.common.data.edge.EdgeInfo; | |
38 | 34 | import org.thingsboard.server.common.data.edge.EdgeEventActionType; |
35 | +import org.thingsboard.server.common.data.edge.EdgeInfo; | |
39 | 36 | import org.thingsboard.server.common.data.edge.EdgeSearchQuery; |
40 | 37 | import org.thingsboard.server.common.data.exception.ThingsboardErrorCode; |
41 | 38 | import org.thingsboard.server.common.data.exception.ThingsboardException; |
... | ... | @@ -57,7 +54,6 @@ import org.thingsboard.server.service.security.permission.Operation; |
57 | 54 | import org.thingsboard.server.service.security.permission.Resource; |
58 | 55 | |
59 | 56 | import java.util.ArrayList; |
60 | -import java.util.Arrays; | |
61 | 57 | import java.util.List; |
62 | 58 | import java.util.stream.Collectors; |
63 | 59 | ... | ... |
... | ... | @@ -48,6 +48,7 @@ import java.util.Collections; |
48 | 48 | import java.util.List; |
49 | 49 | |
50 | 50 | import static org.hamcrest.Matchers.containsString; |
51 | +import static org.hamcrest.Matchers.nullValue; | |
51 | 52 | import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; |
52 | 53 | import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID; |
53 | 54 | |
... | ... | @@ -682,7 +683,7 @@ public abstract class BaseEdgeControllerTest extends AbstractControllerTest { |
682 | 683 | edgeImitator.getDownlinkMsgs().clear(); |
683 | 684 | |
684 | 685 | edgeImitator.expectMessageAmount(4); |
685 | - doPost("/api/edge/sync", edge.getId()); | |
686 | + doPost("/api/edge/sync/" + edge.getId()); | |
686 | 687 | edgeImitator.waitForMessages(); |
687 | 688 | |
688 | 689 | Assert.assertEquals(4, edgeImitator.getDownlinkMsgs().size()); | ... | ... |
... | ... | @@ -45,16 +45,10 @@ import { |
45 | 45 | AddEntitiesToEdgeDialogData |
46 | 46 | } from "@home/dialogs/add-entities-to-edge-dialog.component"; |
47 | 47 | import { MatDialog } from "@angular/material/dialog"; |
48 | -import { isNotEmptyStr, isUndefined } from "@core/utils"; | |
48 | +import { isUndefined } from "@core/utils"; | |
49 | 49 | import { PageLink } from "@shared/models/page/page-link"; |
50 | 50 | import { Edge } from "@shared/models/edge.models"; |
51 | 51 | import { mergeMap } from "rxjs/operators"; |
52 | -import { | |
53 | - ConnectorType, | |
54 | - createFormConfig, | |
55 | - GatewayFormConnectorModel | |
56 | -} from "@home/components/widget/lib/gateway/gateway-form.models"; | |
57 | -import { formattedError } from "@angular/compiler"; | |
58 | 52 | |
59 | 53 | @Injectable() |
60 | 54 | export class RuleChainsTableConfigResolver implements Resolve<EntityTableConfig<RuleChain>> { | ... | ... |