Skip to content

Commit 4210d2a

Browse files
committed
Remove BPMN FixedValue in favor of the one in the common package
1 parent 4372063 commit 4210d2a

9 files changed

Lines changed: 8 additions & 35 deletions

File tree

modules/flowable-engine/src/main/java/org/flowable/engine/delegate/DelegateHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import org.flowable.common.engine.api.FlowableException;
2929
import org.flowable.common.engine.api.delegate.Expression;
3030
import org.flowable.common.engine.impl.el.ExpressionManager;
31+
import org.flowable.common.engine.impl.el.FixedValue;
3132
import org.flowable.engine.impl.delegate.ActivityBehavior;
32-
import org.flowable.engine.impl.el.FixedValue;
3333
import org.flowable.engine.impl.persistence.entity.ExecutionEntity;
3434
import org.flowable.engine.impl.util.CommandContextUtil;
3535
import org.flowable.engine.impl.util.ProcessDefinitionUtil;

modules/flowable-engine/src/main/java/org/flowable/engine/impl/bpmn/http/DefaultBpmnHttpActivityDelegate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.flowable.common.engine.api.delegate.Expression;
3333
import org.flowable.common.engine.api.variable.VariableContainer;
3434
import org.flowable.common.engine.impl.el.ExpressionManager;
35+
import org.flowable.common.engine.impl.el.FixedValue;
3536
import org.flowable.engine.cfg.HttpClientConfig;
3637
import org.flowable.engine.delegate.BpmnError;
3738
import org.flowable.engine.delegate.DelegateExecution;
@@ -42,7 +43,6 @@
4243
import org.flowable.engine.impl.bpmn.http.handler.ScriptHttpHandler;
4344
import org.flowable.engine.impl.bpmn.parser.FieldDeclaration;
4445
import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl;
45-
import org.flowable.engine.impl.el.FixedValue;
4646
import org.flowable.engine.impl.util.CommandContextUtil;
4747
import org.flowable.http.common.api.HttpResponse;
4848
import org.flowable.http.common.api.client.FlowableHttpClient;

modules/flowable-engine/src/main/java/org/flowable/engine/impl/bpmn/parser/factory/AbstractBehaviorFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import org.flowable.bpmn.model.FieldExtension;
2020
import org.flowable.common.engine.api.delegate.Expression;
2121
import org.flowable.common.engine.impl.el.ExpressionManager;
22+
import org.flowable.common.engine.impl.el.FixedValue;
2223
import org.flowable.engine.impl.bpmn.parser.FieldDeclaration;
23-
import org.flowable.engine.impl.el.FixedValue;
2424

2525
/**
2626
* @author Joram Barrez

modules/flowable-engine/src/main/java/org/flowable/engine/impl/el/FixedValue.java

Lines changed: 0 additions & 27 deletions
This file was deleted.

modules/flowable-engine/src/main/java/org/flowable/engine/test/TestActivityBehaviorFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
import org.flowable.bpmn.model.UserTask;
5858
import org.flowable.bpmn.model.VariableListenerEventDefinition;
5959
import org.flowable.common.engine.api.delegate.Expression;
60+
import org.flowable.common.engine.impl.el.FixedValue;
6061
import org.flowable.engine.impl.bpmn.behavior.AbstractBpmnActivityBehavior;
6162
import org.flowable.engine.impl.bpmn.behavior.AdhocSubProcessActivityBehavior;
6263
import org.flowable.engine.impl.bpmn.behavior.BoundaryCancelEventActivityBehavior;
@@ -122,7 +123,6 @@
122123
import org.flowable.engine.impl.bpmn.parser.factory.AbstractBehaviorFactory;
123124
import org.flowable.engine.impl.bpmn.parser.factory.ActivityBehaviorFactory;
124125
import org.flowable.engine.impl.delegate.ActivityBehavior;
125-
import org.flowable.engine.impl.el.FixedValue;
126126
import org.flowable.engine.impl.test.NoOpServiceTask;
127127

128128
/**

modules/flowable-engine/src/test/java/org/flowable/examples/bpmn/executionlistener/JavaDelegateTestExecutionListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
*/
1313
package org.flowable.examples.bpmn.executionlistener;
1414

15+
import org.flowable.common.engine.impl.el.FixedValue;
1516
import org.flowable.engine.delegate.DelegateExecution;
1617
import org.flowable.engine.delegate.JavaDelegate;
1718
import org.flowable.engine.delegate.TaskListener;
18-
import org.flowable.engine.impl.el.FixedValue;
1919
import org.flowable.task.service.delegate.DelegateTask;
2020
import org.slf4j.Logger;
2121
import org.slf4j.LoggerFactory;

modules/flowable-spring/src/test/java/org/flowable/spring/test/servicetask/DelegateExpressionBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
*/
1313
package org.flowable.spring.test.servicetask;
1414

15+
import org.flowable.common.engine.impl.el.FixedValue;
1516
import org.flowable.engine.delegate.DelegateExecution;
1617
import org.flowable.engine.delegate.JavaDelegate;
17-
import org.flowable.engine.impl.el.FixedValue;
1818
import org.slf4j.Logger;
1919
import org.slf4j.LoggerFactory;
2020

modules/flowable-spring/src/test/java/org/flowable/spring/test/servicetask/MyExecutionListenerBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
*/
1313
package org.flowable.spring.test.servicetask;
1414

15+
import org.flowable.common.engine.impl.el.FixedValue;
1516
import org.flowable.engine.delegate.DelegateExecution;
1617
import org.flowable.engine.delegate.ExecutionListener;
17-
import org.flowable.engine.impl.el.FixedValue;
1818

1919
/**
2020
* @author Joram Barrez

modules/flowable-spring/src/test/java/org/flowable/spring/test/servicetask/MyTaskListenerBean.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
*/
1313
package org.flowable.spring.test.servicetask;
1414

15+
import org.flowable.common.engine.impl.el.FixedValue;
1516
import org.flowable.engine.delegate.TaskListener;
16-
import org.flowable.engine.impl.el.FixedValue;
1717
import org.flowable.engine.impl.persistence.entity.ExecutionEntity;
1818
import org.flowable.engine.impl.util.CommandContextUtil;
1919
import org.flowable.task.service.delegate.DelegateTask;

0 commit comments

Comments
 (0)