Prosoft Git

thingsboard-aplcache

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

7/25/2018 12:55:25 PM
Dima Landiak

Dima Landiak

Commit: f94c61f

Tree: 8fd9e5e

Parents: 914a052
d8ac388

Changes

application/pom.xml 2(+1 -1)

application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java 3(+3 -0)

application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActor.java 3(+3 -0)

application/src/main/java/org/thingsboard/server/actors/service/ComponentActor.java 4(+2 -2)

application/src/main/java/org/thingsboard/server/actors/stats/StatsPersistTick.java 10(+9 -1)

common/data/pom.xml 2(+1 -1)

common/data/src/main/java/org/thingsboard/server/common/data/kv/BooleanDataEntry.java 2(+1 -1)

common/data/src/main/java/org/thingsboard/server/common/data/kv/DoubleDataEntry.java 2(+1 -1)

common/data/src/main/java/org/thingsboard/server/common/data/kv/LongDataEntry.java 2(+1 -1)

common/data/src/main/java/org/thingsboard/server/common/data/kv/StringDataEntry.java 2(+1 -1)

common/message/pom.xml 2(+1 -1)

common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java 3(+2 -1)

common/pom.xml 2(+1 -1)

common/transport/pom.xml 2(+1 -1)

dao/pom.xml 2(+1 -1)

netty-mqtt/pom.xml 4(+2 -2)

pom.xml 2(+1 -1)

rule-engine/pom.xml 2(+1 -1)

rule-engine/rule-engine-api/pom.xml 2(+1 -1)

rule-engine/rule-engine-components/pom.xml 2(+1 -1)

tools/pom.xml 2(+1 -1)

transport/coap/pom.xml 2(+1 -1)

transport/http/pom.xml 2(+1 -1)

transport/mqtt/pom.xml 2(+1 -1)

transport/pom.xml 2(+1 -1)

ui/pom.xml 2(+1 -1)

Details

application/pom.xml 2(+1 -1) 

diff --git a/application/pom.xml b/application/pom.xml
index c8c06d4..3d7cbe1 100644
--- a/application/pom.xml
+++ b/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 3(+3 -0) 

diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java
index c1a55fb..dbad7c0 100644
--- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleChainActor.java
+++ b/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 3(+3 -0) 

diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActor.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActor.java
index f7ca0d8..273a569 100644
--- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/RuleNodeActor.java
+++ b/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 4(+2 -2) 

diff --git a/application/src/main/java/org/thingsboard/server/actors/service/ComponentActor.java b/application/src/main/java/org/thingsboard/server/actors/service/ComponentActor.java
index 6aa68d3..ed59051 100644
--- a/application/src/main/java/org/thingsboard/server/actors/service/ComponentActor.java
+++ b/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 10(+9 -1) 

diff --git a/application/src/main/java/org/thingsboard/server/actors/stats/StatsPersistTick.java b/application/src/main/java/org/thingsboard/server/actors/stats/StatsPersistTick.java
index 24188d4..0c91bc0 100644
--- a/application/src/main/java/org/thingsboard/server/actors/stats/StatsPersistTick.java
+++ b/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 2(+1 -1) 

diff --git a/common/data/pom.xml b/common/data/pom.xml
index d06deec..b99e6bf 100644
--- a/common/data/pom.xml
+++ b/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 2(+1 -1) 

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/kv/BooleanDataEntry.java b/common/data/src/main/java/org/thingsboard/server/common/data/kv/BooleanDataEntry.java
index 30c3b5d..e78f1d3 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/kv/BooleanDataEntry.java
+++ b/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 2(+1 -1) 

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/kv/DoubleDataEntry.java b/common/data/src/main/java/org/thingsboard/server/common/data/kv/DoubleDataEntry.java
index dda906b..4d9f3f7 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/kv/DoubleDataEntry.java
+++ b/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 2(+1 -1) 

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/kv/LongDataEntry.java b/common/data/src/main/java/org/thingsboard/server/common/data/kv/LongDataEntry.java
index eb34389..18a817f 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/kv/LongDataEntry.java
+++ b/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 2(+1 -1) 

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/kv/StringDataEntry.java b/common/data/src/main/java/org/thingsboard/server/common/data/kv/StringDataEntry.java
index 9131e20..5f1f2a2 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/kv/StringDataEntry.java
+++ b/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 2(+1 -1) 

diff --git a/common/message/pom.xml b/common/message/pom.xml
index 9c71206..6923cac 100644
--- a/common/message/pom.xml
+++ b/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 3(+2 -1) 

diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java b/common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java
index c8b5c4e..60e5469 100644
--- a/common/message/src/main/java/org/thingsboard/server/common/msg/MsgType.java
+++ b/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 2(+1 -1) 

diff --git a/common/pom.xml b/common/pom.xml
index 8cf34d2..fbff206 100644
--- a/common/pom.xml
+++ b/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 2(+1 -1) 

diff --git a/common/transport/pom.xml b/common/transport/pom.xml
index 99587a6..e132ffb 100644
--- a/common/transport/pom.xml
+++ b/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 2(+1 -1) 

diff --git a/dao/pom.xml b/dao/pom.xml
index 89be90f..b12ea42 100644
--- a/dao/pom.xml
+++ b/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 4(+2 -2) 

diff --git a/netty-mqtt/pom.xml b/netty-mqtt/pom.xml
index 3ce2099..8dffbfd 100644
--- a/netty-mqtt/pom.xml
+++ b/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 2(+1 -1) 

diff --git a/pom.xml b/pom.xml
index e0722da..aa54e72 100755
--- a/pom.xml
+++ b/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 2(+1 -1) 

diff --git a/rule-engine/pom.xml b/rule-engine/pom.xml
index 0910eaf..00e4980 100644
--- a/rule-engine/pom.xml
+++ b/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 2(+1 -1) 

diff --git a/rule-engine/rule-engine-api/pom.xml b/rule-engine/rule-engine-api/pom.xml
index a6fc04e..09da1cd 100644
--- a/rule-engine/rule-engine-api/pom.xml
+++ b/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 2(+1 -1) 

diff --git a/rule-engine/rule-engine-components/pom.xml b/rule-engine/rule-engine-components/pom.xml
index 9ef75c3..e52e44b 100644
--- a/rule-engine/rule-engine-components/pom.xml
+++ b/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 2(+1 -1) 

diff --git a/tools/pom.xml b/tools/pom.xml
index bff94af..a386330 100644
--- a/tools/pom.xml
+++ b/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 2(+1 -1) 

diff --git a/transport/coap/pom.xml b/transport/coap/pom.xml
index 48d01ff..2360a75 100644
--- a/transport/coap/pom.xml
+++ b/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 2(+1 -1) 

diff --git a/transport/http/pom.xml b/transport/http/pom.xml
index 1e89a14..a3117d5 100644
--- a/transport/http/pom.xml
+++ b/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 2(+1 -1) 

diff --git a/transport/mqtt/pom.xml b/transport/mqtt/pom.xml
index a634ec9..798e7ab 100644
--- a/transport/mqtt/pom.xml
+++ b/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 2(+1 -1) 

diff --git a/transport/pom.xml b/transport/pom.xml
index 8c16e56..df2bd27 100644
--- a/transport/pom.xml
+++ b/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 2(+1 -1) 

diff --git a/ui/pom.xml b/ui/pom.xml
index ef56274..92c5a60 100644
--- a/ui/pom.xml
+++ b/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>

Bonobo Git Server (6.3.0.632) © 2015 Jakub Chodounský · Official Page · Github