Fixed sync test

application/src/main/java/org/thingsboard/server/controller/EdgeController.java

@@ -15,9 +15,6 @@
  */
 package org.thingsboard.server.controller;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.util.concurrent.ListenableFuture;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -34,8 +31,8 @@ import org.thingsboard.server.common.data.EntitySubtype;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.edge.Edge;
-import org.thingsboard.server.common.data.edge.EdgeInfo;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
+import org.thingsboard.server.common.data.edge.EdgeInfo;
 import org.thingsboard.server.common.data.edge.EdgeSearchQuery;
 import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
@@ -57,7 +54,6 @@ import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 

application/src/test/java/org/thingsboard/server/controller/BaseEdgeControllerTest.java

@@ -48,6 +48,7 @@ import java.util.Collections;
 import java.util.List;
 
 import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.nullValue;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
 
@@ -682,7 +683,7 @@ public abstract class BaseEdgeControllerTest extends AbstractControllerTest {
         edgeImitator.getDownlinkMsgs().clear();
 
         edgeImitator.expectMessageAmount(4);
-        doPost("/api/edge/sync", edge.getId());
+        doPost("/api/edge/sync/" + edge.getId());
         edgeImitator.waitForMessages();
 
         Assert.assertEquals(4, edgeImitator.getDownlinkMsgs().size());

ui-ngx/src/app/modules/home/pages/rulechain/rulechains-table-config.resolver.ts

@@ -45,16 +45,10 @@ import {
   AddEntitiesToEdgeDialogData
 } from "@home/dialogs/add-entities-to-edge-dialog.component";
 import { MatDialog } from "@angular/material/dialog";
-import { isNotEmptyStr, isUndefined } from "@core/utils";
+import { isUndefined } from "@core/utils";
 import { PageLink } from "@shared/models/page/page-link";
 import { Edge } from "@shared/models/edge.models";
 import { mergeMap } from "rxjs/operators";
-import {
-  ConnectorType,
-  createFormConfig,
-  GatewayFormConnectorModel
-} from "@home/components/widget/lib/gateway/gateway-form.models";
-import { formattedError } from "@angular/compiler";
 
 @Injectable()
 export class RuleChainsTableConfigResolver implements Resolve<EntityTableConfig<RuleChain>> {