diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryCertainTimeRangeNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNode.java
similarity index 92%
rename from rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryCertainTimeRangeNode.java
rename to rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNode.java
index 4ff15c9c83..d26f178f34 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryCertainTimeRangeNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNode.java
@@ -37,8 +37,8 @@ import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import static org.thingsboard.rule.engine.api.TbRelationTypes.SUCCESS;
-import static org.thingsboard.rule.engine.metadata.TbGetTelemetryCertainTimeRangeNodeConfiguration.FETCH_MODE_ALL;
-import static org.thingsboard.rule.engine.metadata.TbGetTelemetryCertainTimeRangeNodeConfiguration.MAX_FETCH_SIZE;
+import static org.thingsboard.rule.engine.metadata.TbGetTelemetryNodeConfiguration.FETCH_MODE_ALL;
+import static org.thingsboard.rule.engine.metadata.TbGetTelemetryNodeConfiguration.MAX_FETCH_SIZE;
import static org.thingsboard.server.common.data.kv.Aggregation.NONE;
/**
@@ -46,17 +46,17 @@ import static org.thingsboard.server.common.data.kv.Aggregation.NONE;
*/
@Slf4j
@RuleNode(type = ComponentType.ENRICHMENT,
- name = "get telemetry from certain time range",
- configClazz = TbGetTelemetryCertainTimeRangeNodeConfiguration.class,
- nodeDescription = "Fetch telemetry of certain time range based on the certain delay in the Message Metadata.\n",
+ name = "originator telemetry",
+ configClazz = TbGetTelemetryNodeConfiguration.class,
+ nodeDescription = "Add Message Originator Telemetry for selected time range into Message Metadata\n",
nodeDetails = "The node allows you to select fetch mode FIRST/LAST/ALL to fetch telemetry of certain time range that are added into Message metadata without any prefix. " +
"If selected fetch mode ALL Telemetry will be added like array into Message Metadata where key is Timestamp and value is value of Telemetry. " +
"If selected fetch mode FIRST or LAST Telemetry will be added like string without Timestamp",
uiResources = {"static/rulenode/rulenode-core-config.js"},
configDirective = "tbEnrichmentNodeGetTelemetryFromDatabase")
-public class TbGetTelemetryCertainTimeRangeNode implements TbNode {
+public class TbGetTelemetryNode implements TbNode {
- private TbGetTelemetryCertainTimeRangeNodeConfiguration config;
+ private TbGetTelemetryNodeConfiguration config;
private List tsKeyNames;
private long startTsOffset;
private long endTsOffset;
@@ -65,7 +65,7 @@ public class TbGetTelemetryCertainTimeRangeNode implements TbNode {
@Override
public void init(TbContext ctx, TbNodeConfiguration configuration) throws TbNodeException {
- this.config = TbNodeUtils.convert(configuration, TbGetTelemetryCertainTimeRangeNodeConfiguration.class);
+ this.config = TbNodeUtils.convert(configuration, TbGetTelemetryNodeConfiguration.class);
tsKeyNames = config.getLatestTsKeyNames();
startTsOffset = TimeUnit.valueOf(config.getStartIntervalTimeUnit()).toMillis(config.getStartInterval());
endTsOffset = TimeUnit.valueOf(config.getEndIntervalTimeUnit()).toMillis(config.getEndInterval());
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryCertainTimeRangeNodeConfiguration.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNodeConfiguration.java
similarity index 83%
rename from rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryCertainTimeRangeNodeConfiguration.java
rename to rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNodeConfiguration.java
index 000bac2242..37ce0af42b 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryCertainTimeRangeNodeConfiguration.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/metadata/TbGetTelemetryNodeConfiguration.java
@@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit;
* Created by mshvayka on 04.09.18.
*/
@Data
-public class TbGetTelemetryCertainTimeRangeNodeConfiguration implements NodeConfiguration {
+public class TbGetTelemetryNodeConfiguration implements NodeConfiguration {
public static final String FETCH_MODE_FIRST = "FIRST";
public static final String FETCH_MODE_LAST = "LAST";
@@ -44,8 +44,8 @@ public class TbGetTelemetryCertainTimeRangeNodeConfiguration implements NodeConf
@Override
- public TbGetTelemetryCertainTimeRangeNodeConfiguration defaultConfiguration() {
- TbGetTelemetryCertainTimeRangeNodeConfiguration configuration = new TbGetTelemetryCertainTimeRangeNodeConfiguration();
+ public TbGetTelemetryNodeConfiguration defaultConfiguration() {
+ TbGetTelemetryNodeConfiguration configuration = new TbGetTelemetryNodeConfiguration();
configuration.setLatestTsKeyNames(Collections.emptyList());
configuration.setFetchMode("FIRST");
configuration.setStartIntervalTimeUnit(TimeUnit.MINUTES.name());