Commit 20df02ed08fcbeead1065fe4e3835e4d8e58e3ac
1 parent
76a81573
Move common rule engine utils to API module.
Showing
33 changed files
with
43 additions
and
50 deletions
| ... | ... | @@ -24,7 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired; |
| 24 | 24 | import org.springframework.context.annotation.Lazy; |
| 25 | 25 | import org.springframework.stereotype.Service; |
| 26 | 26 | import org.springframework.util.StringUtils; |
| 27 | -import org.thingsboard.rule.engine.DonAsynchron; | |
| 27 | +import org.thingsboard.rule.engine.api.util.DonAsynchron; | |
| 28 | 28 | import org.thingsboard.server.common.data.DataConstants; |
| 29 | 29 | import org.thingsboard.server.common.data.EntityType; |
| 30 | 30 | import org.thingsboard.server.common.data.id.DeviceId; | ... | ... |
rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/util/DonAsynchron.java
renamed from
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/DonAsynchron.java
| ... | ... | @@ -13,7 +13,7 @@ |
| 13 | 13 | * See the License for the specific language governing permissions and |
| 14 | 14 | * limitations under the License. |
| 15 | 15 | */ |
| 16 | -package org.thingsboard.rule.engine; | |
| 16 | +package org.thingsboard.rule.engine.api.util; | |
| 17 | 17 | |
| 18 | 18 | import com.google.common.util.concurrent.FutureCallback; |
| 19 | 19 | import com.google.common.util.concurrent.Futures; | ... | ... |
rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/util/TbNodeUtils.java
renamed from
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/TbNodeUtils.java
| ... | ... | @@ -13,7 +13,7 @@ |
| 13 | 13 | * See the License for the specific language governing permissions and |
| 14 | 14 | * limitations under the License. |
| 15 | 15 | */ |
| 16 | -package org.thingsboard.rule.engine; | |
| 16 | +package org.thingsboard.rule.engine.api.util; | |
| 17 | 17 | |
| 18 | 18 | import com.fasterxml.jackson.core.JsonProcessingException; |
| 19 | 19 | import com.fasterxml.jackson.databind.ObjectMapper; | ... | ... |
| ... | ... | @@ -24,7 +24,7 @@ import org.thingsboard.server.common.data.alarm.Alarm; |
| 24 | 24 | import org.thingsboard.server.common.msg.TbMsg; |
| 25 | 25 | import org.thingsboard.server.common.msg.TbMsgMetaData; |
| 26 | 26 | |
| 27 | -import static org.thingsboard.rule.engine.DonAsynchron.withCallback; | |
| 27 | +import static org.thingsboard.rule.engine.api.util.DonAsynchron.withCallback; | |
| 28 | 28 | |
| 29 | 29 | @Slf4j |
| 30 | 30 | public abstract class TbAbstractAlarmNode<C extends TbAbstractAlarmNodeConfiguration> implements TbNode { | ... | ... |
| ... | ... | @@ -16,11 +16,10 @@ |
| 16 | 16 | package org.thingsboard.rule.engine.action; |
| 17 | 17 | |
| 18 | 18 | import com.fasterxml.jackson.databind.JsonNode; |
| 19 | -import com.google.common.util.concurrent.AsyncFunction; | |
| 20 | 19 | import com.google.common.util.concurrent.Futures; |
| 21 | 20 | import com.google.common.util.concurrent.ListenableFuture; |
| 22 | 21 | import lombok.extern.slf4j.Slf4j; |
| 23 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 22 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 24 | 23 | import org.thingsboard.rule.engine.api.RuleNode; |
| 25 | 24 | import org.thingsboard.rule.engine.api.TbContext; |
| 26 | 25 | import org.thingsboard.rule.engine.api.TbNodeConfiguration; | ... | ... |
| ... | ... | @@ -17,11 +17,10 @@ package org.thingsboard.rule.engine.action; |
| 17 | 17 | |
| 18 | 18 | import com.fasterxml.jackson.databind.JsonNode; |
| 19 | 19 | import com.google.common.base.Function; |
| 20 | -import com.google.common.util.concurrent.AsyncFunction; | |
| 21 | 20 | import com.google.common.util.concurrent.Futures; |
| 22 | 21 | import com.google.common.util.concurrent.ListenableFuture; |
| 23 | 22 | import lombok.extern.slf4j.Slf4j; |
| 24 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 23 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 25 | 24 | import org.thingsboard.rule.engine.api.RuleNode; |
| 26 | 25 | import org.thingsboard.rule.engine.api.TbContext; |
| 27 | 26 | import org.thingsboard.rule.engine.api.TbNodeConfiguration; | ... | ... |
| ... | ... | @@ -16,12 +16,12 @@ |
| 16 | 16 | package org.thingsboard.rule.engine.action; |
| 17 | 17 | |
| 18 | 18 | import lombok.extern.slf4j.Slf4j; |
| 19 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 19 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 20 | 20 | import org.thingsboard.rule.engine.api.*; |
| 21 | 21 | import org.thingsboard.server.common.data.plugin.ComponentType; |
| 22 | 22 | import org.thingsboard.server.common.msg.TbMsg; |
| 23 | 23 | |
| 24 | -import static org.thingsboard.rule.engine.DonAsynchron.withCallback; | |
| 24 | +import static org.thingsboard.rule.engine.api.util.DonAsynchron.withCallback; | |
| 25 | 25 | import static org.thingsboard.rule.engine.api.TbRelationTypes.SUCCESS; |
| 26 | 26 | |
| 27 | 27 | @Slf4j | ... | ... |
| ... | ... | @@ -18,15 +18,13 @@ package org.thingsboard.rule.engine.aws.sns; |
| 18 | 18 | import com.amazonaws.auth.AWSCredentials; |
| 19 | 19 | import com.amazonaws.auth.AWSStaticCredentialsProvider; |
| 20 | 20 | import com.amazonaws.auth.BasicAWSCredentials; |
| 21 | -import com.amazonaws.regions.Region; | |
| 22 | -import com.amazonaws.regions.Regions; | |
| 23 | 21 | import com.amazonaws.services.sns.AmazonSNS; |
| 24 | 22 | import com.amazonaws.services.sns.AmazonSNSClient; |
| 25 | 23 | import com.amazonaws.services.sns.model.PublishRequest; |
| 26 | 24 | import com.amazonaws.services.sns.model.PublishResult; |
| 27 | 25 | import com.google.common.util.concurrent.ListenableFuture; |
| 28 | 26 | import lombok.extern.slf4j.Slf4j; |
| 29 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 27 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 30 | 28 | import org.thingsboard.rule.engine.api.*; |
| 31 | 29 | import org.thingsboard.server.common.data.plugin.ComponentType; |
| 32 | 30 | import org.thingsboard.server.common.msg.TbMsg; |
| ... | ... | @@ -34,7 +32,7 @@ import org.thingsboard.server.common.msg.TbMsgMetaData; |
| 34 | 32 | |
| 35 | 33 | import java.util.concurrent.ExecutionException; |
| 36 | 34 | |
| 37 | -import static org.thingsboard.rule.engine.DonAsynchron.withCallback; | |
| 35 | +import static org.thingsboard.rule.engine.api.util.DonAsynchron.withCallback; | |
| 38 | 36 | |
| 39 | 37 | @Slf4j |
| 40 | 38 | @RuleNode( | ... | ... |
| ... | ... | @@ -27,7 +27,7 @@ import com.amazonaws.services.sqs.model.SendMessageResult; |
| 27 | 27 | import com.google.common.util.concurrent.ListenableFuture; |
| 28 | 28 | import lombok.extern.slf4j.Slf4j; |
| 29 | 29 | import org.apache.commons.lang3.StringUtils; |
| 30 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 30 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 31 | 31 | import org.thingsboard.rule.engine.api.*; |
| 32 | 32 | import org.thingsboard.server.common.data.plugin.ComponentType; |
| 33 | 33 | import org.thingsboard.server.common.msg.TbMsg; |
| ... | ... | @@ -37,7 +37,7 @@ import java.util.HashMap; |
| 37 | 37 | import java.util.Map; |
| 38 | 38 | import java.util.concurrent.ExecutionException; |
| 39 | 39 | |
| 40 | -import static org.thingsboard.rule.engine.DonAsynchron.withCallback; | |
| 40 | +import static org.thingsboard.rule.engine.api.util.DonAsynchron.withCallback; | |
| 41 | 41 | |
| 42 | 42 | @Slf4j |
| 43 | 43 | @RuleNode( | ... | ... |
| ... | ... | @@ -18,7 +18,7 @@ package org.thingsboard.rule.engine.debug; |
| 18 | 18 | import com.google.common.util.concurrent.ListenableFuture; |
| 19 | 19 | import lombok.extern.slf4j.Slf4j; |
| 20 | 20 | import org.springframework.util.StringUtils; |
| 21 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 21 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 22 | 22 | import org.thingsboard.rule.engine.api.*; |
| 23 | 23 | import org.thingsboard.server.common.data.id.EntityId; |
| 24 | 24 | import org.thingsboard.server.common.data.id.EntityIdFactory; |
| ... | ... | @@ -29,7 +29,7 @@ import org.thingsboard.server.common.msg.TbMsgMetaData; |
| 29 | 29 | import java.util.UUID; |
| 30 | 30 | import java.util.concurrent.TimeUnit; |
| 31 | 31 | |
| 32 | -import static org.thingsboard.rule.engine.DonAsynchron.withCallback; | |
| 32 | +import static org.thingsboard.rule.engine.api.util.DonAsynchron.withCallback; | |
| 33 | 33 | import static org.thingsboard.rule.engine.api.TbRelationTypes.SUCCESS; |
| 34 | 34 | |
| 35 | 35 | @Slf4j | ... | ... |
| ... | ... | @@ -16,12 +16,12 @@ |
| 16 | 16 | package org.thingsboard.rule.engine.filter; |
| 17 | 17 | |
| 18 | 18 | import lombok.extern.slf4j.Slf4j; |
| 19 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 19 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 20 | 20 | import org.thingsboard.rule.engine.api.*; |
| 21 | 21 | import org.thingsboard.server.common.data.plugin.ComponentType; |
| 22 | 22 | import org.thingsboard.server.common.msg.TbMsg; |
| 23 | 23 | |
| 24 | -import static org.thingsboard.rule.engine.DonAsynchron.withCallback; | |
| 24 | +import static org.thingsboard.rule.engine.api.util.DonAsynchron.withCallback; | |
| 25 | 25 | |
| 26 | 26 | @Slf4j |
| 27 | 27 | @RuleNode( | ... | ... |
| ... | ... | @@ -16,14 +16,14 @@ |
| 16 | 16 | package org.thingsboard.rule.engine.filter; |
| 17 | 17 | |
| 18 | 18 | import lombok.extern.slf4j.Slf4j; |
| 19 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 19 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 20 | 20 | import org.thingsboard.rule.engine.api.*; |
| 21 | 21 | import org.thingsboard.server.common.data.plugin.ComponentType; |
| 22 | 22 | import org.thingsboard.server.common.msg.TbMsg; |
| 23 | 23 | |
| 24 | 24 | import java.util.Set; |
| 25 | 25 | |
| 26 | -import static org.thingsboard.rule.engine.DonAsynchron.withCallback; | |
| 26 | +import static org.thingsboard.rule.engine.api.util.DonAsynchron.withCallback; | |
| 27 | 27 | |
| 28 | 28 | @Slf4j |
| 29 | 29 | @RuleNode( | ... | ... |
| ... | ... | @@ -16,7 +16,7 @@ |
| 16 | 16 | package org.thingsboard.rule.engine.filter; |
| 17 | 17 | |
| 18 | 18 | import lombok.extern.slf4j.Slf4j; |
| 19 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 19 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 20 | 20 | import org.thingsboard.rule.engine.api.*; |
| 21 | 21 | import org.thingsboard.server.common.data.plugin.ComponentType; |
| 22 | 22 | import org.thingsboard.server.common.msg.TbMsg; | ... | ... |
| ... | ... | @@ -16,7 +16,7 @@ |
| 16 | 16 | package org.thingsboard.rule.engine.filter; |
| 17 | 17 | |
| 18 | 18 | import lombok.extern.slf4j.Slf4j; |
| 19 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 19 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 20 | 20 | import org.thingsboard.rule.engine.api.*; |
| 21 | 21 | import org.thingsboard.server.common.data.DataConstants; |
| 22 | 22 | import org.thingsboard.server.common.data.plugin.ComponentType; | ... | ... |
| ... | ... | @@ -16,13 +16,11 @@ |
| 16 | 16 | package org.thingsboard.rule.engine.filter; |
| 17 | 17 | |
| 18 | 18 | import lombok.extern.slf4j.Slf4j; |
| 19 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 19 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 20 | 20 | import org.thingsboard.rule.engine.api.*; |
| 21 | -import org.thingsboard.server.common.data.DataConstants; | |
| 22 | 21 | import org.thingsboard.server.common.data.EntityType; |
| 23 | 22 | import org.thingsboard.server.common.data.plugin.ComponentType; |
| 24 | 23 | import org.thingsboard.server.common.msg.TbMsg; |
| 25 | -import org.thingsboard.server.common.msg.session.SessionMsgType; | |
| 26 | 24 | |
| 27 | 25 | @Slf4j |
| 28 | 26 | @RuleNode( | ... | ... |
| ... | ... | @@ -17,7 +17,7 @@ package org.thingsboard.rule.engine.kafka; |
| 17 | 17 | |
| 18 | 18 | import lombok.extern.slf4j.Slf4j; |
| 19 | 19 | import org.apache.kafka.clients.producer.*; |
| 20 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 20 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 21 | 21 | import org.thingsboard.rule.engine.api.*; |
| 22 | 22 | import org.thingsboard.server.common.data.plugin.ComponentType; |
| 23 | 23 | import org.thingsboard.server.common.msg.TbMsg; | ... | ... |
| ... | ... | @@ -19,7 +19,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; |
| 19 | 19 | import com.fasterxml.jackson.databind.ObjectMapper; |
| 20 | 20 | import lombok.extern.slf4j.Slf4j; |
| 21 | 21 | import org.springframework.util.StringUtils; |
| 22 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 22 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 23 | 23 | import org.thingsboard.rule.engine.api.*; |
| 24 | 24 | import org.thingsboard.server.common.data.plugin.ComponentType; |
| 25 | 25 | import org.thingsboard.server.common.msg.TbMsg; | ... | ... |
| ... | ... | @@ -20,7 +20,7 @@ import lombok.extern.slf4j.Slf4j; |
| 20 | 20 | import org.apache.commons.lang3.StringUtils; |
| 21 | 21 | import org.springframework.mail.javamail.JavaMailSenderImpl; |
| 22 | 22 | import org.springframework.mail.javamail.MimeMessageHelper; |
| 23 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 23 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 24 | 24 | import org.thingsboard.rule.engine.api.*; |
| 25 | 25 | import org.thingsboard.server.common.data.plugin.ComponentType; |
| 26 | 26 | import org.thingsboard.server.common.msg.TbMsg; |
| ... | ... | @@ -29,7 +29,7 @@ import javax.mail.internet.MimeMessage; |
| 29 | 29 | import java.io.IOException; |
| 30 | 30 | import java.util.Properties; |
| 31 | 31 | |
| 32 | -import static org.thingsboard.rule.engine.DonAsynchron.withCallback; | |
| 32 | +import static org.thingsboard.rule.engine.api.util.DonAsynchron.withCallback; | |
| 33 | 33 | import static org.thingsboard.rule.engine.api.TbRelationTypes.SUCCESS; |
| 34 | 34 | |
| 35 | 35 | @Slf4j | ... | ... |
| ... | ... | @@ -29,7 +29,7 @@ import org.thingsboard.server.common.msg.TbMsg; |
| 29 | 29 | |
| 30 | 30 | import java.util.List; |
| 31 | 31 | |
| 32 | -import static org.thingsboard.rule.engine.DonAsynchron.withCallback; | |
| 32 | +import static org.thingsboard.rule.engine.api.util.DonAsynchron.withCallback; | |
| 33 | 33 | import static org.thingsboard.rule.engine.api.TbRelationTypes.FAILURE; |
| 34 | 34 | import static org.thingsboard.rule.engine.api.TbRelationTypes.SUCCESS; |
| 35 | 35 | import static org.thingsboard.server.common.data.DataConstants.CLIENT_SCOPE; | ... | ... |
| ... | ... | @@ -15,11 +15,10 @@ |
| 15 | 15 | */ |
| 16 | 16 | package org.thingsboard.rule.engine.metadata; |
| 17 | 17 | |
| 18 | -import com.google.common.base.Function; | |
| 19 | 18 | import com.google.common.util.concurrent.Futures; |
| 20 | 19 | import com.google.common.util.concurrent.ListenableFuture; |
| 21 | 20 | import lombok.extern.slf4j.Slf4j; |
| 22 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 21 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 23 | 22 | import org.thingsboard.rule.engine.api.TbContext; |
| 24 | 23 | import org.thingsboard.rule.engine.api.TbNode; |
| 25 | 24 | import org.thingsboard.rule.engine.api.TbNodeConfiguration; |
| ... | ... | @@ -33,7 +32,7 @@ import org.thingsboard.server.common.msg.TbMsg; |
| 33 | 32 | import java.util.List; |
| 34 | 33 | import java.util.stream.Collectors; |
| 35 | 34 | |
| 36 | -import static org.thingsboard.rule.engine.DonAsynchron.withCallback; | |
| 35 | +import static org.thingsboard.rule.engine.api.util.DonAsynchron.withCallback; | |
| 37 | 36 | import static org.thingsboard.rule.engine.api.TbRelationTypes.FAILURE; |
| 38 | 37 | import static org.thingsboard.rule.engine.api.TbRelationTypes.SUCCESS; |
| 39 | 38 | import static org.thingsboard.server.common.data.DataConstants.SERVER_SCOPE; | ... | ... |
| ... | ... | @@ -18,7 +18,7 @@ package org.thingsboard.rule.engine.metadata; |
| 18 | 18 | import com.google.common.util.concurrent.Futures; |
| 19 | 19 | import com.google.common.util.concurrent.ListenableFuture; |
| 20 | 20 | import lombok.extern.slf4j.Slf4j; |
| 21 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 21 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 22 | 22 | import org.thingsboard.rule.engine.api.RuleNode; |
| 23 | 23 | import org.thingsboard.rule.engine.api.TbContext; |
| 24 | 24 | import org.thingsboard.rule.engine.api.TbNodeConfiguration; | ... | ... |
| ... | ... | @@ -17,7 +17,7 @@ package org.thingsboard.rule.engine.metadata; |
| 17 | 17 | |
| 18 | 18 | import com.google.common.util.concurrent.ListenableFuture; |
| 19 | 19 | import lombok.extern.slf4j.Slf4j; |
| 20 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 20 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 21 | 21 | import org.thingsboard.rule.engine.api.RuleNode; |
| 22 | 22 | import org.thingsboard.rule.engine.api.TbContext; |
| 23 | 23 | import org.thingsboard.rule.engine.api.TbNodeConfiguration; | ... | ... |
| ... | ... | @@ -16,7 +16,7 @@ |
| 16 | 16 | package org.thingsboard.rule.engine.metadata; |
| 17 | 17 | |
| 18 | 18 | import com.google.common.util.concurrent.ListenableFuture; |
| 19 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 19 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 20 | 20 | import org.thingsboard.rule.engine.api.*; |
| 21 | 21 | import org.thingsboard.rule.engine.util.EntitiesRelatedEntityIdAsyncLoader; |
| 22 | 22 | ... | ... |
| ... | ... | @@ -28,7 +28,7 @@ import org.thingsboard.mqtt.MqttClient; |
| 28 | 28 | import org.thingsboard.mqtt.MqttClientConfig; |
| 29 | 29 | import org.thingsboard.mqtt.MqttConnectResult; |
| 30 | 30 | import org.springframework.util.StringUtils; |
| 31 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 31 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 32 | 32 | import org.thingsboard.rule.engine.api.*; |
| 33 | 33 | import org.thingsboard.server.common.data.plugin.ComponentType; |
| 34 | 34 | import org.thingsboard.server.common.msg.TbMsg; | ... | ... |
| ... | ... | @@ -20,7 +20,7 @@ import com.google.common.util.concurrent.ListenableFuture; |
| 20 | 20 | import com.rabbitmq.client.*; |
| 21 | 21 | import lombok.extern.slf4j.Slf4j; |
| 22 | 22 | import org.apache.commons.lang3.StringUtils; |
| 23 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 23 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 24 | 24 | import org.thingsboard.rule.engine.api.*; |
| 25 | 25 | import org.thingsboard.server.common.data.plugin.ComponentType; |
| 26 | 26 | import org.thingsboard.server.common.msg.TbMsg; |
| ... | ... | @@ -29,7 +29,7 @@ import org.thingsboard.server.common.msg.TbMsgMetaData; |
| 29 | 29 | import java.nio.charset.Charset; |
| 30 | 30 | import java.util.concurrent.ExecutionException; |
| 31 | 31 | |
| 32 | -import static org.thingsboard.rule.engine.DonAsynchron.withCallback; | |
| 32 | +import static org.thingsboard.rule.engine.api.util.DonAsynchron.withCallback; | |
| 33 | 33 | |
| 34 | 34 | @Slf4j |
| 35 | 35 | @RuleNode( | ... | ... |
| ... | ... | @@ -28,7 +28,7 @@ import org.springframework.util.concurrent.ListenableFuture; |
| 28 | 28 | import org.springframework.util.concurrent.ListenableFutureCallback; |
| 29 | 29 | import org.springframework.web.client.AsyncRestTemplate; |
| 30 | 30 | import org.springframework.web.client.HttpClientErrorException; |
| 31 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 31 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 32 | 32 | import org.thingsboard.rule.engine.api.*; |
| 33 | 33 | import org.thingsboard.server.common.data.plugin.ComponentType; |
| 34 | 34 | import org.thingsboard.server.common.msg.TbMsg; | ... | ... |
| ... | ... | @@ -17,7 +17,7 @@ package org.thingsboard.rule.engine.rpc; |
| 17 | 17 | |
| 18 | 18 | import lombok.extern.slf4j.Slf4j; |
| 19 | 19 | import org.springframework.util.StringUtils; |
| 20 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 20 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 21 | 21 | import org.thingsboard.rule.engine.api.RuleNode; |
| 22 | 22 | import org.thingsboard.rule.engine.api.TbContext; |
| 23 | 23 | import org.thingsboard.rule.engine.api.TbNode; | ... | ... |
| ... | ... | @@ -19,7 +19,7 @@ import com.google.gson.Gson; |
| 19 | 19 | import com.google.gson.JsonObject; |
| 20 | 20 | import com.google.gson.JsonParser; |
| 21 | 21 | import lombok.extern.slf4j.Slf4j; |
| 22 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 22 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 23 | 23 | import org.thingsboard.rule.engine.api.RuleEngineDeviceRpcRequest; |
| 24 | 24 | import org.thingsboard.rule.engine.api.RuleNode; |
| 25 | 25 | import org.thingsboard.rule.engine.api.TbContext; | ... | ... |
| ... | ... | @@ -17,7 +17,7 @@ package org.thingsboard.rule.engine.telemetry; |
| 17 | 17 | |
| 18 | 18 | import com.google.gson.JsonParser; |
| 19 | 19 | import lombok.extern.slf4j.Slf4j; |
| 20 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 20 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 21 | 21 | import org.thingsboard.rule.engine.api.RuleNode; |
| 22 | 22 | import org.thingsboard.rule.engine.api.TbContext; |
| 23 | 23 | import org.thingsboard.rule.engine.api.TbNode; | ... | ... |
| ... | ... | @@ -18,7 +18,7 @@ package org.thingsboard.rule.engine.telemetry; |
| 18 | 18 | import com.google.gson.JsonParser; |
| 19 | 19 | import lombok.extern.slf4j.Slf4j; |
| 20 | 20 | import org.springframework.util.StringUtils; |
| 21 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 21 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 22 | 22 | import org.thingsboard.rule.engine.api.RuleNode; |
| 23 | 23 | import org.thingsboard.rule.engine.api.TbContext; |
| 24 | 24 | import org.thingsboard.rule.engine.api.TbNode; | ... | ... |
| ... | ... | @@ -17,14 +17,14 @@ package org.thingsboard.rule.engine.transform; |
| 17 | 17 | |
| 18 | 18 | import com.google.common.util.concurrent.ListenableFuture; |
| 19 | 19 | import lombok.extern.slf4j.Slf4j; |
| 20 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 20 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 21 | 21 | import org.thingsboard.rule.engine.api.TbContext; |
| 22 | 22 | import org.thingsboard.rule.engine.api.TbNode; |
| 23 | 23 | import org.thingsboard.rule.engine.api.TbNodeConfiguration; |
| 24 | 24 | import org.thingsboard.rule.engine.api.TbNodeException; |
| 25 | 25 | import org.thingsboard.server.common.msg.TbMsg; |
| 26 | 26 | |
| 27 | -import static org.thingsboard.rule.engine.DonAsynchron.withCallback; | |
| 27 | +import static org.thingsboard.rule.engine.api.util.DonAsynchron.withCallback; | |
| 28 | 28 | import static org.thingsboard.rule.engine.api.TbRelationTypes.FAILURE; |
| 29 | 29 | import static org.thingsboard.rule.engine.api.TbRelationTypes.SUCCESS; |
| 30 | 30 | ... | ... |
| ... | ... | @@ -20,7 +20,7 @@ import com.google.common.collect.Sets; |
| 20 | 20 | import com.google.common.util.concurrent.Futures; |
| 21 | 21 | import com.google.common.util.concurrent.ListenableFuture; |
| 22 | 22 | import lombok.extern.slf4j.Slf4j; |
| 23 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 23 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 24 | 24 | import org.thingsboard.rule.engine.api.RuleNode; |
| 25 | 25 | import org.thingsboard.rule.engine.api.TbContext; |
| 26 | 26 | import org.thingsboard.rule.engine.api.TbNodeConfiguration; | ... | ... |
| ... | ... | @@ -16,7 +16,7 @@ |
| 16 | 16 | package org.thingsboard.rule.engine.transform; |
| 17 | 17 | |
| 18 | 18 | import com.google.common.util.concurrent.ListenableFuture; |
| 19 | -import org.thingsboard.rule.engine.TbNodeUtils; | |
| 19 | +import org.thingsboard.rule.engine.api.util.TbNodeUtils; | |
| 20 | 20 | import org.thingsboard.rule.engine.api.*; |
| 21 | 21 | import org.thingsboard.server.common.data.plugin.ComponentType; |
| 22 | 22 | import org.thingsboard.server.common.msg.TbMsg; | ... | ... |