简柏林 / thingskit · Commits

Commit 0a6efc9a952ca97eb2ba6e72bd1912e3cc1b3bb0

Authored by Andrew Shvayka
2 parents c4cd601d 39ce0e65

Merge with master

Inline Side-by-side
Showing 34 changed files with 252 additions and 67 deletions
1 -# Thingsboard 1 +# ThingsBoard
2 [![Join the chat at https://gitter.im/thingsboard/chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/thingsboard/chat?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) 2 [![Join the chat at https://gitter.im/thingsboard/chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/thingsboard/chat?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
3 [![Build Status](https://travis-ci.org/thingsboard/thingsboard.svg?branch=master)](https://travis-ci.org/thingsboard/thingsboard) 3 [![Build Status](https://travis-ci.org/thingsboard/thingsboard.svg?branch=master)](https://travis-ci.org/thingsboard/thingsboard)
4 4
5 -Thingsboard is an open-source IoT platform for data collection, processing, visualization, and device management. 5 +ThingsBoard is an open-source IoT platform for data collection, processing, visualization, and device management.
6 6
7 <img src="./img/logo.png?raw=true" width="100" height="100"> 7 <img src="./img/logo.png?raw=true" width="100" height="100">
8 8
9 ## Documentation 9 ## Documentation
10 10
11 -Thingsboard documentation is hosted on [thingsboard.io](https://thingsboard.io/docs). 11 +ThingsBoard documentation is hosted on [thingsboard.io](https://thingsboard.io/docs).
12 12
13 ## IoT use cases 13 ## IoT use cases
14 14
  15 +[**Smart metering**](https://thingsboard.io/smart-metering/)
  16 +[![Smart metering](https://user-images.githubusercontent.com/8308069/29627611-4125eebc-883b-11e7-8862-f29419902079.gif "Smart metering")](https://thingsboard.io/smart-metering/)
  17 +
15 [**Smart energy**](https://thingsboard.io/smart-energy/) 18 [**Smart energy**](https://thingsboard.io/smart-energy/)
16 -[![Smart energy monitoring demo](https://cloud.githubusercontent.com/assets/8308069/24495682/aebd45d0-153e-11e7-8de4-7360ed5b41ae.gif "Smart energy")](https://thingsboard.io/smart-energy/) 19 +[![Smart energy](https://cloud.githubusercontent.com/assets/8308069/24495682/aebd45d0-153e-11e7-8de4-7360ed5b41ae.gif "Smart energy")](https://thingsboard.io/smart-energy/)
17 20
18 [**Smart farming**](https://thingsboard.io/smart-farming/) 21 [**Smart farming**](https://thingsboard.io/smart-farming/)
19 [![Smart farming](https://cloud.githubusercontent.com/assets/8308069/24496824/10dc1144-1542-11e7-8aa1-5d3a281d5a1a.gif "Smart farming")](https://thingsboard.io/smart-farming/) 22 [![Smart farming](https://cloud.githubusercontent.com/assets/8308069/24496824/10dc1144-1542-11e7-8aa1-5d3a281d5a1a.gif "Smart farming")](https://thingsboard.io/smart-farming/)
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>1.3.0-SNAPSHOT</version> 23 + <version>1.3.0</version>
24 <artifactId>thingsboard</artifactId> 24 <artifactId>thingsboard</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard</groupId> 26 <groupId>org.thingsboard</groupId>
@@ -41,6 +41,7 @@ import org.springframework.context.annotation.Configuration; @@ -41,6 +41,7 @@ import org.springframework.context.annotation.Configuration;
41 import org.springframework.http.HttpHeaders; 41 import org.springframework.http.HttpHeaders;
42 import org.springframework.http.MediaType; 42 import org.springframework.http.MediaType;
43 import org.springframework.http.converter.HttpMessageConverter; 43 import org.springframework.http.converter.HttpMessageConverter;
  44 +import org.springframework.http.converter.StringHttpMessageConverter;
44 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; 45 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
45 import org.springframework.mock.http.MockHttpInputMessage; 46 import org.springframework.mock.http.MockHttpInputMessage;
46 import org.springframework.mock.http.MockHttpOutputMessage; 47 import org.springframework.mock.http.MockHttpOutputMessage;
@@ -51,6 +52,7 @@ import org.springframework.test.context.TestPropertySource; @@ -51,6 +52,7 @@ import org.springframework.test.context.TestPropertySource;
51 import org.springframework.test.context.junit4.SpringRunner; 52 import org.springframework.test.context.junit4.SpringRunner;
52 import org.springframework.test.context.web.WebAppConfiguration; 53 import org.springframework.test.context.web.WebAppConfiguration;
53 import org.springframework.test.web.servlet.MockMvc; 54 import org.springframework.test.web.servlet.MockMvc;
  55 +import org.springframework.test.web.servlet.MvcResult;
54 import org.springframework.test.web.servlet.ResultActions; 56 import org.springframework.test.web.servlet.ResultActions;
55 import org.springframework.test.web.servlet.ResultMatcher; 57 import org.springframework.test.web.servlet.ResultMatcher;
56 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; 58 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
@@ -119,6 +121,9 @@ public abstract class AbstractControllerTest { @@ -119,6 +121,9 @@ public abstract class AbstractControllerTest {
119 @SuppressWarnings("rawtypes") 121 @SuppressWarnings("rawtypes")
120 private HttpMessageConverter mappingJackson2HttpMessageConverter; 122 private HttpMessageConverter mappingJackson2HttpMessageConverter;
121 123
  124 + @SuppressWarnings("rawtypes")
  125 + private HttpMessageConverter stringHttpMessageConverter;
  126 +
122 @Autowired 127 @Autowired
123 private WebApplicationContext webApplicationContext; 128 private WebApplicationContext webApplicationContext;
124 129
@@ -141,6 +146,11 @@ public abstract class AbstractControllerTest { @@ -141,6 +146,11 @@ public abstract class AbstractControllerTest {
141 .findAny() 146 .findAny()
142 .get(); 147 .get();
143 148
  149 + this.stringHttpMessageConverter = Arrays.stream(converters)
  150 + .filter(hmc -> hmc instanceof StringHttpMessageConverter)
  151 + .findAny()
  152 + .get();
  153 +
144 Assert.assertNotNull("the JSON message converter must not be null", 154 Assert.assertNotNull("the JSON message converter must not be null",
145 this.mappingJackson2HttpMessageConverter); 155 this.mappingJackson2HttpMessageConverter);
146 } 156 }
@@ -277,6 +287,17 @@ public abstract class AbstractControllerTest { @@ -277,6 +287,17 @@ public abstract class AbstractControllerTest {
277 return readResponse(doGet(urlTemplate, urlVariables).andExpect(status().isOk()), responseClass); 287 return readResponse(doGet(urlTemplate, urlVariables).andExpect(status().isOk()), responseClass);
278 } 288 }
279 289
  290 + protected <T> T doGetAsync(String urlTemplate, Class<T> responseClass, Object... urlVariables) throws Exception {
  291 + return readResponse(doGetAsync(urlTemplate, urlVariables).andExpect(status().isOk()), responseClass);
  292 + }
  293 +
  294 + protected ResultActions doGetAsync(String urlTemplate, Object... urlVariables) throws Exception {
  295 + MockHttpServletRequestBuilder getRequest;
  296 + getRequest = get(urlTemplate, urlVariables);
  297 + setJwtToken(getRequest);
  298 + return mockMvc.perform(asyncDispatch(mockMvc.perform(getRequest).andExpect(request().asyncStarted()).andReturn()));
  299 + }
  300 +
280 protected <T> T doGetTyped(String urlTemplate, TypeReference<T> responseType, Object... urlVariables) throws Exception { 301 protected <T> T doGetTyped(String urlTemplate, TypeReference<T> responseType, Object... urlVariables) throws Exception {
281 return readResponse(doGet(urlTemplate, urlVariables).andExpect(status().isOk()), responseType); 302 return readResponse(doGet(urlTemplate, urlVariables).andExpect(status().isOk()), responseType);
282 } 303 }
@@ -311,10 +332,18 @@ public abstract class AbstractControllerTest { @@ -311,10 +332,18 @@ public abstract class AbstractControllerTest {
311 return readResponse(doPost(urlTemplate, params).andExpect(status().isOk()), responseClass); 332 return readResponse(doPost(urlTemplate, params).andExpect(status().isOk()), responseClass);
312 } 333 }
313 334
  335 + protected <T> T doPost(String urlTemplate, T content, Class<T> responseClass, ResultMatcher resultMatcher, String... params) throws Exception {
  336 + return readResponse(doPost(urlTemplate, params).andExpect(resultMatcher), responseClass);
  337 + }
  338 +
314 protected <T> T doPost(String urlTemplate, T content, Class<T> responseClass, String... params) throws Exception { 339 protected <T> T doPost(String urlTemplate, T content, Class<T> responseClass, String... params) throws Exception {
315 return readResponse(doPost(urlTemplate, content, params).andExpect(status().isOk()), responseClass); 340 return readResponse(doPost(urlTemplate, content, params).andExpect(status().isOk()), responseClass);
316 } 341 }
317 342
  343 + protected <T> T doPostAsync(String urlTemplate, T content, Class<T> responseClass, ResultMatcher resultMatcher, String... params) throws Exception {
  344 + return readResponse(doPostAsync(urlTemplate, content, params).andExpect(resultMatcher), responseClass);
  345 + }
  346 +
318 protected <T> T doDelete(String urlTemplate, Class<T> responseClass, String... params) throws Exception { 347 protected <T> T doDelete(String urlTemplate, Class<T> responseClass, String... params) throws Exception {
319 return readResponse(doDelete(urlTemplate, params).andExpect(status().isOk()), responseClass); 348 return readResponse(doDelete(urlTemplate, params).andExpect(status().isOk()), responseClass);
320 } 349 }
@@ -331,10 +360,18 @@ public abstract class AbstractControllerTest { @@ -331,10 +360,18 @@ public abstract class AbstractControllerTest {
331 setJwtToken(postRequest); 360 setJwtToken(postRequest);
332 String json = json(content); 361 String json = json(content);
333 postRequest.contentType(contentType).content(json); 362 postRequest.contentType(contentType).content(json);
334 - populateParams(postRequest, params);  
335 return mockMvc.perform(postRequest); 363 return mockMvc.perform(postRequest);
336 } 364 }
337 365
  366 + protected <T> ResultActions doPostAsync(String urlTemplate, T content, String... params) throws Exception {
  367 + MockHttpServletRequestBuilder postRequest = post(urlTemplate);
  368 + setJwtToken(postRequest);
  369 + String json = json(content);
  370 + postRequest.contentType(contentType).content(json);
  371 + MvcResult result = mockMvc.perform(postRequest).andReturn();
  372 + return mockMvc.perform(asyncDispatch(result));
  373 + }
  374 +
338 protected ResultActions doDelete(String urlTemplate, String... params) throws Exception { 375 protected ResultActions doDelete(String urlTemplate, String... params) throws Exception {
339 MockHttpServletRequestBuilder deleteRequest = delete(urlTemplate); 376 MockHttpServletRequestBuilder deleteRequest = delete(urlTemplate);
340 setJwtToken(deleteRequest); 377 setJwtToken(deleteRequest);
@@ -356,8 +393,9 @@ public abstract class AbstractControllerTest { @@ -356,8 +393,9 @@ public abstract class AbstractControllerTest {
356 @SuppressWarnings("unchecked") 393 @SuppressWarnings("unchecked")
357 protected String json(Object o) throws IOException { 394 protected String json(Object o) throws IOException {
358 MockHttpOutputMessage mockHttpOutputMessage = new MockHttpOutputMessage(); 395 MockHttpOutputMessage mockHttpOutputMessage = new MockHttpOutputMessage();
359 - this.mappingJackson2HttpMessageConverter.write(  
360 - o, MediaType.APPLICATION_JSON, mockHttpOutputMessage); 396 +
  397 + HttpMessageConverter converter = o instanceof String ? stringHttpMessageConverter : mappingJackson2HttpMessageConverter;
  398 + converter.write(o, MediaType.APPLICATION_JSON, mockHttpOutputMessage);
361 return mockHttpOutputMessage.getBodyAsString(); 399 return mockHttpOutputMessage.getBodyAsString();
362 } 400 }
363 401
@@ -365,7 +403,8 @@ public abstract class AbstractControllerTest { @@ -365,7 +403,8 @@ public abstract class AbstractControllerTest {
365 protected <T> T readResponse(ResultActions result, Class<T> responseClass) throws Exception { 403 protected <T> T readResponse(ResultActions result, Class<T> responseClass) throws Exception {
366 byte[] content = result.andReturn().getResponse().getContentAsByteArray(); 404 byte[] content = result.andReturn().getResponse().getContentAsByteArray();
367 MockHttpInputMessage mockHttpInputMessage = new MockHttpInputMessage(content); 405 MockHttpInputMessage mockHttpInputMessage = new MockHttpInputMessage(content);
368 - return (T) this.mappingJackson2HttpMessageConverter.read(responseClass, mockHttpInputMessage); 406 + HttpMessageConverter converter = responseClass.equals(String.class) ? stringHttpMessageConverter : mappingJackson2HttpMessageConverter;
  407 + return (T) converter.read(responseClass, mockHttpInputMessage);
369 } 408 }
370 409
371 protected <T> T readResponse(ResultActions result, TypeReference<T> type) throws Exception { 410 protected <T> T readResponse(ResultActions result, TypeReference<T> type) throws Exception {
application/src/test/java/org/thingsboard/server/mqtt/MqttNoSqlTestSuite.java renamed from application/src/test/java/org/thingsboard/server/mqtt/MqttTestSuite.java
@@ -25,8 +25,8 @@ import java.util.Arrays; @@ -25,8 +25,8 @@ import java.util.Arrays;
25 25
26 @RunWith(ClasspathSuite.class) 26 @RunWith(ClasspathSuite.class)
27 @ClasspathSuite.ClassnameFilters({ 27 @ClasspathSuite.ClassnameFilters({
28 - "org.thingsboard.server.mqtt.*.*Test"})  
29 -public class MqttTestSuite { 28 + "org.thingsboard.server.mqtt.*.nosql.*Test"})
  29 +public class MqttNoSqlTestSuite {
30 30
31 @ClassRule 31 @ClassRule
32 public static CustomCassandraCQLUnit cassandraUnit = 32 public static CustomCassandraCQLUnit cassandraUnit =
  1 +/**
  2 + * Copyright © 2016-2017 The Thingsboard Authors
  3 + *
  4 + * Licensed under the Apache License, Version 2.0 (the "License");
  5 + * you may not use this file except in compliance with the License.
  6 + * You may obtain a copy of the License at
  7 + *
  8 + * http://www.apache.org/licenses/LICENSE-2.0
  9 + *
  10 + * Unless required by applicable law or agreed to in writing, software
  11 + * distributed under the License is distributed on an "AS IS" BASIS,
  12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 + * See the License for the specific language governing permissions and
  14 + * limitations under the License.
  15 + */
  16 +package org.thingsboard.server.mqtt;
  17 +
  18 +import org.cassandraunit.dataset.cql.ClassPathCQLDataSet;
  19 +import org.junit.ClassRule;
  20 +import org.junit.extensions.cpsuite.ClasspathSuite;
  21 +import org.junit.runner.RunWith;
  22 +import org.thingsboard.server.dao.CustomCassandraCQLUnit;
  23 +import org.thingsboard.server.dao.CustomSqlUnit;
  24 +
  25 +import java.util.Arrays;
  26 +
  27 +@RunWith(ClasspathSuite.class)
  28 +@ClasspathSuite.ClassnameFilters({
  29 + "org.thingsboard.server.mqtt.rpc.sql.*Test", "org.thingsboard.server.mqtt.telemetry.sql.*Test"})
  30 +public class MqttSqlTestSuite {
  31 +
  32 + @ClassRule
  33 + public static CustomSqlUnit sqlUnit = new CustomSqlUnit(
  34 + Arrays.asList("sql/schema.sql", "sql/system-data.sql"),
  35 + "sql/drop-all-tables.sql",
  36 + "sql-test.properties");
  37 +}
application/src/test/java/org/thingsboard/server/mqtt/rpc/AbstractMqttServerSideRpcIntegrationTest.java renamed from application/src/test/java/org/thingsboard/server/mqtt/rpc/MqttServerSideRpcIntegrationTest.java
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
16 package org.thingsboard.server.mqtt.rpc; 16 package org.thingsboard.server.mqtt.rpc;
17 17
18 import lombok.extern.slf4j.Slf4j; 18 import lombok.extern.slf4j.Slf4j;
  19 +import org.apache.commons.lang3.StringUtils;
19 import org.eclipse.paho.client.mqttv3.*; 20 import org.eclipse.paho.client.mqttv3.*;
20 import org.junit.*; 21 import org.junit.*;
21 import org.springframework.http.HttpStatus; 22 import org.springframework.http.HttpStatus;
@@ -26,6 +27,7 @@ import org.thingsboard.server.common.data.User; @@ -26,6 +27,7 @@ import org.thingsboard.server.common.data.User;
26 import org.thingsboard.server.common.data.security.Authority; 27 import org.thingsboard.server.common.data.security.Authority;
27 import org.thingsboard.server.common.data.security.DeviceCredentials; 28 import org.thingsboard.server.common.data.security.DeviceCredentials;
28 import org.thingsboard.server.controller.AbstractControllerTest; 29 import org.thingsboard.server.controller.AbstractControllerTest;
  30 +import org.thingsboard.server.dao.service.DaoNoSqlTest;
29 31
30 import java.util.UUID; 32 import java.util.UUID;
31 33
@@ -37,7 +39,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @@ -37,7 +39,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
37 * @author Valerii Sosliuk 39 * @author Valerii Sosliuk
38 */ 40 */
39 @Slf4j 41 @Slf4j
40 -public class MqttServerSideRpcIntegrationTest extends AbstractControllerTest { 42 +public abstract class AbstractMqttServerSideRpcIntegrationTest extends AbstractControllerTest {
41 43
42 private static final String MQTT_URL = "tcp://localhost:1883"; 44 private static final String MQTT_URL = "tcp://localhost:1883";
43 private static final String FAIL_MSG_IF_HTTP_CLIENT_ERROR_NOT_ENCOUNTERED = "HttpClientErrorException expected, but not encountered"; 45 private static final String FAIL_MSG_IF_HTTP_CLIENT_ERROR_NOT_ENCOUNTERED = "HttpClientErrorException expected, but not encountered";
@@ -67,13 +69,13 @@ public class MqttServerSideRpcIntegrationTest extends AbstractControllerTest { @@ -67,13 +69,13 @@ public class MqttServerSideRpcIntegrationTest extends AbstractControllerTest {
67 @After 69 @After
68 public void afterTest() throws Exception { 70 public void afterTest() throws Exception {
69 loginSysAdmin(); 71 loginSysAdmin();
70 -  
71 - doDelete("/api/tenant/" + savedTenant.getId().getId().toString())  
72 - .andExpect(status().isOk()); 72 + if (savedTenant != null) {
  73 + doDelete("/api/tenant/" + savedTenant.getId().getId().toString())
  74 + .andExpect(status().isOk());
  75 + }
73 } 76 }
74 77
75 @Test 78 @Test
76 - @Ignore  
77 public void testServerMqttOneWayRpc() throws Exception { 79 public void testServerMqttOneWayRpc() throws Exception {
78 Device device = new Device(); 80 Device device = new Device();
79 device.setName("Test One-Way Server-Side RPC"); 81 device.setName("Test One-Way Server-Side RPC");
@@ -95,12 +97,12 @@ public class MqttServerSideRpcIntegrationTest extends AbstractControllerTest { @@ -95,12 +97,12 @@ public class MqttServerSideRpcIntegrationTest extends AbstractControllerTest {
95 97
96 String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"23\",\"value\": 1}}"; 98 String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"23\",\"value\": 1}}";
97 String deviceId = savedDevice.getId().getId().toString(); 99 String deviceId = savedDevice.getId().getId().toString();
98 - String result = doPost("api/plugins/rpc/oneway/" + deviceId, setGpioRequest, String.class);  
99 - Assert.assertNull(result); 100 + String result = doPostAsync("/api/plugins/rpc/oneway/" + deviceId, setGpioRequest, String.class, status().isOk());
  101 + Assert.assertTrue(StringUtils.isEmpty(result));
100 } 102 }
101 103
102 @Test 104 @Test
103 - @Ignore 105 + @Ignore // TODO: figure out the right error code for this case. Ignored due to failure: expected 408 but was: 200
104 public void testServerMqttOneWayRpcDeviceOffline() throws Exception { 106 public void testServerMqttOneWayRpcDeviceOffline() throws Exception {
105 Device device = new Device(); 107 Device device = new Device();
106 device.setName("Test One-Way Server-Side RPC Device Offline"); 108 device.setName("Test One-Way Server-Side RPC Device Offline");
@@ -114,7 +116,7 @@ public class MqttServerSideRpcIntegrationTest extends AbstractControllerTest { @@ -114,7 +116,7 @@ public class MqttServerSideRpcIntegrationTest extends AbstractControllerTest {
114 String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"23\",\"value\": 1}}"; 116 String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"23\",\"value\": 1}}";
115 String deviceId = savedDevice.getId().getId().toString(); 117 String deviceId = savedDevice.getId().getId().toString();
116 try { 118 try {
117 - doPost("api/plugins/rpc/oneway/" + deviceId, setGpioRequest, String.class); 119 + doPost("/api/plugins/rpc/oneway/" + deviceId, setGpioRequest, String.class, status().is(408));
118 Assert.fail(FAIL_MSG_IF_HTTP_CLIENT_ERROR_NOT_ENCOUNTERED); 120 Assert.fail(FAIL_MSG_IF_HTTP_CLIENT_ERROR_NOT_ENCOUNTERED);
119 } catch (HttpClientErrorException e) { 121 } catch (HttpClientErrorException e) {
120 log.error(e.getMessage(), e); 122 log.error(e.getMessage(), e);
@@ -124,12 +126,12 @@ public class MqttServerSideRpcIntegrationTest extends AbstractControllerTest { @@ -124,12 +126,12 @@ public class MqttServerSideRpcIntegrationTest extends AbstractControllerTest {
124 } 126 }
125 127
126 @Test 128 @Test
127 - @Ignore 129 + @Ignore // TODO: figure out the right error code for this case. Ignored due to failure: expected 400 (404?) but was: 401
128 public void testServerMqttOneWayRpcDeviceDoesNotExist() throws Exception { 130 public void testServerMqttOneWayRpcDeviceDoesNotExist() throws Exception {
129 String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"23\",\"value\": 1}}"; 131 String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"23\",\"value\": 1}}";
130 String nonExistentDeviceId = UUID.randomUUID().toString(); 132 String nonExistentDeviceId = UUID.randomUUID().toString();
131 try { 133 try {
132 - doPost("api/plugins/rpc/oneway/" + nonExistentDeviceId, setGpioRequest, String.class); 134 + doPostAsync("/api/plugins/rpc/oneway/" + nonExistentDeviceId, setGpioRequest, String.class, status().is(400));
133 Assert.fail(FAIL_MSG_IF_HTTP_CLIENT_ERROR_NOT_ENCOUNTERED); 135 Assert.fail(FAIL_MSG_IF_HTTP_CLIENT_ERROR_NOT_ENCOUNTERED);
134 } catch (HttpClientErrorException e) { 136 } catch (HttpClientErrorException e) {
135 log.error(e.getMessage(), e); 137 log.error(e.getMessage(), e);
@@ -139,7 +141,6 @@ public class MqttServerSideRpcIntegrationTest extends AbstractControllerTest { @@ -139,7 +141,6 @@ public class MqttServerSideRpcIntegrationTest extends AbstractControllerTest {
139 } 141 }
140 142
141 @Test 143 @Test
142 - @Ignore  
143 public void testServerMqttTwoWayRpc() throws Exception { 144 public void testServerMqttTwoWayRpc() throws Exception {
144 Device device = new Device(); 145 Device device = new Device();
145 device.setName("Test Two-Way Server-Side RPC"); 146 device.setName("Test Two-Way Server-Side RPC");
@@ -161,12 +162,13 @@ public class MqttServerSideRpcIntegrationTest extends AbstractControllerTest { @@ -161,12 +162,13 @@ public class MqttServerSideRpcIntegrationTest extends AbstractControllerTest {
161 162
162 String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"23\",\"value\": 1}}"; 163 String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"23\",\"value\": 1}}";
163 String deviceId = savedDevice.getId().getId().toString(); 164 String deviceId = savedDevice.getId().getId().toString();
164 - String result = getStringResult(setGpioRequest, "twoway", deviceId); 165 +
  166 + String result = doPostAsync("/api/plugins/rpc/twoway/" + deviceId, setGpioRequest, String.class, status().isOk());
165 Assert.assertEquals("{\"value1\":\"A\",\"value2\":\"B\"}", result); 167 Assert.assertEquals("{\"value1\":\"A\",\"value2\":\"B\"}", result);
166 } 168 }
167 169
168 @Test 170 @Test
169 - @Ignore 171 + @Ignore // TODO: figure out the right error code for this case. Ignored due to failure: expected 408 but was: 200
170 public void testServerMqttTwoWayRpcDeviceOffline() throws Exception { 172 public void testServerMqttTwoWayRpcDeviceOffline() throws Exception {
171 Device device = new Device(); 173 Device device = new Device();
172 device.setName("Test Two-Way Server-Side RPC Device Offline"); 174 device.setName("Test Two-Way Server-Side RPC Device Offline");
@@ -180,7 +182,7 @@ public class MqttServerSideRpcIntegrationTest extends AbstractControllerTest { @@ -180,7 +182,7 @@ public class MqttServerSideRpcIntegrationTest extends AbstractControllerTest {
180 String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"23\",\"value\": 1}}"; 182 String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"23\",\"value\": 1}}";
181 String deviceId = savedDevice.getId().getId().toString(); 183 String deviceId = savedDevice.getId().getId().toString();
182 try { 184 try {
183 - doPost("api/plugins/rpc/twoway/" + deviceId, setGpioRequest, String.class); 185 + doPost("/api/plugins/rpc/twoway/" + deviceId, setGpioRequest, String.class, status().is(408));
184 Assert.fail(FAIL_MSG_IF_HTTP_CLIENT_ERROR_NOT_ENCOUNTERED); 186 Assert.fail(FAIL_MSG_IF_HTTP_CLIENT_ERROR_NOT_ENCOUNTERED);
185 } catch (HttpClientErrorException e) { 187 } catch (HttpClientErrorException e) {
186 log.error(e.getMessage(), e); 188 log.error(e.getMessage(), e);
@@ -190,12 +192,12 @@ public class MqttServerSideRpcIntegrationTest extends AbstractControllerTest { @@ -190,12 +192,12 @@ public class MqttServerSideRpcIntegrationTest extends AbstractControllerTest {
190 } 192 }
191 193
192 @Test 194 @Test
193 - @Ignore 195 + @Ignore // TODO: figure out the right error code for this case. Ignored due to failure: expected 400 (404?) but was: 401
194 public void testServerMqttTwoWayRpcDeviceDoesNotExist() throws Exception { 196 public void testServerMqttTwoWayRpcDeviceDoesNotExist() throws Exception {
195 String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"23\",\"value\": 1}}"; 197 String setGpioRequest = "{\"method\":\"setGpio\",\"params\":{\"pin\": \"23\",\"value\": 1}}";
196 String nonExistentDeviceId = UUID.randomUUID().toString(); 198 String nonExistentDeviceId = UUID.randomUUID().toString();
197 try { 199 try {
198 - doPost("api/plugins/rpc/oneway/" + nonExistentDeviceId, setGpioRequest, String.class); 200 + doPostAsync("/api/plugins/rpc/oneway/" + nonExistentDeviceId, setGpioRequest, String.class, status().is(400));
199 Assert.fail(FAIL_MSG_IF_HTTP_CLIENT_ERROR_NOT_ENCOUNTERED); 201 Assert.fail(FAIL_MSG_IF_HTTP_CLIENT_ERROR_NOT_ENCOUNTERED);
200 } catch (HttpClientErrorException e) { 202 } catch (HttpClientErrorException e) {
201 log.error(e.getMessage(), e); 203 log.error(e.getMessage(), e);
@@ -212,10 +214,6 @@ public class MqttServerSideRpcIntegrationTest extends AbstractControllerTest { @@ -212,10 +214,6 @@ public class MqttServerSideRpcIntegrationTest extends AbstractControllerTest {
212 return doGet("/api/device/" + savedDevice.getId().getId().toString() + "/credentials", DeviceCredentials.class); 214 return doGet("/api/device/" + savedDevice.getId().getId().toString() + "/credentials", DeviceCredentials.class);
213 } 215 }
214 216
215 - private String getStringResult(String requestData, String callType, String deviceId) throws Exception {  
216 - return doPost("api/plugins/rpc/" + callType + "/" + deviceId, requestData, String.class);  
217 - }  
218 -  
219 private static class TestMqttCallback implements MqttCallback { 217 private static class TestMqttCallback implements MqttCallback {
220 218
221 private final MqttAsyncClient client; 219 private final MqttAsyncClient client;
  1 +/**
  2 + * Copyright © 2016-2017 The Thingsboard Authors
  3 + *
  4 + * Licensed under the Apache License, Version 2.0 (the "License");
  5 + * you may not use this file except in compliance with the License.
  6 + * You may obtain a copy of the License at
  7 + *
  8 + * http://www.apache.org/licenses/LICENSE-2.0
  9 + *
  10 + * Unless required by applicable law or agreed to in writing, software
  11 + * distributed under the License is distributed on an "AS IS" BASIS,
  12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 + * See the License for the specific language governing permissions and
  14 + * limitations under the License.
  15 + */
  16 +package org.thingsboard.server.mqtt.rpc.nosql;
  17 +
  18 +import org.thingsboard.server.dao.service.DaoNoSqlTest;
  19 +import org.thingsboard.server.mqtt.rpc.AbstractMqttServerSideRpcIntegrationTest;
  20 +
  21 +/**
  22 + * Created by Valerii Sosliuk on 8/22/2017.
  23 + */
  24 +@DaoNoSqlTest
  25 +public class MqttServerSideRpcNoSqlIntegrationTest extends AbstractMqttServerSideRpcIntegrationTest {
  26 +}
  1 +/**
  2 + * Copyright © 2016-2017 The Thingsboard Authors
  3 + *
  4 + * Licensed under the Apache License, Version 2.0 (the "License");
  5 + * you may not use this file except in compliance with the License.
  6 + * You may obtain a copy of the License at
  7 + *
  8 + * http://www.apache.org/licenses/LICENSE-2.0
  9 + *
  10 + * Unless required by applicable law or agreed to in writing, software
  11 + * distributed under the License is distributed on an "AS IS" BASIS,
  12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 + * See the License for the specific language governing permissions and
  14 + * limitations under the License.
  15 + */
  16 +package org.thingsboard.server.mqtt.rpc.sql;
  17 +
  18 +import org.thingsboard.server.dao.service.DaoNoSqlTest;
  19 +import org.thingsboard.server.dao.service.DaoSqlTest;
  20 +import org.thingsboard.server.mqtt.rpc.AbstractMqttServerSideRpcIntegrationTest;
  21 +
  22 +/**
  23 + * Created by Valerii Sosliuk on 8/22/2017.
  24 + */
  25 +@DaoSqlTest
  26 +public class MqttServerSideRpcSqlIntegrationTest extends AbstractMqttServerSideRpcIntegrationTest {
  27 +}
application/src/test/java/org/thingsboard/server/mqtt/telemetry/AbstractMqttTelemetryIntegrationTest.java renamed from application/src/test/java/org/thingsboard/server/mqtt/telemetry/MqttTelemetryIntegrationTest.java
@@ -26,11 +26,10 @@ import org.springframework.web.util.UriComponentsBuilder; @@ -26,11 +26,10 @@ import org.springframework.web.util.UriComponentsBuilder;
26 import org.thingsboard.server.common.data.Device; 26 import org.thingsboard.server.common.data.Device;
27 import org.thingsboard.server.common.data.security.DeviceCredentials; 27 import org.thingsboard.server.common.data.security.DeviceCredentials;
28 import org.thingsboard.server.controller.AbstractControllerTest; 28 import org.thingsboard.server.controller.AbstractControllerTest;
  29 +import org.thingsboard.server.dao.service.DaoNoSqlTest;
29 30
30 import java.net.URI; 31 import java.net.URI;
31 -import java.util.Arrays;  
32 -import java.util.List;  
33 -import java.util.Map; 32 +import java.util.*;
34 33
35 import static org.junit.Assert.assertEquals; 34 import static org.junit.Assert.assertEquals;
36 import static org.junit.Assert.assertNotNull; 35 import static org.junit.Assert.assertNotNull;
@@ -39,7 +38,7 @@ import static org.junit.Assert.assertNotNull; @@ -39,7 +38,7 @@ import static org.junit.Assert.assertNotNull;
39 * @author Valerii Sosliuk 38 * @author Valerii Sosliuk
40 */ 39 */
41 @Slf4j 40 @Slf4j
42 -public class MqttTelemetryIntegrationTest extends AbstractControllerTest { 41 +public abstract class AbstractMqttTelemetryIntegrationTest extends AbstractControllerTest {
43 42
44 private static final String MQTT_URL = "tcp://localhost:1883"; 43 private static final String MQTT_URL = "tcp://localhost:1883";
45 44
@@ -64,7 +63,6 @@ public class MqttTelemetryIntegrationTest extends AbstractControllerTest { @@ -64,7 +63,6 @@ public class MqttTelemetryIntegrationTest extends AbstractControllerTest {
64 } 63 }
65 64
66 @Test 65 @Test
67 - @Ignore  
68 public void testPushMqttRpcData() throws Exception { 66 public void testPushMqttRpcData() throws Exception {
69 String clientId = MqttAsyncClient.generateClientId(); 67 String clientId = MqttAsyncClient.generateClientId();
70 MqttAsyncClient client = new MqttAsyncClient(MQTT_URL, clientId); 68 MqttAsyncClient client = new MqttAsyncClient(MQTT_URL, clientId);
@@ -80,13 +78,16 @@ public class MqttTelemetryIntegrationTest extends AbstractControllerTest { @@ -80,13 +78,16 @@ public class MqttTelemetryIntegrationTest extends AbstractControllerTest {
80 String deviceId = savedDevice.getId().getId().toString(); 78 String deviceId = savedDevice.getId().getId().toString();
81 79
82 Thread.sleep(1000); 80 Thread.sleep(1000);
83 - Object keys = doGet("/api/plugins/telemetry/" + deviceId + "/keys/timeseries", Object.class);  
84 - assertEquals(Arrays.asList("key1", "key2", "key3", "key4"), keys); 81 + List<String> actualKeys = doGetAsync("/api/plugins/telemetry/DEVICE/" + deviceId + "/keys/timeseries", List.class);
  82 + Set<String> actualKeySet = new HashSet<>(actualKeys);
85 83
86 - UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl("/api/plugins/telemetry/" + deviceId + "/values/timeseries")  
87 - .queryParam("keys", String.join(",", (CharSequence[]) keys));  
88 - URI uri = builder.build().encode().toUri();  
89 - Map<String, List<Map<String, String>>> values = doGet(uri.getPath(), Map.class); 84 + List<String> expectedKeys = Arrays.asList("key1", "key2", "key3", "key4");
  85 + Set<String> expectedKeySet = new HashSet<>(expectedKeys);
  86 +
  87 + assertEquals(expectedKeySet, actualKeySet);
  88 +
  89 + String getTelemetryValuesUrl = "/api/plugins/telemetry/DEVICE/" + deviceId + "/values/timeseries?keys=" + String.join(",", actualKeySet);
  90 + Map<String, List<Map<String, String>>> values = doGetAsync(getTelemetryValuesUrl, Map.class);
90 91
91 assertEquals("value1", values.get("key1").get(0).get("value")); 92 assertEquals("value1", values.get("key1").get(0).get("value"));
92 assertEquals("true", values.get("key2").get(0).get("value")); 93 assertEquals("true", values.get("key2").get(0).get("value"));
  1 +/**
  2 + * Copyright © 2016-2017 The Thingsboard Authors
  3 + *
  4 + * Licensed under the Apache License, Version 2.0 (the "License");
  5 + * you may not use this file except in compliance with the License.
  6 + * You may obtain a copy of the License at
  7 + *
  8 + * http://www.apache.org/licenses/LICENSE-2.0
  9 + *
  10 + * Unless required by applicable law or agreed to in writing, software
  11 + * distributed under the License is distributed on an "AS IS" BASIS,
  12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 + * See the License for the specific language governing permissions and
  14 + * limitations under the License.
  15 + */
  16 +package org.thingsboard.server.mqtt.telemetry.nosql;
  17 +
  18 +import org.thingsboard.server.dao.service.DaoNoSqlTest;
  19 +import org.thingsboard.server.mqtt.telemetry.AbstractMqttTelemetryIntegrationTest;
  20 +
  21 +/**
  22 + * Created by Valerii Sosliuk on 8/22/2017.
  23 + */
  24 +@DaoNoSqlTest
  25 +public class MqttTelemetryNoSqlIntegrationTest extends AbstractMqttTelemetryIntegrationTest {
  26 +}
  1 +/**
  2 + * Copyright © 2016-2017 The Thingsboard Authors
  3 + *
  4 + * Licensed under the Apache License, Version 2.0 (the "License");
  5 + * you may not use this file except in compliance with the License.
  6 + * You may obtain a copy of the License at
  7 + *
  8 + * http://www.apache.org/licenses/LICENSE-2.0
  9 + *
  10 + * Unless required by applicable law or agreed to in writing, software
  11 + * distributed under the License is distributed on an "AS IS" BASIS,
  12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13 + * See the License for the specific language governing permissions and
  14 + * limitations under the License.
  15 + */
  16 +package org.thingsboard.server.mqtt.telemetry.sql;
  17 +
  18 +import org.thingsboard.server.dao.service.DaoNoSqlTest;
  19 +import org.thingsboard.server.dao.service.DaoSqlTest;
  20 +import org.thingsboard.server.mqtt.telemetry.AbstractMqttTelemetryIntegrationTest;
  21 +
  22 +/**
  23 + * Created by Valerii Sosliuk on 8/22/2017.
  24 + */
  25 +@DaoSqlTest
  26 +public class MqttTelemetrySqlIntegrationTest extends AbstractMqttTelemetryIntegrationTest {
  27 +}
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>1.3.0-SNAPSHOT</version> 23 + <version>1.3.0</version>
24 <artifactId>common</artifactId> 24 <artifactId>common</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard.common</groupId> 26 <groupId>org.thingsboard.common</groupId>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>1.3.0-SNAPSHOT</version> 23 + <version>1.3.0</version>
24 <artifactId>common</artifactId> 24 <artifactId>common</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard.common</groupId> 26 <groupId>org.thingsboard.common</groupId>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>1.3.0-SNAPSHOT</version> 23 + <version>1.3.0</version>
24 <artifactId>thingsboard</artifactId> 24 <artifactId>thingsboard</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard</groupId> 26 <groupId>org.thingsboard</groupId>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>1.3.0-SNAPSHOT</version> 23 + <version>1.3.0</version>
24 <artifactId>common</artifactId> 24 <artifactId>common</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard.common</groupId> 26 <groupId>org.thingsboard.common</groupId>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>1.3.0-SNAPSHOT</version> 23 + <version>1.3.0</version>
24 <artifactId>thingsboard</artifactId> 24 <artifactId>thingsboard</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard</groupId> 26 <groupId>org.thingsboard</groupId>
@@ -16,8 +16,8 @@ CASSANDRA_HOST=cassandra @@ -16,8 +16,8 @@ CASSANDRA_HOST=cassandra
16 CASSANDRA_PORT=9042 16 CASSANDRA_PORT=9042
17 17
18 # postgres db config 18 # postgres db config
19 -POSTGRES_HOST=cassandra  
20 -POSTGRES_PORT=9042 19 +POSTGRES_HOST=postgres
  20 +POSTGRES_PORT=5432
21 # SPRING_JPA_DATABASE_PLATFORM=org.hibernate.dialect.PostgreSQLDialect 21 # SPRING_JPA_DATABASE_PLATFORM=org.hibernate.dialect.PostgreSQLDialect
22 # SPRING_DRIVER_CLASS_NAME=org.postgresql.Driver 22 # SPRING_DRIVER_CLASS_NAME=org.postgresql.Driver
23 # SPRING_DATASOURCE_URL=jdbc:postgresql://postgres:5432/thingsboard 23 # SPRING_DATASOURCE_URL=jdbc:postgresql://postgres:5432/thingsboard
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>1.3.0-SNAPSHOT</version> 23 + <version>1.3.0</version>
24 <artifactId>thingsboard</artifactId> 24 <artifactId>thingsboard</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard</groupId> 26 <groupId>org.thingsboard</groupId>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>1.3.0-SNAPSHOT</version> 23 + <version>1.3.0</version>
24 <artifactId>thingsboard</artifactId> 24 <artifactId>thingsboard</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard</groupId> 26 <groupId>org.thingsboard</groupId>
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 <modelVersion>4.0.0</modelVersion> 22 <modelVersion>4.0.0</modelVersion>
23 <parent> 23 <parent>
24 <groupId>org.thingsboard</groupId> 24 <groupId>org.thingsboard</groupId>
25 - <version>1.3.0-SNAPSHOT</version> 25 + <version>1.3.0</version>
26 <artifactId>extensions</artifactId> 26 <artifactId>extensions</artifactId>
27 </parent> 27 </parent>
28 <groupId>org.thingsboard.extensions</groupId> 28 <groupId>org.thingsboard.extensions</groupId>
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 <modelVersion>4.0.0</modelVersion> 22 <modelVersion>4.0.0</modelVersion>
23 <parent> 23 <parent>
24 <groupId>org.thingsboard</groupId> 24 <groupId>org.thingsboard</groupId>
25 - <version>1.3.0-SNAPSHOT</version> 25 + <version>1.3.0</version>
26 <artifactId>extensions</artifactId> 26 <artifactId>extensions</artifactId>
27 </parent> 27 </parent>
28 <groupId>org.thingsboard.extensions</groupId> 28 <groupId>org.thingsboard.extensions</groupId>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>1.3.0-SNAPSHOT</version> 23 + <version>1.3.0</version>
24 <artifactId>extensions</artifactId> 24 <artifactId>extensions</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard.extensions</groupId> 26 <groupId>org.thingsboard.extensions</groupId>
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 <modelVersion>4.0.0</modelVersion> 22 <modelVersion>4.0.0</modelVersion>
23 <parent> 23 <parent>
24 <groupId>org.thingsboard</groupId> 24 <groupId>org.thingsboard</groupId>
25 - <version>1.3.0-SNAPSHOT</version> 25 + <version>1.3.0</version>
26 <artifactId>extensions</artifactId> 26 <artifactId>extensions</artifactId>
27 </parent> 27 </parent>
28 <groupId>org.thingsboard.extensions</groupId> 28 <groupId>org.thingsboard.extensions</groupId>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>1.3.0-SNAPSHOT</version> 23 + <version>1.3.0</version>
24 <artifactId>thingsboard</artifactId> 24 <artifactId>thingsboard</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard</groupId> 26 <groupId>org.thingsboard</groupId>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <groupId>org.thingsboard</groupId> 21 <groupId>org.thingsboard</groupId>
22 <artifactId>thingsboard</artifactId> 22 <artifactId>thingsboard</artifactId>
23 - <version>1.3.0-SNAPSHOT</version> 23 + <version>1.3.0</version>
24 <packaging>pom</packaging> 24 <packaging>pom</packaging>
25 25
26 <name>Thingsboard</name> 26 <name>Thingsboard</name>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>1.3.0-SNAPSHOT</version> 23 + <version>1.3.0</version>
24 <artifactId>thingsboard</artifactId> 24 <artifactId>thingsboard</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard</groupId> 26 <groupId>org.thingsboard</groupId>
@@ -19,7 +19,7 @@ import paho.mqtt.client as mqtt @@ -19,7 +19,7 @@ import paho.mqtt.client as mqtt
19 import ssl, socket 19 import ssl, socket
20 20
21 # The callback for when the client receives a CONNACK response from the server. 21 # The callback for when the client receives a CONNACK response from the server.
22 -def on_connect(client, userdata, rc): 22 +def on_connect(client, userdata, rc, *extra_params):
23 print('Connected with result code '+str(rc)) 23 print('Connected with result code '+str(rc))
24 # Subscribing in on_connect() means that if we lose the connection and 24 # Subscribing in on_connect() means that if we lose the connection and
25 # reconnect then subscriptions will be renewed. 25 # reconnect then subscriptions will be renewed.
@@ -18,8 +18,9 @@ @@ -18,8 +18,9 @@
18 import paho.mqtt.client as mqtt 18 import paho.mqtt.client as mqtt
19 19
20 # The callback for when the client receives a CONNACK response from the server. 20 # The callback for when the client receives a CONNACK response from the server.
21 -def on_connect(client, userdata, rc): 21 +def on_connect(client, userdata, rc, *extra_params):
22 print('Connected with result code '+str(rc)) 22 print('Connected with result code '+str(rc))
  23 + #print('***' + str(r))
23 # Subscribing in on_connect() means that if we lose the connection and 24 # Subscribing in on_connect() means that if we lose the connection and
24 # reconnect then subscriptions will be renewed. 25 # reconnect then subscriptions will be renewed.
25 client.subscribe('v1/devices/me/attributes') 26 client.subscribe('v1/devices/me/attributes')
@@ -19,7 +19,7 @@ import paho.mqtt.client as mqtt @@ -19,7 +19,7 @@ import paho.mqtt.client as mqtt
19 import ssl, socket 19 import ssl, socket
20 20
21 # The callback for when the client receives a CONNACK response from the server. 21 # The callback for when the client receives a CONNACK response from the server.
22 -def on_connect(client, userdata, rc): 22 +def on_connect(client, userdata, rc, *extra_params):
23 print('Connected with result code '+str(rc)) 23 print('Connected with result code '+str(rc))
24 # Subscribing in on_connect() means that if we lose the connection and 24 # Subscribing in on_connect() means that if we lose the connection and
25 # reconnect then subscriptions will be renewed. 25 # reconnect then subscriptions will be renewed.
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>1.3.0-SNAPSHOT</version> 23 + <version>1.3.0</version>
24 <artifactId>transport</artifactId> 24 <artifactId>transport</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard.transport</groupId> 26 <groupId>org.thingsboard.transport</groupId>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>1.3.0-SNAPSHOT</version> 23 + <version>1.3.0</version>
24 <artifactId>transport</artifactId> 24 <artifactId>transport</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard.transport</groupId> 26 <groupId>org.thingsboard.transport</groupId>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>1.3.0-SNAPSHOT</version> 23 + <version>1.3.0</version>
24 <artifactId>transport</artifactId> 24 <artifactId>transport</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard.transport</groupId> 26 <groupId>org.thingsboard.transport</groupId>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>1.3.0-SNAPSHOT</version> 23 + <version>1.3.0</version>
24 <artifactId>thingsboard</artifactId> 24 <artifactId>thingsboard</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard</groupId> 26 <groupId>org.thingsboard</groupId>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <modelVersion>4.0.0</modelVersion> 20 <modelVersion>4.0.0</modelVersion>
21 <parent> 21 <parent>
22 <groupId>org.thingsboard</groupId> 22 <groupId>org.thingsboard</groupId>
23 - <version>1.3.0-SNAPSHOT</version> 23 + <version>1.3.0</version>
24 <artifactId>thingsboard</artifactId> 24 <artifactId>thingsboard</artifactId>
25 </parent> 25 </parent>
26 <groupId>org.thingsboard</groupId> 26 <groupId>org.thingsboard</groupId>