Merge branch 'master' into feature/TB-61

application/src/test/java/org/thingsboard/server/actors/DefaultActorServiceTest.java

@@ -239,7 +239,7 @@ public class DefaultActorServiceTest {
         List<TsKvEntry> expected = new ArrayList<>();
         expected.add(new BasicTsKvEntry(ts, entry1));
         expected.add(new BasicTsKvEntry(ts, entry2));
-        verify(tsService, Mockito.timeout(5000)).save(deviceId, expected);
+        verify(tsService, Mockito.timeout(5000)).save(deviceId, expected, 0L);
     }
 
 }

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

@@ -103,7 +103,7 @@ public class RuleControllerTest extends AbstractControllerTest {
                 "\"name\":\"TelemetryFilter\", " +
                 "\"configuration\": {\"messageTypes\":[\"POST_TELEMETRY\",\"POST_ATTRIBUTES\",\"GET_ATTRIBUTES\"]}}]"));
         doPost("/api/rule", rule).andExpect(status().isBadRequest());
-        rule.setAction(mapper.readTree("{\"clazz\":\"org.thingsboard.server.extensions.core.action.telemetry.TelemetryPluginAction\", \"name\":\"TelemetryMsgConverterAction\", \"configuration\":{}}"));
+        rule.setAction(mapper.readTree("{\"clazz\":\"org.thingsboard.server.extensions.core.action.telemetry.TelemetryPluginAction\", \"name\":\"TelemetryMsgConverterAction\", \"configuration\":{\"timeUnit\":\"DAYS\", \"ttlValue\":1}}"));
 
         RuleMetaData savedRule = doPost("/api/rule", rule, RuleMetaData.class);
         Assert.assertNotNull(savedRule);
@@ -240,7 +240,8 @@ public class RuleControllerTest extends AbstractControllerTest {
         rule.setFilters(mapper.readTree("[{\"clazz\":\"org.thingsboard.server.extensions.core.filter.MsgTypeFilter\", " +
                 "\"name\":\"TelemetryFilter\", " +
                 "\"configuration\": {\"messageTypes\":[\"POST_TELEMETRY\",\"POST_ATTRIBUTES\",\"GET_ATTRIBUTES\"]}}]"));
-        rule.setAction(mapper.readTree("{\"clazz\":\"org.thingsboard.server.extensions.core.action.telemetry.TelemetryPluginAction\", \"name\":\"TelemetryMsgConverterAction\", \"configuration\":{}}"));
+        rule.setAction(mapper.readTree("{\"clazz\":\"org.thingsboard.server.extensions.core.action.telemetry.TelemetryPluginAction\", \"name\":\"TelemetryMsgConverterAction\", " +
+                "\"configuration\":{\"timeUnit\":\"DAYS\", \"ttlValue\":1}}"));
         return rule;
     }
 }