Showing
1 changed file
with
9 additions
and
15 deletions
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/MqttGatewayClientTest.java
@@ -16,12 +16,10 @@ | @@ -16,12 +16,10 @@ | ||
16 | package org.thingsboard.server.msa.connectivity; | 16 | package org.thingsboard.server.msa.connectivity; |
17 | 17 | ||
18 | import com.fasterxml.jackson.databind.JsonNode; | 18 | import com.fasterxml.jackson.databind.JsonNode; |
19 | -import com.fasterxml.jackson.databind.ObjectMapper; | ||
20 | import com.google.common.collect.Sets; | 19 | import com.google.common.collect.Sets; |
21 | import com.google.common.util.concurrent.ListenableFuture; | 20 | import com.google.common.util.concurrent.ListenableFuture; |
22 | import com.google.common.util.concurrent.ListeningExecutorService; | 21 | import com.google.common.util.concurrent.ListeningExecutorService; |
23 | import com.google.common.util.concurrent.MoreExecutors; | 22 | import com.google.common.util.concurrent.MoreExecutors; |
24 | -import com.google.gson.JsonElement; | ||
25 | import com.google.gson.JsonObject; | 23 | import com.google.gson.JsonObject; |
26 | import com.google.gson.JsonParser; | 24 | import com.google.gson.JsonParser; |
27 | import io.netty.buffer.ByteBuf; | 25 | import io.netty.buffer.ByteBuf; |
@@ -30,13 +28,10 @@ import io.netty.handler.codec.mqtt.MqttQoS; | @@ -30,13 +28,10 @@ import io.netty.handler.codec.mqtt.MqttQoS; | ||
30 | import lombok.Data; | 28 | import lombok.Data; |
31 | import lombok.extern.slf4j.Slf4j; | 29 | import lombok.extern.slf4j.Slf4j; |
32 | import org.apache.commons.lang3.RandomStringUtils; | 30 | import org.apache.commons.lang3.RandomStringUtils; |
33 | -import org.checkerframework.checker.units.qual.A; | ||
34 | import org.junit.After; | 31 | import org.junit.After; |
35 | import org.junit.Assert; | 32 | import org.junit.Assert; |
36 | import org.junit.Before; | 33 | import org.junit.Before; |
37 | import org.junit.Test; | 34 | import org.junit.Test; |
38 | -import org.springframework.core.ParameterizedTypeReference; | ||
39 | -import org.springframework.http.HttpMethod; | ||
40 | import org.springframework.http.ResponseEntity; | 35 | import org.springframework.http.ResponseEntity; |
41 | import org.thingsboard.mqtt.MqttClient; | 36 | import org.thingsboard.mqtt.MqttClient; |
42 | import org.thingsboard.mqtt.MqttClientConfig; | 37 | import org.thingsboard.mqtt.MqttClientConfig; |
@@ -44,25 +39,24 @@ import org.thingsboard.mqtt.MqttHandler; | @@ -44,25 +39,24 @@ import org.thingsboard.mqtt.MqttHandler; | ||
44 | import org.thingsboard.server.common.data.Device; | 39 | import org.thingsboard.server.common.data.Device; |
45 | import org.thingsboard.server.common.data.id.DeviceId; | 40 | import org.thingsboard.server.common.data.id.DeviceId; |
46 | import org.thingsboard.server.common.data.id.EntityId; | 41 | import org.thingsboard.server.common.data.id.EntityId; |
47 | -import org.thingsboard.server.common.data.id.RuleChainId; | ||
48 | -import org.thingsboard.server.common.data.page.TextPageData; | ||
49 | import org.thingsboard.server.common.data.relation.EntityRelation; | 42 | import org.thingsboard.server.common.data.relation.EntityRelation; |
50 | -import org.thingsboard.server.common.data.relation.EntityRelationInfo; | ||
51 | import org.thingsboard.server.common.data.relation.RelationTypeGroup; | 43 | import org.thingsboard.server.common.data.relation.RelationTypeGroup; |
52 | -import org.thingsboard.server.common.data.rule.NodeConnectionInfo; | ||
53 | -import org.thingsboard.server.common.data.rule.RuleChain; | ||
54 | -import org.thingsboard.server.common.data.rule.RuleChainMetaData; | ||
55 | -import org.thingsboard.server.common.data.rule.RuleNode; | ||
56 | import org.thingsboard.server.common.data.security.DeviceCredentials; | 44 | import org.thingsboard.server.common.data.security.DeviceCredentials; |
57 | import org.thingsboard.server.msa.AbstractContainerTest; | 45 | import org.thingsboard.server.msa.AbstractContainerTest; |
58 | import org.thingsboard.server.msa.WsClient; | 46 | import org.thingsboard.server.msa.WsClient; |
59 | -import org.thingsboard.server.msa.mapper.AttributesResponse; | ||
60 | import org.thingsboard.server.msa.mapper.WsTelemetryResponse; | 47 | import org.thingsboard.server.msa.mapper.WsTelemetryResponse; |
61 | 48 | ||
62 | import java.io.IOException; | 49 | import java.io.IOException; |
63 | import java.nio.charset.StandardCharsets; | 50 | import java.nio.charset.StandardCharsets; |
64 | -import java.util.*; | ||
65 | -import java.util.concurrent.*; | 51 | +import java.util.List; |
52 | +import java.util.Objects; | ||
53 | +import java.util.Optional; | ||
54 | +import java.util.Random; | ||
55 | +import java.util.concurrent.ArrayBlockingQueue; | ||
56 | +import java.util.concurrent.BlockingQueue; | ||
57 | +import java.util.concurrent.ExecutionException; | ||
58 | +import java.util.concurrent.Executors; | ||
59 | +import java.util.concurrent.TimeUnit; | ||
66 | 60 | ||
67 | @Slf4j | 61 | @Slf4j |
68 | public class MqttGatewayClientTest extends AbstractContainerTest { | 62 | public class MqttGatewayClientTest extends AbstractContainerTest { |