dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge PR #7316

Browse Source
This commit is contained in:
Andrii Shvaika 2022-09-22 16:44:29 +03:00
commit 7c4d408085
31 changed files with 7 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbNode.java
View File

@ -29,7 +29,7 @@ public interface TbNode {
void onMsg(TbContext ctx, TbMsg msg) throws ExecutionException, InterruptedException, TbNodeException;
void destroy();
default void destroy() {}
default void onPartitionChangeMsg(TbContext ctx, PartitionChangeMsg msg) {}

3
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractCustomerActionNode.java
View File

@ -92,6 +92,9 @@ public abstract class TbAbstractCustomerActionNode<C extends TbAbstractCustomerA
@Override
public void destroy() {
if (customerIdCache != null) {
customerIdCache.invalidateAll();
}
}
@Data

3
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbAbstractRelationActionNode.java
View File

@ -88,6 +88,9 @@ public abstract class TbAbstractRelationActionNode<C extends TbAbstractRelationA
@Override
public void destroy() {
if (entityIdCache != null) {
entityIdCache.invalidateAll();
}
}
protected ListenableFuture<RelationContainer> processEntityRelationAction(TbContext ctx, TbMsg msg, String relationType) {

3
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbCopyAttributesToEntityViewNode.java
View File

@ -158,7 +158,4 @@ public class TbCopyAttributesToEntityViewNode implements TbNode {
return CollectionsUtil.contains(keys, attrKey);
}
@Override
public void destroy() {
}
}

3
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/action/TbMsgCountNode.java
View File

@ -98,7 +98,4 @@ public class TbMsgCountNode implements TbNode {
ctx.tellSelf(tickMsg, curDelay);
}
@Override
public void destroy() {
}
}

4
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/edge/AbstractTbMsgPushNode.java
View File

@ -71,10 +71,6 @@ public abstract class AbstractTbMsgPushNode<T extends BaseTbMsgPushNodeConfigura
}
}
@Override
public void destroy() {
}
protected S buildEvent(TbMsg msg, TbContext ctx) {
String msgType = msg.getType();
if (DataConstants.ALARM.equals(msgType)) {

3
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNode.java
View File

@ -93,7 +93,4 @@ public class TbCheckAlarmStatusNode implements TbNode {
}
}
@Override
public void destroy() {
}
}

4
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckMessageNode.java
View File

@ -68,10 +68,6 @@ public class TbCheckMessageNode implements TbNode {
}
}
@Override
public void destroy() {
}
private boolean allKeysData(TbMsg msg) {
if (!messageNamesList.isEmpty()) {
Map<String, String> dataMap = dataToMap(msg);

4
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbCheckRelationNode.java
View File

@ -103,8 +103,4 @@ public class TbCheckRelationNode implements TbNode {
}
}
@Override
public void destroy() {
}
}

4
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeFilterNode.java
View File

@ -52,8 +52,4 @@ public class TbMsgTypeFilterNode implements TbNode {
ctx.tellNext(msg, config.getMessageTypes().contains(msg.getType()) ? "True" : "False");
}
@Override
public void destroy() {
}
}

4
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbMsgTypeSwitchNode.java
View File

@ -117,8 +117,4 @@ public class TbMsgTypeSwitchNode implements TbNode {
ctx.tellNext(msg, relationType);
}
@Override
public void destroy() {
}
}

4
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeFilterNode.java
View File

@ -51,8 +51,4 @@ public class TbOriginatorTypeFilterNode implements TbNode {
ctx.tellNext(msg, config.getOriginatorTypes().contains(originatorType) ? "True" : "False");
}
@Override
public void destroy() {
}
}

4
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/filter/TbOriginatorTypeSwitchNode.java
View File

@ -90,8 +90,4 @@ public class TbOriginatorTypeSwitchNode implements TbNode {
ctx.tellNext(msg, relationType);
}
@Override
public void destroy() {
}
}

3
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbAckNode.java
View File

@ -51,7 +51,4 @@ public class TbAckNode implements TbNode {
ctx.tellSuccess(msg);
}
@Override
public void destroy() {
}
}

3
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbCheckpointNode.java
View File

@ -54,7 +54,4 @@ public class TbCheckpointNode implements TbNode {
ctx.enqueueForTellNext(msg, queueName, TbRelationTypes.SUCCESS, () -> ctx.ack(msg), error -> ctx.tellFailure(msg, error));
}
@Override
public void destroy() {
}
}

3
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNode.java
View File

