Browse Source

refactor code

pull/7077/head
Yuriy Lytvynchuk 4 years ago
parent
commit
377712618f
  1. 8
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNode.java

8
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transform/TbDeleteKeysNode.java

@ -51,13 +51,14 @@ import java.util.regex.Pattern;
public class TbDeleteKeysNode implements TbNode {
TbDeleteKeysNodeConfiguration config;
List<Pattern> patternKeys = new ArrayList<>();
List<Pattern> patternKeys;
boolean fromMetadata;
@Override
public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException {
this.config = TbNodeUtils.convert(configuration, TbDeleteKeysNodeConfiguration.class);
this.fromMetadata = config.isFromMetadata();
this.patternKeys = new ArrayList<>();
config.getKeys().forEach(key -> {
this.patternKeys.add(Pattern.compile(key));
});
@ -99,10 +100,7 @@ public class TbDeleteKeysNode implements TbNode {
}
boolean checkKey(String key) {
Optional<Pattern> currentPattern = patternKeys.stream()
.filter(pattern -> pattern.matcher(key).matches())
.findFirst();
return currentPattern.isPresent();
return patternKeys.stream().anyMatch(pattern -> pattern.matcher(key).matches());
}
@Override

Loading…
Cancel
Save