From e93c975a010a5d7b0465de187b7469049642d7fc Mon Sep 17 00:00:00 2001 From: Andrew Volostnykh Date: Fri, 12 Feb 2021 11:59:01 +0200 Subject: [PATCH] Compound with front-end, fix of incorrect getter use --- .../thingsboard/server/common/data/query/DynamicValue.java | 4 ++-- .../org/thingsboard/rule/engine/profile/AlarmRuleState.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/DynamicValue.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/DynamicValue.java index ccd8151309..19efbf5f33 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/query/DynamicValue.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/DynamicValue.java @@ -30,7 +30,7 @@ public class DynamicValue { public DynamicValue(DynamicValueSourceType sourceType, String sourceAttribute) { this.sourceAttribute = sourceAttribute; this.sourceType = sourceType; - this.inheritMode = false; + this.inherit = false; } @Getter @@ -38,6 +38,6 @@ public class DynamicValue { @Getter private final String sourceAttribute; @Getter - private final boolean inheritMode; + private final boolean inherit; } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmRuleState.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmRuleState.java index b569a58952..e2bb845e03 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmRuleState.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmRuleState.java @@ -393,7 +393,7 @@ class AlarmRuleState { break; case CURRENT_CUSTOMER: ekv = dynamicPredicateValueCtx.getCustomerValue(value.getDynamicValue().getSourceAttribute()); - if(ekv == null && value.getDynamicValue().getInheritMode()) { + if(ekv == null && value.getDynamicValue().isInherit()) { ekv = dynamicPredicateValueCtx.getTenantValue(value.getDynamicValue().getSourceAttribute()); } break; @@ -408,7 +408,7 @@ class AlarmRuleState { } } } - if(ekv == null && value.getDynamicValue().getInheritMode()) { + if(ekv == null && value.getDynamicValue().isInherit()) { ekv = dynamicPredicateValueCtx.getCustomerValue(value.getDynamicValue().getSourceAttribute()); if(ekv == null) { ekv = dynamicPredicateValueCtx.getTenantValue(value.getDynamicValue().getSourceAttribute());