@ -63,7 +63,4 @@ public class TbRuleChainInputNode implements TbNode {
ctx.input(msg, ruleChainId);
}
@Override
public void destroy() {
}
}

3
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/flow/TbRuleChainOutputNode.java
View File

@ -51,7 +51,4 @@ public class TbRuleChainOutputNode implements TbNode {
ctx.output(msg, ctx.getSelf().getName());
}
@Override
public void destroy() {
}
}

5
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/geo/AbstractGeofencingNode.java
View File

@ -148,9 +148,4 @@ public abstract class AbstractGeofencingNode<T extends TbGpsGeofencingFilterNode
return value;
}
@Override
public void destroy() {
}
}

4
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNode.java
View File

@ -110,8 +110,4 @@ public class TbMsgToEmailNode implements TbNode {
}
}
@Override
public void destroy() {
}
}

4
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbSendEmailNode.java
View File

@ -107,10 +107,6 @@ public class TbSendEmailNode implements TbNode {
}
}
@Override
public void destroy() {
}
private JavaMailSenderImpl createMailSender() {
JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
mailSender.setHost(this.config.getSmtpHost());

4
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetAttributesNode.java
View File

@ -79,10 +79,6 @@ public abstract class TbAbstractGetAttributesNode<C extends TbGetAttributesNodeC
}
}
@Override
public void destroy() {
}
protected abstract ListenableFuture<T> findEntityIdAsync(TbContext ctx, TbMsg msg);
private void safePutAttributes(TbContext ctx, TbMsg msg, T entityId) {

4
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbAbstractGetEntityDetailsNode.java
View File

@ -63,10 +63,6 @@ public abstract class TbAbstractGetEntityDetailsNode<C extends TbAbstractGetEnti
t -> ctx.tellFailure(msg, t), ctx.getDbCallbackExecutor());
}
@Override
public void destroy() {
}
protected abstract C loadGetEntityDetailsNodeConfiguration(TbNodeConfiguration configuration) throws TbNodeException;
protected abstract ListenableFuture<TbMsg> getDetails(TbContext ctx, TbMsg msg);

5
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbEntityGetAttrNode.java
View File

@ -100,11 +100,6 @@ public abstract class TbEntityGetAttrNode<T extends EntityId> implements TbNode
ctx.tellSuccess(msg);
}
@Override
public void destroy() {
}
protected abstract ListenableFuture<T> findEntityAsync(TbContext ctx, EntityId originator);
public void setConfig(TbGetEntityAttrNodeConfiguration config) {

4
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNode.java
View File

@ -82,8 +82,4 @@ public class TbGetOriginatorFieldsNode implements TbNode {
}
}
@Override
public void destroy() {
}
}

4
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNode.java
View File

@ -123,10 +123,6 @@ public class TbGetTelemetryNode implements TbNode {
}
}
@Override
public void destroy() {
}
private List<ReadTsKvQuery> buildQueries(Interval interval, List<String> keys) {
final long aggIntervalStep = Aggregation.NONE.equals(aggregation) ? 1 :
// exact how it validates on BaseTimeseriesService.validate()

4
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rpc/TbSendRPCReplyNode.java
View File

@ -70,8 +70,4 @@ public class TbSendRPCReplyNode implements TbNode {
}
}
@Override
public void destroy() {
}
}

4
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/rpc/TbSendRPCRequestNode.java
View File

@ -127,10 +127,6 @@ public class TbSendRPCRequestNode implements TbNode {
}
}
@Override
public void destroy() {
}
private String wrap(String name, String body) {
JsonObject json = new JsonObject();
json.addProperty(name, body);

4
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgAttributesNode.java
View File

@ -75,8 +75,4 @@ public class TbMsgAttributesNode implements TbNode {
);
}
@Override
public void destroy() {
}
}

4
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbSynchronizationBeginNode.java
View File

@ -49,8 +49,4 @@ public class TbSynchronizationBeginNode implements TbNode {
ctx.tellSuccess(msg);
}
@Override
public void destroy() {
}
}

3
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbSynchronizationEndNode.java
View File

@ -48,7 +48,4 @@ public class TbSynchronizationEndNode implements TbNode {
ctx.tellSuccess(msg);
}
@Override
public void destroy() {
}
}

4
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbChangeOriginatorNode.java
View File

@ -108,8 +108,4 @@ public class TbChangeOriginatorNode extends TbAbstractTransformNode {
}
@Override
public void destroy() {
}
}