Skip to content

Commit

Permalink
Ignore default value for filters with constant key type
Browse files Browse the repository at this point in the history
  • Loading branch information
@ViacheslavKlimov @ashvayka
ViacheslavKlimov authored and ashvayka committed Mar 30, 2021
1 parent fa46246 commit 68a73ca
Showing 1 changed file with 30 additions and 20 deletions.
50 changes: 30 additions & 20 deletions ...e-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmRuleState.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,7 @@
import org.thingsboard.server.common.data.device.profile.SpecificTimeSchedule;
import org.thingsboard.server.common.data.query.BooleanFilterPredicate;
import org.thingsboard.server.common.data.query.ComplexFilterPredicate;
import org.thingsboard.server.common.data.query.EntityKey;
import org.thingsboard.server.common.data.query.EntityKeyType;
import org.thingsboard.server.common.data.query.FilterPredicateValue;
import org.thingsboard.server.common.data.query.KeyFilter;
import org.thingsboard.server.common.data.query.KeyFilterPredicate;
import org.thingsboard.server.common.data.query.NumericFilterPredicate;
import org.thingsboard.server.common.data.query.StringFilterPredicate;
Expand Down Expand Up @@ -275,7 +272,7 @@ private boolean eval(AlarmCondition condition, DataSnapshot data) {
if (value == null) {
return false;
}
eval = eval && eval(data, value, filter.getPredicate());
eval = eval && eval(data, value, filter.getPredicate(), filter);
}
return eval;
}
Expand All @@ -300,33 +297,33 @@ private EntityKeyValue getConstantValue(AlarmConditionFilter filter) {
return value;
}

private boolean eval(DataSnapshot data, EntityKeyValue value, KeyFilterPredicate predicate) {
private boolean eval(DataSnapshot data, EntityKeyValue value, KeyFilterPredicate predicate, AlarmConditionFilter filter) {
switch (predicate.getType()) {
case STRING:
return evalStrPredicate(data, value, (StringFilterPredicate) predicate);
return evalStrPredicate(data, value, (StringFilterPredicate) predicate, filter);
case NUMERIC:
return evalNumPredicate(data, value, (NumericFilterPredicate) predicate);
return evalNumPredicate(data, value, (NumericFilterPredicate) predicate, filter);
case BOOLEAN:
return evalBoolPredicate(data, value, (BooleanFilterPredicate) predicate);
return evalBoolPredicate(data, value, (BooleanFilterPredicate) predicate, filter);
case COMPLEX:
return evalComplexPredicate(data, value, (ComplexFilterPredicate) predicate);
return evalComplexPredicate(data, value, (ComplexFilterPredicate) predicate, filter);
default:
return false;
}
}

private boolean evalComplexPredicate(DataSnapshot data, EntityKeyValue ekv, ComplexFilterPredicate predicate) {
private boolean evalComplexPredicate(DataSnapshot data, EntityKeyValue ekv, ComplexFilterPredicate predicate, AlarmConditionFilter filter) {
switch (predicate.getOperation()) {
case OR:
for (KeyFilterPredicate kfp : predicate.getPredicates()) {
if (eval(data, ekv, kfp)) {
if (eval(data, ekv, kfp, filter)) {
return true;
}
}
return false;
case AND:
for (KeyFilterPredicate kfp : predicate.getPredicates()) {
if (!eval(data, ekv, kfp)) {
if (!eval(data, ekv, kfp, filter)) {
return false;
}
}
Expand All @@ -336,12 +333,15 @@ private boolean evalComplexPredicate(DataSnapshot data, EntityKeyValue ekv, Comp
}
}

private boolean evalBoolPredicate(DataSnapshot data, EntityKeyValue ekv, BooleanFilterPredicate predicate) {
private boolean evalBoolPredicate(DataSnapshot data, EntityKeyValue ekv, BooleanFilterPredicate predicate, AlarmConditionFilter filter) {
Boolean val = getBoolValue(ekv);
if (val == null) {
return false;
}
Boolean predicateValue = getPredicateValue(data, predicate.getValue(), AlarmRuleState::getBoolValue);
Boolean predicateValue = getPredicateValue(data, predicate.getValue(), filter, AlarmRuleState::getBoolValue);
if (predicateValue == null) {
return false;
}
switch (predicate.getOperation()) {
case EQUAL:
return val.equals(predicateValue);
Expand All @@ -352,12 +352,15 @@ private boolean evalBoolPredicate(DataSnapshot data, EntityKeyValue ekv, Boolean
}
}

private boolean evalNumPredicate(DataSnapshot data, EntityKeyValue ekv, NumericFilterPredicate predicate) {
private boolean evalNumPredicate(DataSnapshot data, EntityKeyValue ekv, NumericFilterPredicate predicate, AlarmConditionFilter filter) {
Double val = getDblValue(ekv);
if (val == null) {
return false;
}
Double predicateValue = getPredicateValue(data, predicate.getValue(), AlarmRuleState::getDblValue);
Double predicateValue = getPredicateValue(data, predicate.getValue(), filter, AlarmRuleState::getDblValue);
if (predicateValue == null) {
return false;
}
switch (predicate.getOperation()) {
case NOT_EQUAL:
return !val.equals(predicateValue);
Expand All @@ -376,12 +379,15 @@ private boolean evalNumPredicate(DataSnapshot data, EntityKeyValue ekv, NumericF
}
}

private boolean evalStrPredicate(DataSnapshot data, EntityKeyValue ekv, StringFilterPredicate predicate) {
private boolean evalStrPredicate(DataSnapshot data, EntityKeyValue ekv, StringFilterPredicate predicate, AlarmConditionFilter filter) {
String val = getStrValue(ekv);
if (val == null) {
return false;
}
String predicateValue = getPredicateValue(data, predicate.getValue(), AlarmRuleState::getStrValue);
String predicateValue = getPredicateValue(data, predicate.getValue(), filter, AlarmRuleState::getStrValue);
if (predicateValue == null) {
return false;
}
if (predicate.isIgnoreCase()) {
val = val.toLowerCase();
predicateValue = predicateValue.toLowerCase();
Expand All @@ -404,15 +410,19 @@ private boolean evalStrPredicate(DataSnapshot data, EntityKeyValue ekv, StringFi
}
}

private <T> T getPredicateValue(DataSnapshot data, FilterPredicateValue<T> value, Function<EntityKeyValue, T> transformFunction) {
private <T> T getPredicateValue(DataSnapshot data, FilterPredicateValue<T> value, AlarmConditionFilter filter, Function<EntityKeyValue, T> transformFunction) {
EntityKeyValue ekv = getDynamicPredicateValue(data, value);
if (ekv != null) {
T result = transformFunction.apply(ekv);
if (result != null) {
return result;
}
}
return value.getDefaultValue();
if (filter.getKey().getType() != AlarmConditionKeyType.CONSTANT) {
return value.getDefaultValue();
} else {
return null;
}
}

private <T> EntityKeyValue getDynamicPredicateValue(DataSnapshot data, FilterPredicateValue<T> value) {
Expand Down

0 comments on commit 68a73ca

Please sign in to comment.