diff --git a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java index e46a95972f..50a4f7d01b 100644 --- a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java +++ b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java @@ -16,7 +16,6 @@ package org.thingsboard.server.actors.device; import akka.actor.ActorContext; -import akka.event.LoggingAdapter; import com.datastax.driver.core.utils.UUIDs; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; @@ -42,7 +41,6 @@ import org.thingsboard.server.common.data.rpc.ToDeviceRpcRequestBody; import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.TbMsgDataType; import org.thingsboard.server.common.msg.TbMsgMetaData; -import org.thingsboard.server.common.msg.cluster.ClusterEventMsg; import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest; import org.thingsboard.server.common.msg.session.SessionMsgType; import org.thingsboard.server.common.msg.timeout.DeviceActorClientSideRpcTimeoutMsg; @@ -295,7 +293,7 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor { return systemContext.getAttributesService().findAll(tenantId, deviceId, scope); } } else { - return Futures.immediateFuture(Collections.emptyList()); + return systemContext.getAttributesService().findAll(tenantId, deviceId, scope); } } diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/AbstractContainerTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/AbstractContainerTest.java index 4c3ac8362c..bbabc2eb88 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/AbstractContainerTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/AbstractContainerTest.java @@ -32,7 +32,8 @@ import org.apache.http.impl.client.HttpClients; import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.apache.http.ssl.SSLContextBuilder; import org.apache.http.ssl.SSLContexts; -import org.junit.*; +import org.junit.BeforeClass; +import org.junit.Rule; import org.junit.rules.TestRule; import org.junit.rules.TestWatcher; import org.junit.runner.Description; @@ -43,7 +44,10 @@ import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.msa.mapper.WsTelemetryResponse; -import javax.net.ssl.*; + +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLSession; +import javax.net.ssl.SSLSocket; import java.net.URI; import java.security.cert.X509Certificate; import java.util.List; @@ -54,6 +58,7 @@ import java.util.Random; public abstract class AbstractContainerTest { protected static final String HTTPS_URL = "https://localhost"; protected static final String WSS_URL = "wss://localhost"; + protected static String TB_TOKEN; protected static RestClient restClient; protected ObjectMapper mapper = new ObjectMapper(); diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/HttpClientTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/HttpClientTest.java index a6e89de185..a5796cc69a 100644 --- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/HttpClientTest.java +++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/HttpClientTest.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.msa.connectivity; +import com.fasterxml.jackson.databind.JsonNode; import com.google.common.collect.Sets; import org.junit.Assert; import org.junit.Test; @@ -25,6 +26,15 @@ import org.thingsboard.server.msa.AbstractContainerTest; import org.thingsboard.server.msa.WsClient; import org.thingsboard.server.msa.mapper.WsTelemetryResponse; + +import java.util.Optional; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.thingsboard.server.common.data.DataConstants.DEVICE; +import static org.thingsboard.server.common.data.DataConstants.SHARED_SCOPE; + public class HttpClientTest extends AbstractContainerTest { @Test @@ -52,6 +62,53 @@ public class HttpClientTest extends AbstractContainerTest { Assert.assertTrue(verify(actualLatestTelemetry, "doubleKey", Double.toString(42.0))); Assert.assertTrue(verify(actualLatestTelemetry, "longKey", Long.toString(73))); - restClient.getRestTemplate().delete(HTTPS_URL + "/api/device/" + device.getId()); + restClient.deleteDevice(device.getId()); + } + + @Test + public void getAttributes() throws Exception { + restClient.login("tenant@thingsboard.org", "tenant"); + TB_TOKEN = restClient.getToken(); + + Device device = createDevice("test"); + String accessToken = restClient.getCredentials(device.getId()).getCredentialsId(); + assertNotNull(accessToken); + + ResponseEntity deviceSharedAttributes = restClient.getRestTemplate() + .postForEntity(HTTPS_URL + "/api/plugins/telemetry/" + DEVICE + "/" + device.getId().toString() + "/attributes/" + SHARED_SCOPE, mapper.readTree(createPayload().toString()), + ResponseEntity.class, + accessToken); + + ResponseEntity deviceClientsAttributes = restClient.getRestTemplate() + .postForEntity(HTTPS_URL + "/api/v1/" + accessToken + "/attributes/", mapper.readTree(createPayload().toString()), + ResponseEntity.class, + accessToken); + + Assert.assertTrue(deviceSharedAttributes.getStatusCode().is2xxSuccessful()); + Assert.assertTrue(deviceClientsAttributes.getStatusCode().is2xxSuccessful()); + + Optional allOptional = restClient.getAttributes(accessToken, null, null); + assertTrue(allOptional.isPresent()); + + JsonNode all = allOptional.get(); + assertEquals(all.get("shared"), mapper.readTree(createPayload().toString())); + assertEquals(all.get("client"), mapper.readTree(createPayload().toString())); + + Optional sharedOptional = restClient.getAttributes(accessToken, null, "stringKey"); + assertTrue(sharedOptional.isPresent()); + + JsonNode shared = sharedOptional.get(); + assertEquals(shared.get("shared").get("stringKey"), mapper.readTree(createPayload().get("stringKey").toString())); + assertEquals(shared.get("client"), mapper.readTree(createPayload().toString())); + + Optional clientOptional = restClient.getAttributes(accessToken, "longKey,stringKey", null); + assertTrue(clientOptional.isPresent()); + + JsonNode client = clientOptional.get(); + assertEquals(client.get("shared"), mapper.readTree(createPayload().toString())); + assertEquals(client.get("client").get("longKey"), mapper.readTree(createPayload().get("longKey").toString())); + assertEquals(client.get("client").get("stringKey"), mapper.readTree(createPayload().get("stringKey").toString())); + + restClient.deleteDevice(device.getId()); } } diff --git a/tools/pom.xml b/tools/pom.xml index c1c1ded1d7..616d894a79 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -23,7 +23,6 @@ 2.2.1-SNAPSHOT thingsboard - org.thingsboard tools jar diff --git a/tools/src/main/java/org/thingsboard/client/tools/RestClient.java b/tools/src/main/java/org/thingsboard/client/tools/RestClient.java index 4c8c0a4f37..90bfc01dec 100644 --- a/tools/src/main/java/org/thingsboard/client/tools/RestClient.java +++ b/tools/src/main/java/org/thingsboard/client/tools/RestClient.java @@ -107,6 +107,27 @@ public class RestClient implements ClientHttpRequestInterceptor { } } + public Optional getAttributes(String accessToken, String clientKeys, String sharedKeys) { + Map params = new HashMap<>(); + params.put("accessToken", accessToken); + params.put("clientKeys", clientKeys); + params.put("sharedKeys", sharedKeys); + try { + ResponseEntity telemetryEntity = restTemplate.getForEntity(baseURL + "/api/v1/{accessToken}/attributes?clientKeys={clientKeys}&sharedKeys={sharedKeys}", JsonNode.class, params); + return Optional.of(telemetryEntity.getBody()); + } catch (HttpClientErrorException exception) { + if (exception.getStatusCode() == HttpStatus.NOT_FOUND) { + return Optional.empty(); + } else { + throw exception; + } + } + } + + public Customer createCustomer(Customer customer) { + return restTemplate.postForEntity(baseURL + "/api/customer", customer, Customer.class).getBody(); + } + public Customer createCustomer(String title) { Customer customer = new Customer(); customer.setTitle(title); @@ -120,6 +141,14 @@ public class RestClient implements ClientHttpRequestInterceptor { return restTemplate.postForEntity(baseURL + "/api/device", device, Device.class).getBody(); } + public Device createDevice(Device device) { + return restTemplate.postForEntity(baseURL + "/api/device", device, Device.class).getBody(); + } + + public Asset createAsset(Asset asset) { + return restTemplate.postForEntity(baseURL + "/api/asset", asset, Asset.class).getBody(); + } + public Asset createAsset(String name, String type) { Asset asset = new Asset(); asset.setName(name); @@ -131,6 +160,18 @@ public class RestClient implements ClientHttpRequestInterceptor { return restTemplate.postForEntity(baseURL + "/api/alarm", alarm, Alarm.class).getBody(); } + public void deleteCustomer(CustomerId customerId) { + restTemplate.delete(baseURL + "/api/customer/{customerId}", customerId); + } + + public void deleteDevice(DeviceId deviceId) { + restTemplate.delete(baseURL + "/api/device/{deviceId}", deviceId); + } + + public void deleteAsset(AssetId assetId) { + restTemplate.delete(baseURL + "/api/asset/{assetId}", assetId); + } + public Device assignDevice(CustomerId customerId, DeviceId deviceId) { return restTemplate.postForEntity(baseURL + "/api/customer/{customerId}/device/{deviceId}", null, Device.class, customerId.toString(), deviceId.toString()).getBody();