Merge branch 'master' of github.com:thingsboard/thingsboard

application/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>application</artifactId>

application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java

@@ -57,6 +57,9 @@ public class RuleChainActor extends ComponentActor<RuleChainId, RuleChainActorMe
                 break;
             case CLUSTER_EVENT_MSG:
                 break;
+            case STATS_PERSIST_TICK_MSG:
+                onStatsPersistTick(id);
+                break;
             default:
                 return false;
         }

application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActor.java

@@ -50,6 +50,9 @@ public class RuleNodeActor extends ComponentActor<RuleNodeId, RuleNodeActorMessa
             case RULE_TO_SELF_MSG:
                 onRuleNodeToSelfMsg((RuleNodeToSelfMsg) msg);
                 break;
+            case STATS_PERSIST_TICK_MSG:
+                onStatsPersistTick(id);
+                break;
             default:
                 return false;
         }

application/src/main/java/org/thingsboard/server/actors/service/ComponentActor.java

@@ -159,11 +159,11 @@ public abstract class ComponentActor<T extends EntityId, P extends ComponentMsgP
         }
     }
 
-    protected void logLifecycleEvent(ComponentLifecycleEvent event) {
+    private void logLifecycleEvent(ComponentLifecycleEvent event) {
         logLifecycleEvent(event, null);
     }
 
-    protected void logLifecycleEvent(ComponentLifecycleEvent event, Exception e) {
+    private void logLifecycleEvent(ComponentLifecycleEvent event, Exception e) {
         systemContext.persistLifecycleEvent(tenantId, id, event, e);
     }
 

application/src/main/java/org/thingsboard/server/actors/stats/StatsPersistTick.java

@@ -15,4 +15,12 @@
  */
 package org.thingsboard.server.actors.stats;
 
-public final class StatsPersistTick {}
+import org.thingsboard.server.common.msg.MsgType;
+import org.thingsboard.server.common.msg.TbActorMsg;
+
+public final class StatsPersistTick implements TbActorMsg{
+    @Override
+    public MsgType getMsgType() {
+        return MsgType.STATS_PERSIST_TICK_MSG;
+    }
+}

common/data/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/data/src/main/java/org/thingsboard/server/common/data/kv/BooleanDataEntry.java

@@ -33,7 +33,7 @@ public class BooleanDataEntry extends BasicKvEntry {
 
     @Override
     public Optional<Boolean> getBooleanValue() {
-        return Optional.of(value);
+        return Optional.ofNullable(value);
     }
 
     @Override

common/data/src/main/java/org/thingsboard/server/common/data/kv/DoubleDataEntry.java

@@ -34,7 +34,7 @@ public class DoubleDataEntry extends BasicKvEntry {
 
     @Override
     public Optional<Double> getDoubleValue() {
-        return Optional.of(value);
+        return Optional.ofNullable(value);
     }
 
     @Override

common/data/src/main/java/org/thingsboard/server/common/data/kv/LongDataEntry.java

@@ -34,7 +34,7 @@ public class LongDataEntry extends BasicKvEntry {
 
     @Override
     public Optional<Long> getLongValue() {
-        return Optional.of(value);
+        return Optional.ofNullable(value);
     }
 
     @Override

common/data/src/main/java/org/thingsboard/server/common/data/kv/StringDataEntry.java

@@ -35,7 +35,7 @@ public class StringDataEntry extends BasicKvEntry {
 
     @Override
     public Optional<String> getStrValue() {
-        return Optional.of(value);
+        return Optional.ofNullable(value);
     }
 
     @Override

common/message/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java

@@ -110,6 +110,7 @@ public enum MsgType {
     ACTOR_SYSTEM_TO_DEVICE_SESSION_ACTOR_MSG,
     TRANSPORT_TO_DEVICE_SESSION_ACTOR_MSG,
     SESSION_TIMEOUT_MSG,
-    SESSION_CTRL_MSG;
+    SESSION_CTRL_MSG,
+    STATS_PERSIST_TICK_MSG;
 
 }

common/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>

common/transport/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

dao/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>dao</artifactId>

netty-mqtt/pom.xml

@@ -19,12 +19,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>
     <artifactId>netty-mqtt</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Netty MQTT Client</name>

pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.thingsboard</groupId>
     <artifactId>thingsboard</artifactId>
-    <version>2.1.0</version>
+    <version>2.1.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Thingsboard</name>

rule-engine/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>rule-engine</artifactId>

rule-engine/rule-engine-api/pom.xml

@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <artifactId>rule-engine</artifactId>
     </parent>
     <groupId>org.thingsboard.rule-engine</groupId>

rule-engine/rule-engine-components/pom.xml

@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <artifactId>rule-engine</artifactId>
     </parent>
     <groupId>org.thingsboard.rule-engine</groupId>

tools/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>

transport/coap/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.transport</groupId>

transport/http/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.transport</groupId>

transport/mqtt/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.transport</groupId>

transport/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>

ui/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>2.1.0</version>
+        <version>2.1.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>