Browse Source

Moved set partion state restore flag to init method in state

pull/14560/head
dshvaika 10 months ago
parent
commit
bacb832760
  1. 6
      application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldProcessingService.java
  2. 1
      application/src/main/java/org/thingsboard/server/service/cf/ctx/state/propagation/PropagationCalculatedFieldState.java

6
application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldProcessingService.java

@ -106,10 +106,8 @@ public class DefaultCalculatedFieldProcessingService extends AbstractCalculatedF
if (ctx.getCfType() != CalculatedFieldType.PROPAGATION) { if (ctx.getCfType() != CalculatedFieldType.PROPAGATION) {
return Optional.empty(); return Optional.empty();
} }
PropagationArgumentEntry argumentEntry = (PropagationArgumentEntry) return Optional.of((PropagationArgumentEntry)
resolveArgumentValue(PROPAGATION_CONFIG_ARGUMENT, fetchPropagationCalculatedFieldArgument(ctx, entityId)); resolveArgumentValue(PROPAGATION_CONFIG_ARGUMENT, fetchPropagationCalculatedFieldArgument(ctx, entityId)));
argumentEntry.setPartitionStateRestore(true);
return Optional.of(argumentEntry);
} }
@Override @Override

1
application/src/main/java/org/thingsboard/server/service/cf/ctx/state/propagation/PropagationCalculatedFieldState.java

@ -69,6 +69,7 @@ public class PropagationCalculatedFieldState extends ScriptCalculatedFieldState
super.init(restored); super.init(restored);
if (restored) { if (restored) {
cfProcessingService.fetchPropagationArgumentFromDb(ctx, entityId).ifPresent(fromDb -> { cfProcessingService.fetchPropagationArgumentFromDb(ctx, entityId).ifPresent(fromDb -> {
fromDb.setPartitionStateRestore(true);
var update = update(Map.of(PROPAGATION_CONFIG_ARGUMENT, fromDb), ctx); var update = update(Map.of(PROPAGATION_CONFIG_ARGUMENT, fromDb), ctx);
if (update.isEmpty()) { if (update.isEmpty()) {
return; return;

Loading…
Cancel
Save