简柏林 / thingskit · Commits

Commit f94c61f256f955801a25e442e40542a2ac41cdc5

Authored by Dima Landiak
2 parents 914a052a d8ac3883

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

Inline Side-by-side
Showing 26 changed files with 41 additions and 26 deletions
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.1.0</version>
  23 + <version>2.1.1-SNAPSHOT</version>
24 24 <artifactId>thingsboard</artifactId>
25 25 </parent>
26 26 <artifactId>application</artifactId>
... ...
... ... @@ -57,6 +57,9 @@ public class RuleChainActor extends ComponentActor<RuleChainId, RuleChainActorMe
57 57 break;
58 58 case CLUSTER_EVENT_MSG:
59 59 break;
  60 + case STATS_PERSIST_TICK_MSG:
  61 + onStatsPersistTick(id);
  62 + break;
60 63 default:
61 64 return false;
62 65 }
... ...
... ... @@ -50,6 +50,9 @@ public class RuleNodeActor extends ComponentActor<RuleNodeId, RuleNodeActorMessa
50 50 case RULE_TO_SELF_MSG:
51 51 onRuleNodeToSelfMsg((RuleNodeToSelfMsg) msg);
52 52 break;
  53 + case STATS_PERSIST_TICK_MSG:
  54 + onStatsPersistTick(id);
  55 + break;
