Browse Source

DynamicValue: Rename 'useInherit' to correct name 'inheritMode'

pull/4119/head
AndrewVolosytnykhThingsboard 6 years ago
committed by Andrew Shvayka
parent
commit
77de9da2a8
  1. 4
      common/data/src/main/java/org/thingsboard/server/common/data/query/DynamicValue.java
  2. 4
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmRuleState.java

4
common/data/src/main/java/org/thingsboard/server/common/data/query/DynamicValue.java

@ -30,7 +30,7 @@ public class DynamicValue<T> {
public DynamicValue(DynamicValueSourceType sourceType, String sourceAttribute) {
this.sourceAttribute = sourceAttribute;
this.sourceType = sourceType;
this.useInherit = false;
this.inheritMode = false;
}
@Getter
@ -38,6 +38,6 @@ public class DynamicValue<T> {
@Getter
private final String sourceAttribute;
@Getter
private final boolean useInherit;
private final boolean inheritMode;
}

4
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().getUseInherit()) {
if(ekv == null && value.getDynamicValue().getInheritMode()) {
ekv = dynamicPredicateValueCtx.getTenantValue(value.getDynamicValue().getSourceAttribute());
}
break;
@ -408,7 +408,7 @@ class AlarmRuleState {
}
}
}
if(ekv == null && value.getDynamicValue().getUseInherit()) {
if(ekv == null && value.getDynamicValue().getInheritMode()) {
ekv = dynamicPredicateValueCtx.getCustomerValue(value.getDynamicValue().getSourceAttribute());
if(ekv == null) {
ekv = dynamicPredicateValueCtx.getTenantValue(value.getDynamicValue().getSourceAttribute());

Loading…
Cancel
Save