From 8960137e3f169ef9236f32e6af306902a32a7f22 Mon Sep 17 00:00:00 2001 From: Filip Hrisafov Date: Thu, 11 May 2023 16:52:23 +0200 Subject: [PATCH] Remove not needed update methods from VariableService --- .../cmmn/test/async/AsyncCmmnHistoryTest.java | 8 +- .../cmmn/test/runtime/VariablesTest.java | 8 +- ...VariableInstanceValueModifierBpmnTest.java | 110 +++++++++++++++++- .../test/api/variables/VariablesTest.java | 17 ++- .../history/async/AsyncHistoryTest.java | 8 +- .../variable/service/VariableService.java | 10 -- .../service/impl/VariableServiceImpl.java | 5 - .../entity/VariableInstanceEntityManager.java | 12 -- .../VariableInstanceEntityManagerImpl.java | 13 --- 9 files changed, 144 insertions(+), 47 deletions(-) diff --git a/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/async/AsyncCmmnHistoryTest.java b/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/async/AsyncCmmnHistoryTest.java index ec1c1a05610..c7ac0230333 100644 --- a/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/async/AsyncCmmnHistoryTest.java +++ b/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/async/AsyncCmmnHistoryTest.java @@ -67,6 +67,7 @@ import org.flowable.task.api.history.HistoricTaskLogEntryBuilder; import org.flowable.task.api.history.HistoricTaskLogEntryType; import org.flowable.variable.api.history.HistoricVariableInstance; +import org.flowable.variable.service.VariableServiceConfiguration; import org.flowable.variable.service.impl.persistence.entity.VariableInstanceEntity; import org.junit.Assert; import org.junit.Test; @@ -1579,7 +1580,12 @@ public void testVariableChanges() { VariableInstanceEntity variableInstanceEntity = variablesInstances.get(0); variableInstanceEntity.setMetaInfo("test meta info"); - cmmnEngineConfiguration.getVariableServiceConfiguration().getVariableInstanceEntityManager().updateWithHistoricVariableSync(variableInstanceEntity); + VariableServiceConfiguration variableServiceConfiguration = cmmnEngineConfiguration.getVariableServiceConfiguration(); + variableServiceConfiguration.getVariableInstanceEntityManager().update(variableInstanceEntity); + if (variableServiceConfiguration.getInternalHistoryVariableManager() != null) { + variableServiceConfiguration.getInternalHistoryVariableManager() + .recordVariableUpdate(variableInstanceEntity, commandContext.getClock().getCurrentTime()); + } return null; }); diff --git a/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/runtime/VariablesTest.java b/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/runtime/VariablesTest.java index 9bc9a0183e7..310f5464656 100644 --- a/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/runtime/VariablesTest.java +++ b/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/runtime/VariablesTest.java @@ -50,6 +50,7 @@ import org.flowable.variable.api.persistence.entity.VariableInstance; import org.flowable.variable.api.types.ValueFields; import org.flowable.variable.api.types.VariableType; +import org.flowable.variable.service.VariableServiceConfiguration; import org.flowable.variable.service.impl.persistence.entity.VariableInstanceEntity; import org.junit.Rule; import org.junit.Test; @@ -811,7 +812,12 @@ public void testUpdateMetaInfo() { VariableInstanceEntity variableInstanceEntity = variablesInstances.get(0); variableInstanceEntity.setMetaInfo("test meta info"); - cmmnEngineConfiguration.getVariableServiceConfiguration().getVariableInstanceEntityManager().updateWithHistoricVariableSync(variableInstanceEntity); + VariableServiceConfiguration variableServiceConfiguration = cmmnEngineConfiguration.getVariableServiceConfiguration(); + variableServiceConfiguration.getVariableInstanceEntityManager().update(variableInstanceEntity); + if (variableServiceConfiguration.getInternalHistoryVariableManager() != null) { + variableServiceConfiguration.getInternalHistoryVariableManager() + .recordVariableUpdate(variableInstanceEntity, commandContext.getClock().getCurrentTime()); + } return null; }); diff --git a/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/variables/VariableInstanceValueModifierBpmnTest.java b/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/variables/VariableInstanceValueModifierBpmnTest.java index 575689875d1..aa0fa263052 100644 --- a/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/variables/VariableInstanceValueModifierBpmnTest.java +++ b/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/variables/VariableInstanceValueModifierBpmnTest.java @@ -14,6 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.assertj.core.api.Assertions.entry; import static org.assertj.core.groups.Tuple.tuple; import java.util.HashMap; @@ -24,16 +25,21 @@ import org.apache.commons.lang3.StringUtils; import org.flowable.common.engine.api.FlowableIllegalArgumentException; +import org.flowable.common.engine.impl.history.HistoryLevel; +import org.flowable.engine.history.HistoricProcessInstance; +import org.flowable.engine.impl.test.HistoryTestHelper; import org.flowable.engine.impl.test.PluggableFlowableTestCase; import org.flowable.engine.runtime.ProcessInstance; import org.flowable.engine.test.Deployment; import org.flowable.engine.test.api.event.TestVariableEventListener; import org.flowable.task.api.Task; import org.flowable.variable.api.event.FlowableVariableEvent; +import org.flowable.variable.api.history.HistoricVariableInstance; import org.flowable.variable.api.persistence.entity.VariableInstance; import org.flowable.variable.api.types.ValueFields; import org.flowable.variable.api.types.VariableType; import org.flowable.variable.api.types.VariableTypes; +import org.flowable.variable.service.VariableServiceConfiguration; import org.flowable.variable.service.impl.DefaultVariableInstanceValueModifier; import org.flowable.variable.service.impl.VariableInstanceValueModifier; import org.flowable.variable.service.impl.persistence.entity.VariableInstanceEntity; @@ -153,6 +159,16 @@ boolean isIntegralNumber(Object value) { assertThat(orderIdInstance.getTypeName()).isEqualTo("string"); assertThat(orderIdInstance.getValue()).isEqualTo("ABC"); + if (HistoryTestHelper.isHistoryLevelAtLeast(HistoryLevel.ACTIVITY, processEngineConfiguration)) { + HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery() + .processInstanceId(processInstance.getId()) + .includeProcessVariables() + .singleResult(); + assertThat(historicProcessInstance).isNotNull(); + assertThat(historicProcessInstance.getProcessVariables()) + .contains(entry("orderId", "ABC")); + } + Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult(); // now we change it to be an integral number variables.put("orderId", 1); @@ -168,6 +184,16 @@ boolean isIntegralNumber(Object value) { .extracting(FlowableVariableEvent::getVariableName, FlowableVariableEvent::getVariableValue) .containsExactly(tuple("orderId", "ABC"), tuple("orderId", 1L)); + if (HistoryTestHelper.isHistoryLevelAtLeast(HistoryLevel.ACTIVITY, processEngineConfiguration)) { + HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery() + .processInstanceId(processInstance.getId()) + .includeProcessVariables() + .singleResult(); + assertThat(historicProcessInstance).isNotNull(); + assertThat(historicProcessInstance.getProcessVariables()) + .contains(entry("orderId", 1L)); + } + } @Test @@ -221,6 +247,21 @@ protected void setOrUpdateValue(VariableInstance variableInstance, Object value, assertThat(wrappedIntegerValue.metaInfo).isEqualTo("1001meta"); }); + if (HistoryTestHelper.isHistoryLevelAtLeast(HistoryLevel.ACTIVITY, processEngineConfiguration)) { + HistoricVariableInstance historicVariableInstance = historyService.createHistoricVariableInstanceQuery() + .processInstanceId(processInstance.getId()) + .variableName("wrappedInteger") + .singleResult(); + assertThat(historicVariableInstance).isNotNull(); + assertThat(historicVariableInstance.getValue()) + .isInstanceOfSatisfying(WrappedIntegerValue.class, wrappedIntegerValue -> { + assertThat(wrappedIntegerValue.value).isEqualTo(1001); + assertThat(wrappedIntegerValue.metaInfo).isEqualTo("1001meta"); + }); + assertThat(historicVariableInstance.getVariableTypeName()).isEqualTo("wrappedIntegerType"); + assertThat(historicVariableInstance.getMetaInfo()).isEqualTo("1001meta"); + } + Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult(); variables.put("wrappedInteger", 1002); taskService.complete(task.getId(), variables); @@ -244,6 +285,21 @@ protected void setOrUpdateValue(VariableInstance variableInstance, Object value, tuple("wrappedInteger", "wrappedIntegerType", wrappedInteger.getValue(), "VARIABLE_CREATED"), tuple("simpleInteger", "integer", 1000, "VARIABLE_UPDATED"), // task completion triggers 'update' of this variable tuple("wrappedInteger", "wrappedIntegerType", wrappedIntegerTaskUpdate.getValue(), "VARIABLE_UPDATED")); + + if (HistoryTestHelper.isHistoryLevelAtLeast(HistoryLevel.ACTIVITY, processEngineConfiguration)) { + HistoricVariableInstance historicVariableInstance = historyService.createHistoricVariableInstanceQuery() + .processInstanceId(processInstance.getId()) + .variableName("wrappedInteger") + .singleResult(); + assertThat(historicVariableInstance).isNotNull(); + assertThat(historicVariableInstance.getValue()) + .isInstanceOfSatisfying(WrappedIntegerValue.class, wrappedIntegerValue -> { + assertThat(wrappedIntegerValue.value).isEqualTo(1002); + assertThat(wrappedIntegerValue.metaInfo).isEqualTo("1002meta"); + }); + assertThat(historicVariableInstance.getVariableTypeName()).isEqualTo("wrappedIntegerType"); + assertThat(historicVariableInstance.getMetaInfo()).isEqualTo("1002meta"); + } } finally { // We have to delete here. Otherwise the annotation deployment delete operation will fail, due to the missing custom type deleteDeployments(); @@ -307,6 +363,21 @@ protected void setOrUpdateValue(VariableInstance variableInstance, Object value, assertThat(wrappedIntegerValue.metaInfo).isEqualTo("1001meta"); }); + if (HistoryTestHelper.isHistoryLevelAtLeast(HistoryLevel.ACTIVITY, processEngineConfiguration)) { + HistoricVariableInstance historicVariableInstance = historyService.createHistoricVariableInstanceQuery() + .processInstanceId(processInstance.getId()) + .variableName("wrappedInteger") + .singleResult(); + assertThat(historicVariableInstance).isNotNull(); + assertThat(historicVariableInstance.getValue()) + .isInstanceOfSatisfying(WrappedIntegerValue.class, wrappedIntegerValue -> { + assertThat(wrappedIntegerValue.value).isEqualTo(1001); + assertThat(wrappedIntegerValue.metaInfo).isEqualTo("1001meta"); + }); + assertThat(historicVariableInstance.getVariableTypeName()).isEqualTo("wrappedIntegerType"); + assertThat(historicVariableInstance.getMetaInfo()).isEqualTo("1001meta"); + } + // Change back to simple integer type by setting value to 1000 Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult(); variables.put("wrappedInteger", 1000); @@ -329,6 +400,17 @@ protected void setOrUpdateValue(VariableInstance variableInstance, Object value, tuple("wrappedInteger", "wrappedIntegerType", wrappedInteger.getValue(), "VARIABLE_CREATED"), tuple("wrappedInteger", "integer", 1000, "VARIABLE_UPDATED")); + if (HistoryTestHelper.isHistoryLevelAtLeast(HistoryLevel.ACTIVITY, processEngineConfiguration)) { + HistoricVariableInstance historicVariableInstance = historyService.createHistoricVariableInstanceQuery() + .processInstanceId(processInstance.getId()) + .variableName("wrappedInteger") + .singleResult(); + assertThat(historicVariableInstance).isNotNull(); + assertThat(historicVariableInstance.getValue()).isEqualTo(1000); + assertThat(historicVariableInstance.getVariableTypeName()).isEqualTo(IntegerType.TYPE_NAME); + assertThat(historicVariableInstance.getMetaInfo()).isNull(); + } + } finally { // We have to delete here. Otherwise the annotation deployment delete operation will fail, due to the missing custom type deleteDeployments(); @@ -370,12 +452,10 @@ protected void setOrUpdateValue(VariableInstance variableInstance, Object value, @Test @Deployment(resources = { "org/flowable/engine/test/api/oneTaskProcess.bpmn20.xml" }) public void testTransientVariables() { - List setOrUpdateValueTenantIds = new LinkedList<>(); DefaultVariableInstanceValueModifier enhancer = new DefaultVariableInstanceValueModifier(processEngineConfiguration.getVariableServiceConfiguration()) { @Override protected void setOrUpdateValue(VariableInstance variableInstance, Object value, String tenantId) { - setOrUpdateValueTenantIds.add(tenantId); if (variableInstance.getName().equals("orderId") && ((Long) value) < 0) { throw new FlowableIllegalArgumentException("Invalid type: value should be larger than zero"); } @@ -458,6 +538,25 @@ protected void setOrUpdateValue(VariableInstance variableInstance, Object value, assertThat(intVariableInstance.getMetaInfo()).isNull(); assertThat(preSetValueCalls).containsExactlyInAnyOrder("myValue1", 1); + + if (HistoryTestHelper.isHistoryLevelAtLeast(HistoryLevel.ACTIVITY, processEngineConfiguration)) { + HistoricVariableInstance historicVariableInstance = historyService.createHistoricVariableInstanceQuery() + .processInstanceId(processInstance.getId()) + .variableName("myEnhancedStringVariable") + .singleResult(); + assertThat(historicVariableInstance).isNotNull(); + assertThat(historicVariableInstance.getValue()).isEqualTo("myValue1Enhanced"); + assertThat(historicVariableInstance.getVariableTypeName()).isEqualTo("string"); + assertThat(historicVariableInstance.getMetaInfo()).isEqualTo("{\"byteLength\":\"8\"}"); + + historicVariableInstance = historyService.createHistoricVariableInstanceQuery() + .processInstanceId(processInstance.getId()) + .variableName("myIntVariable") + .singleResult(); + assertThat(historicVariableInstance).isNotNull(); + assertThat(historicVariableInstance.getValue()).isEqualTo(1); + assertThat(historicVariableInstance.getMetaInfo()).isNull(); + } } static class VariableMeta { @@ -530,4 +629,11 @@ public int hashCode() { } } + static class TestValueModifier extends DefaultVariableInstanceValueModifier { + + public TestValueModifier(VariableServiceConfiguration serviceConfiguration) { + super(serviceConfiguration); + } + } + } diff --git a/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/variables/VariablesTest.java b/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/variables/VariablesTest.java index 5c88b9c3ad7..7a2c27988b8 100644 --- a/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/variables/VariablesTest.java +++ b/modules/flowable-engine/src/test/java/org/flowable/engine/test/api/variables/VariablesTest.java @@ -40,6 +40,7 @@ import org.flowable.variable.api.history.HistoricVariableInstance; import org.flowable.variable.api.persistence.entity.VariableInstance; import org.flowable.variable.api.types.ValueFields; +import org.flowable.variable.service.VariableServiceConfiguration; import org.flowable.variable.service.impl.persistence.entity.HistoricVariableInstanceEntity; import org.flowable.variable.service.impl.persistence.entity.VariableInstanceEntity; import org.joda.time.DateTime; @@ -636,7 +637,12 @@ public void testUpdateMetaInfo() { VariableInstanceEntity variableInstanceEntity = variablesInstances.get(0); variableInstanceEntity.setMetaInfo("test meta info"); - processEngineConfiguration.getVariableServiceConfiguration().getVariableInstanceEntityManager().updateWithHistoricVariableSync(variableInstanceEntity); + VariableServiceConfiguration variableServiceConfiguration = processEngineConfiguration.getVariableServiceConfiguration(); + variableServiceConfiguration.getVariableInstanceEntityManager().update(variableInstanceEntity); + if (variableServiceConfiguration.getInternalHistoryVariableManager() != null) { + variableServiceConfiguration.getInternalHistoryVariableManager() + .recordVariableUpdate(variableInstanceEntity, commandContext.getClock().getCurrentTime()); + } return null; }); @@ -671,7 +677,14 @@ public void testCreateAndUpdateWithValue() { .containsExactly(Tuple.tuple("myVariable", "myStringValue", "string")); VariableInstanceEntity variableInstanceEntity = variablesInstances.get(0); - CommandContextUtil.getVariableService(commandContext).updateVariableInstanceWithValue(variableInstanceEntity, 42, "myTenantId"); + VariableServiceConfiguration variableServiceConfiguration = CommandContextUtil.getProcessEngineConfiguration(commandContext) + .getVariableServiceConfiguration(); + variableServiceConfiguration.getVariableInstanceValueModifier().updateVariableValue(variableInstanceEntity, 42, "myTenantId"); + variableServiceConfiguration.getVariableInstanceEntityManager().update(variableInstanceEntity); + if (variableServiceConfiguration.getInternalHistoryVariableManager() != null) { + variableServiceConfiguration.getInternalHistoryVariableManager() + .recordVariableUpdate(variableInstanceEntity, commandContext.getClock().getCurrentTime()); + } return null; }); diff --git a/modules/flowable-engine/src/test/java/org/flowable/standalone/history/async/AsyncHistoryTest.java b/modules/flowable-engine/src/test/java/org/flowable/standalone/history/async/AsyncHistoryTest.java index 88e4a40ae9b..0a6db230661 100644 --- a/modules/flowable-engine/src/test/java/org/flowable/standalone/history/async/AsyncHistoryTest.java +++ b/modules/flowable-engine/src/test/java/org/flowable/standalone/history/async/AsyncHistoryTest.java @@ -56,6 +56,7 @@ import org.flowable.task.api.history.HistoricTaskLogEntry; import org.flowable.task.api.history.HistoricTaskLogEntryBuilder; import org.flowable.task.api.history.HistoricTaskLogEntryType; +import org.flowable.variable.service.VariableServiceConfiguration; import org.flowable.variable.service.impl.persistence.entity.VariableInstanceEntity; import org.junit.Assert; import org.junit.jupiter.api.AfterEach; @@ -1030,7 +1031,12 @@ public void testVariableChanges() { VariableInstanceEntity variableInstanceEntity = variablesInstances.get(0); variableInstanceEntity.setMetaInfo("test meta info"); - processEngineConfiguration.getVariableServiceConfiguration().getVariableInstanceEntityManager().updateWithHistoricVariableSync(variableInstanceEntity); + VariableServiceConfiguration variableServiceConfiguration = processEngineConfiguration.getVariableServiceConfiguration(); + variableServiceConfiguration.getVariableInstanceEntityManager().update(variableInstanceEntity); + if (variableServiceConfiguration.getInternalHistoryVariableManager() != null) { + variableServiceConfiguration.getInternalHistoryVariableManager() + .recordVariableUpdate(variableInstanceEntity, commandContext.getClock().getCurrentTime()); + } return null; }); diff --git a/modules/flowable-variable-service/src/main/java/org/flowable/variable/service/VariableService.java b/modules/flowable-variable-service/src/main/java/org/flowable/variable/service/VariableService.java index bd80f6ec514..4887ab781c2 100644 --- a/modules/flowable-variable-service/src/main/java/org/flowable/variable/service/VariableService.java +++ b/modules/flowable-variable-service/src/main/java/org/flowable/variable/service/VariableService.java @@ -14,7 +14,6 @@ import java.util.List; -import org.flowable.variable.service.impl.VariableInstanceValueModifier; import org.flowable.variable.service.impl.persistence.entity.VariableInstanceEntity; /** @@ -57,15 +56,6 @@ default List findVariableInstanceBySubScopeIdAndScopeTyp */ void insertVariableInstanceWithValue(VariableInstanceEntity variable, Object value, String tenantId); - /** - * Updates variable instance with the new value. Makes sure the {@link VariableInstanceValueModifier} is called. - * - * @param variable variable to update - * @param newValue new value to set - * @param tenantId the tenant id of the variable instance - */ - void updateVariableInstanceWithValue(VariableInstanceEntity variable, Object newValue, String tenantId); - void deleteVariableInstance(VariableInstanceEntity variable); void deleteVariablesByExecutionId(String executionId); diff --git a/modules/flowable-variable-service/src/main/java/org/flowable/variable/service/impl/VariableServiceImpl.java b/modules/flowable-variable-service/src/main/java/org/flowable/variable/service/impl/VariableServiceImpl.java index 56dd9abd76d..f3d050c3c5a 100644 --- a/modules/flowable-variable-service/src/main/java/org/flowable/variable/service/impl/VariableServiceImpl.java +++ b/modules/flowable-variable-service/src/main/java/org/flowable/variable/service/impl/VariableServiceImpl.java @@ -49,11 +49,6 @@ public void insertVariableInstanceWithValue(VariableInstanceEntity variable, Obj getVariableInstanceEntityManager().insertWithValue(variable, value, tenantId); } - @Override - public void updateVariableInstanceWithValue(VariableInstanceEntity variable, Object newValue, String tenantId) { - getVariableInstanceEntityManager().updateWithHistoricVariableSync(tenantId, variable, newValue); - } - @Override public void deleteVariableInstance(VariableInstanceEntity variable) { getVariableInstanceEntityManager().delete(variable); diff --git a/modules/flowable-variable-service/src/main/java/org/flowable/variable/service/impl/persistence/entity/VariableInstanceEntityManager.java b/modules/flowable-variable-service/src/main/java/org/flowable/variable/service/impl/persistence/entity/VariableInstanceEntityManager.java index 5ae099ceb67..6f4f0df925f 100644 --- a/modules/flowable-variable-service/src/main/java/org/flowable/variable/service/impl/persistence/entity/VariableInstanceEntityManager.java +++ b/modules/flowable-variable-service/src/main/java/org/flowable/variable/service/impl/persistence/entity/VariableInstanceEntityManager.java @@ -42,18 +42,6 @@ public interface VariableInstanceEntityManager extends EntityManager findVariableInstancesByQueryCriteria(VariableInstanceQueryImpl variableInstanceQuery); diff --git a/modules/flowable-variable-service/src/main/java/org/flowable/variable/service/impl/persistence/entity/VariableInstanceEntityManagerImpl.java b/modules/flowable-variable-service/src/main/java/org/flowable/variable/service/impl/persistence/entity/VariableInstanceEntityManagerImpl.java index d7f27aaefa4..5a37f979513 100644 --- a/modules/flowable-variable-service/src/main/java/org/flowable/variable/service/impl/persistence/entity/VariableInstanceEntityManagerImpl.java +++ b/modules/flowable-variable-service/src/main/java/org/flowable/variable/service/impl/persistence/entity/VariableInstanceEntityManagerImpl.java @@ -52,19 +52,6 @@ public void insertWithValue(VariableInstanceEntity variable, Object value, Strin insert(variable); } - @Override - public void updateWithHistoricVariableSync(VariableInstanceEntity variableInstanceEntity) { - update(variableInstanceEntity, true); - serviceConfiguration.getInternalHistoryVariableManager().recordVariableUpdate(variableInstanceEntity, serviceConfiguration.getClock().getCurrentTime()); - } - - @Override - public void updateWithHistoricVariableSync(String tenantId, VariableInstanceEntity variableInstanceEntity, Object newValue) { - serviceConfiguration.getVariableInstanceValueModifier().updateVariableValue(variableInstanceEntity, newValue, tenantId); - update(variableInstanceEntity, true); - serviceConfiguration.getInternalHistoryVariableManager().recordVariableUpdate(variableInstanceEntity, serviceConfiguration.getClock().getCurrentTime()); - } - @Override public InternalVariableInstanceQuery createInternalVariableInstanceQuery() { return new InternalVariableInstanceQueryImpl(dataManager);