53 56 default:
54 57 return false;
55 58 }
... ...
... ... @@ -159,11 +159,11 @@ public abstract class ComponentActor<T extends EntityId, P extends ComponentMsgP
159 159 }
160 160 }
161 161
162   - protected void logLifecycleEvent(ComponentLifecycleEvent event) {
  162 + private void logLifecycleEvent(ComponentLifecycleEvent event) {
163 163 logLifecycleEvent(event, null);
164 164 }
165 165
166   - protected void logLifecycleEvent(ComponentLifecycleEvent event, Exception e) {
  166 + private void logLifecycleEvent(ComponentLifecycleEvent event, Exception e) {
167 167 systemContext.persistLifecycleEvent(tenantId, id, event, e);
168 168 }
169 169
... ...
... ... @@ -15,4 +15,12 @@
15 15 */
16 16 package org.thingsboard.server.actors.stats;
17 17
18   -public final class StatsPersistTick {}
  18 +import org.thingsboard.server.common.msg.MsgType;
  19 +import org.thingsboard.server.common.msg.TbActorMsg;
  20 +
  21 +public final class StatsPersistTick implements TbActorMsg{
  22 + @Override
  23 + public MsgType getMsgType() {
  24 + return MsgType.STATS_PERSIST_TICK_MSG;
  25 + }
  26 +}
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.1.0</version>
  23 + <version>2.1.1-SNAPSHOT</version>
24 24 <artifactId>common</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard.common</groupId>
... ...
... ... @@ -33,7 +33,7 @@ public class BooleanDataEntry extends BasicKvEntry {
33 33
34 34 @Override
35 35 public Optional<Boolean> getBooleanValue() {
36   - return Optional.of(value);
  36 + return Optional.ofNullable(value);
37 37 }
38 38
39 39 @Override
... ...
... ... @@ -34,7 +34,7 @@ public class DoubleDataEntry extends BasicKvEntry {
34 34
35 35 @Override
36 36 public Optional<Double> getDoubleValue() {
37   - return Optional.of(value);
  37 + return Optional.ofNullable(value);
38 38 }
39 39
40 40 @Override
... ...
... ... @@ -34,7 +34,7 @@ public class LongDataEntry extends BasicKvEntry {
34 34
35 35 @Override
36 36 public Optional<Long> getLongValue() {
37   - return Optional.of(value);
  37 + return Optional.ofNullable(value);
38 38 }
39 39
40 40 @Override
... ...
... ... @@ -35,7 +35,7 @@ public class StringDataEntry extends BasicKvEntry {
35 35
36 36 @Override
37 37 public Optional<String> getStrValue() {
38   - return Optional.of(value);
  38 + return Optional.ofNullable(value);
39 39 }
40 40
41 41 @Override
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.1.0</version>
  23 + <version>2.1.1-SNAPSHOT</version>
24 24 <artifactId>common</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard.common</groupId>
... ...
... ... @@ -110,6 +110,7 @@ public enum MsgType {
110 110 ACTOR_SYSTEM_TO_DEVICE_SESSION_ACTOR_MSG,
111 111 TRANSPORT_TO_DEVICE_SESSION_ACTOR_MSG,
112 112 SESSION_TIMEOUT_MSG,
113   - SESSION_CTRL_MSG;
  113 + SESSION_CTRL_MSG,
  114 + STATS_PERSIST_TICK_MSG;
114 115
115 116 }
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.1.0</version>
  23 + <version>2.1.1-SNAPSHOT</version>
24 24 <artifactId>thingsboard</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.1.0</version>
  23 + <version>2.1.1-SNAPSHOT</version>
24 24 <artifactId>common</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard.common</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.1.0</version>
  23 + <version>2.1.1-SNAPSHOT</version>
24 24 <artifactId>thingsboard</artifactId>
25 25 </parent>
26 26 <artifactId>dao</artifactId>
... ...
... ... @@ -19,12 +19,12 @@
19 19 <modelVersion>4.0.0</modelVersion>
20 20 <parent>
21 21 <groupId>org.thingsboard</groupId>
22   - <version>2.1.0</version>
  22 + <version>2.1.1-SNAPSHOT</version>
23 23 <artifactId>thingsboard</artifactId>
24 24 </parent>
25 25 <groupId>org.thingsboard</groupId>
26 26 <artifactId>netty-mqtt</artifactId>
27   - <version>2.1.0</version>
  27 + <version>2.1.1-SNAPSHOT</version>
28 28 <packaging>jar</packaging>
29 29
30 30 <name>Netty MQTT Client</name>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <groupId>org.thingsboard</groupId>
22 22 <artifactId>thingsboard</artifactId>
23   - <version>2.1.0</version>
  23 + <version>2.1.1-SNAPSHOT</version>
24 24 <packaging>pom</packaging>
25 25
26 26 <name>Thingsboard</name>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.1.0</version>
  23 + <version>2.1.1-SNAPSHOT</version>
24 24 <artifactId>thingsboard</artifactId>
25 25 </parent>
26 26 <artifactId>rule-engine</artifactId>
... ...
... ... @@ -22,7 +22,7 @@
22 22 <modelVersion>4.0.0</modelVersion>
23 23 <parent>
24 24 <groupId>org.thingsboard</groupId>
25   - <version>2.1.0</version>
  25 + <version>2.1.1-SNAPSHOT</version>
26 26 <artifactId>rule-engine</artifactId>
27 27 </parent>
28 28 <groupId>org.thingsboard.rule-engine</groupId>
... ...
... ... @@ -22,7 +22,7 @@
22 22 <modelVersion>4.0.0</modelVersion>
23 23 <parent>
24 24 <groupId>org.thingsboard</groupId>
25   - <version>2.1.0</version>
  25 + <version>2.1.1-SNAPSHOT</version>
26 26 <artifactId>rule-engine</artifactId>
27 27 </parent>
28 28 <groupId>org.thingsboard.rule-engine</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.1.0</version>
  23 + <version>2.1.1-SNAPSHOT</version>
24 24 <artifactId>thingsboard</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.1.0</version>
  23 + <version>2.1.1-SNAPSHOT</version>
24 24 <artifactId>transport</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard.transport</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.1.0</version>
  23 + <version>2.1.1-SNAPSHOT</version>
24 24 <artifactId>transport</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard.transport</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.1.0</version>
  23 + <version>2.1.1-SNAPSHOT</version>
24 24 <artifactId>transport</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard.transport</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.1.0</version>
  23 + <version>2.1.1-SNAPSHOT</version>
24 24 <artifactId>thingsboard</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard</groupId>
... ...
... ... @@ -20,7 +20,7 @@
20 20 <modelVersion>4.0.0</modelVersion>
21 21 <parent>
22 22 <groupId>org.thingsboard</groupId>
23   - <version>2.1.0</version>
  23 + <version>2.1.1-SNAPSHOT</version>
24 24 <artifactId>thingsboard</artifactId>
25 25 </parent>
26 26 <groupId>org.thingsboard</groupId>
... ...