backward compatibility

winstonczc · Feb 25, 2019 · c5171f0 · c5171f0
1 parent 902b5c5
commit c5171f0
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/...onents/src/main/java/org/thingsboard/rule/engine/action/TbAbstractRelationActionNode.java b/...onents/src/main/java/org/thingsboard/rule/engine/action/TbAbstractRelationActionNode.java
@@ -131,9 +131,9 @@ protected SearchDirectionIds processSingleSearchDirection(TbMsg msg, EntityConta
 
     protected ListenableFuture<List<EntityRelation>> processListSearchDirection(TbContext ctx, TbMsg msg) {
         if (EntitySearchDirection.FROM.name().equals(this.config.getDirection())) {
-            return ctx.getRelationService().findByToAndTypeAsync(ctx.getTenantId(), msg.getOriginator(), processPattern(msg, this.config.getRelationTypePattern()), RelationTypeGroup.COMMON);
+            return ctx.getRelationService().findByToAndTypeAsync(ctx.getTenantId(), msg.getOriginator(), processPattern(msg, this.config.getRelationType()), RelationTypeGroup.COMMON);
         } else {
-            return ctx.getRelationService().findByFromAndTypeAsync(ctx.getTenantId(), msg.getOriginator(), processPattern(msg, this.config.getRelationTypePattern()), RelationTypeGroup.COMMON);
+            return ctx.getRelationService().findByFromAndTypeAsync(ctx.getTenantId(), msg.getOriginator(), processPattern(msg, this.config.getRelationType()), RelationTypeGroup.COMMON);
         }
     }
 

diff --git a/...in/java/org/thingsboard/rule/engine/action/TbAbstractRelationActionNodeConfiguration.java b/...in/java/org/thingsboard/rule/engine/action/TbAbstractRelationActionNodeConfiguration.java
@@ -21,7 +21,7 @@
 public abstract class TbAbstractRelationActionNodeConfiguration {
 
     private String direction;
-    private String relationTypePattern;
+    private String relationType;
 
     private String entityType;
     private String entityNamePattern;

diff --git a/...ine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateRelationNode.java b/...ine-components/src/main/java/org/thingsboard/rule/engine/action/TbCreateRelationNode.java
@@ -85,7 +85,7 @@ protected ListenableFuture<RelationContainer> doProcessEntityRelationAction(TbCo
     }
 
     private ListenableFuture<Boolean> createIfAbsent(TbContext ctx, TbMsg msg, EntityContainer entityContainer) {
-        relationType = processPattern(msg, config.getRelationTypePattern());
+        relationType = processPattern(msg, config.getRelationType());
         SearchDirectionIds sdId = processSingleSearchDirection(msg, entityContainer);
         ListenableFuture<Boolean> checkRelationFuture = Futures.transformAsync(ctx.getRelationService().checkRelation(ctx.getTenantId(), sdId.getFromId(), sdId.getToId(), relationType, RelationTypeGroup.COMMON), result -> {
             if (!result) {

diff --git a/...s/src/main/java/org/thingsboard/rule/engine/action/TbCreateRelationNodeConfiguration.java b/...s/src/main/java/org/thingsboard/rule/engine/action/TbCreateRelationNodeConfiguration.java
@@ -30,7 +30,7 @@ public class TbCreateRelationNodeConfiguration extends TbAbstractRelationActionN
     public TbCreateRelationNodeConfiguration defaultConfiguration() {
         TbCreateRelationNodeConfiguration configuration = new TbCreateRelationNodeConfiguration();
         configuration.setDirection(EntitySearchDirection.FROM.name());
-        configuration.setRelationTypePattern("Contains");
+        configuration.setRelationType("Contains");
         configuration.setEntityNamePattern("");
         configuration.setEntityCacheExpiration(300);
         configuration.setCreateEntityIfNotExists(false);

diff --git a/...ine-components/src/main/java/org/thingsboard/rule/engine/action/TbDeleteRelationNode.java b/...ine-components/src/main/java/org/thingsboard/rule/engine/action/TbDeleteRelationNode.java
@@ -70,7 +70,7 @@ protected ListenableFuture<RelationContainer> doProcessEntityRelationAction(TbCo
     }
 
     private ListenableFuture<RelationContainer> getRelationContainerListenableFuture(TbContext ctx, TbMsg msg) {
-        relationType = processPattern(msg, config.getRelationTypePattern());
+        relationType = processPattern(msg, config.getRelationType());
         if (config.isDeleteForSingleEntity()) {
             return Futures.transformAsync(getEntity(ctx, msg), entityContainer -> doProcessEntityRelationAction(ctx, msg, entityContainer));
         } else {

diff --git a/...s/src/main/java/org/thingsboard/rule/engine/action/TbDeleteRelationNodeConfiguration.java b/...s/src/main/java/org/thingsboard/rule/engine/action/TbDeleteRelationNodeConfiguration.java
@@ -29,7 +29,7 @@ public TbDeleteRelationNodeConfiguration defaultConfiguration() {
         TbDeleteRelationNodeConfiguration configuration = new TbDeleteRelationNodeConfiguration();
         configuration.setDeleteForSingleEntity(true);
         configuration.setDirection(EntitySearchDirection.FROM.name());
-        configuration.setRelationTypePattern("Contains");
+        configuration.setRelationType("Contains");
         configuration.setEntityNamePattern("");
         configuration.setEntityCacheExpiration(300);
         return configuration;

diff --git a/.../rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js b/.../rule-engine-components/src/main/resources/public/static/rulenode/rulenode-core-config.js