Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move FlowableEngineEvent to public API package and add getExecution m… #522

Merged
merged 1 commit into from Aug 11, 2017
Merged

Move FlowableEngineEvent to public API package and add getExecution m… #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion ...owable-engine/src/main/java/org/flowable/engine/delegate/event/FlowableActivityEvent.java
View file
Open in desktop
Expand Up @@ -13,7 +13,6 @@
package org.flowable.engine.delegate.event;

import org.flowable.engine.common.api.delegate.event.FlowableEvent;
import org.flowable.engine.impl.delegate.event.FlowableEngineEvent;

/**
* An {@link FlowableEvent} related to an activity within an execution.
Expand Down
2 changes: 0 additions & 2 deletions ...wable-engine/src/main/java/org/flowable/engine/delegate/event/FlowableCancelledEvent.java
View file
Open in desktop
Expand Up @@ -12,8 +12,6 @@
*/
package org.flowable.engine.delegate.event;

import org.flowable.engine.impl.delegate.event.FlowableEngineEvent;

/**
* @author martin.grofcik
*/
Expand Down
8 changes: 7 additions & 1 deletion ...l/delegate/event/FlowableEngineEvent.java → ...e/delegate/event/FlowableEngineEvent.java
View file
Open in desktop
Expand Up @@ -10,9 +10,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.flowable.engine.impl.delegate.event;
package org.flowable.engine.delegate.event;

import org.flowable.engine.common.api.delegate.event.FlowableEvent;
import org.flowable.engine.delegate.DelegateExecution;

public interface FlowableEngineEvent extends FlowableEvent {

Expand All @@ -21,6 +22,11 @@ public interface FlowableEngineEvent extends FlowableEvent {
*/
String getExecutionId();

/**
* return the execution this event is associated with. Returns null, if the event was not dispatched from within an active execution.
*/
DelegateExecution getExecution();

/**
* @return the id of the process instance this event is associated with. Returns null, if the event was not dispatched from within an active execution.
*/
Expand Down
1 change: 0 additions & 1 deletion ...gine/src/main/java/org/flowable/engine/delegate/event/FlowableSequenceFlowTakenEvent.java
View file
Open in desktop
Expand Up @@ -13,7 +13,6 @@
package org.flowable.engine.delegate.event;

import org.flowable.engine.common.api.delegate.event.FlowableEvent;
import org.flowable.engine.impl.delegate.event.FlowableEngineEvent;

/**
* An {@link FlowableEvent} that indicates a certain sequence flow has been taken.
Expand Down
2 changes: 1 addition & 1 deletion ...e/src/main/java/org/flowable/engine/delegate/event/impl/BpmnModelEventDispatchAction.java
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@
import org.flowable.engine.common.impl.event.FlowableEventSupport;
import org.flowable.engine.common.impl.interceptor.CommandContext;
import org.flowable.engine.delegate.event.FlowableEngineEventType;
import org.flowable.engine.impl.delegate.event.FlowableEngineEvent;
import org.flowable.engine.delegate.event.FlowableEngineEvent;
import org.flowable.engine.impl.util.CommandContextUtil;
import org.flowable.engine.impl.util.ProcessDefinitionUtil;
import org.flowable.engine.repository.ProcessDefinition;
Expand Down
10 changes: 9 additions & 1 deletion ...wable-engine/src/main/java/org/flowable/engine/delegate/event/impl/FlowableEventImpl.java
View file
Open in desktop
Expand Up @@ -14,14 +14,17 @@

import org.flowable.engine.common.api.FlowableIllegalArgumentException;
import org.flowable.engine.common.api.delegate.event.FlowableEvent;
import org.flowable.engine.delegate.DelegateExecution;
import org.flowable.engine.delegate.event.FlowableEngineEvent;
import org.flowable.engine.delegate.event.FlowableEngineEventType;
import org.flowable.engine.impl.util.CommandContextUtil;

/**
* Base class for all {@link FlowableEvent} implementations.
*
* @author Frederik Heremans
*/
public class FlowableEventImpl implements FlowableEvent {
public class FlowableEventImpl implements FlowableEngineEvent {

protected FlowableEngineEventType type;
protected String executionId;
Expand Down Expand Up @@ -80,6 +83,11 @@ public void setProcessInstanceId(String processInstanceId) {
this.processInstanceId = processInstanceId;
}

@Override
public DelegateExecution getExecution() {
return executionId == null ? null : CommandContextUtil.getExecutionEntityManager().findById(executionId);
}

@Override
public String toString() {
return getClass() + " - " + type;
Expand Down
2 changes: 1 addition & 1 deletion ...engine/src/main/java/org/flowable/engine/impl/bpmn/helper/ErrorThrowingEventListener.java
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@
import org.flowable.engine.common.impl.context.Context;
import org.flowable.engine.common.impl.interceptor.CommandContext;
import org.flowable.engine.compatibility.Flowable5CompatibilityHandler;
import org.flowable.engine.impl.delegate.event.FlowableEngineEvent;
import org.flowable.engine.delegate.event.FlowableEngineEvent;
import org.flowable.engine.impl.persistence.entity.ExecutionEntity;
import org.flowable.engine.impl.util.CommandContextUtil;
import org.flowable.engine.impl.util.Flowable5Util;
Expand Down
2 changes: 1 addition & 1 deletion ...gine/src/main/java/org/flowable/engine/impl/bpmn/helper/MessageThrowingEventListener.java
View file
Open in desktop
Expand Up @@ -17,7 +17,7 @@
import org.flowable.engine.common.api.FlowableIllegalArgumentException;
import org.flowable.engine.common.api.delegate.event.FlowableEvent;
import org.flowable.engine.common.api.delegate.event.FlowableEventListener;
import org.flowable.engine.impl.delegate.event.FlowableEngineEvent;
import org.flowable.engine.delegate.event.FlowableEngineEvent;
import org.flowable.engine.impl.persistence.entity.EventSubscriptionEntity;
import org.flowable.engine.impl.persistence.entity.EventSubscriptionEntityManager;
import org.flowable.engine.impl.persistence.entity.MessageEventSubscriptionEntity;
Expand Down
2 changes: 1 addition & 1 deletion ...ngine/src/main/java/org/flowable/engine/impl/bpmn/helper/SignalThrowingEventListener.java
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@
import org.flowable.engine.common.api.delegate.event.FlowableEventListener;
import org.flowable.engine.common.impl.context.Context;
import org.flowable.engine.common.impl.interceptor.CommandContext;
import org.flowable.engine.impl.delegate.event.FlowableEngineEvent;
import org.flowable.engine.delegate.event.FlowableEngineEvent;
import org.flowable.engine.impl.persistence.entity.EventSubscriptionEntityManager;
import org.flowable.engine.impl.persistence.entity.SignalEventSubscriptionEntity;
import org.flowable.engine.impl.util.CommandContextUtil;
Expand Down
1 change: 1 addition & 0 deletions ...gine/src/main/java/org/flowable/engine/impl/delegate/event/FlowableEngineEntityEvent.java
View file
Open in desktop
Expand Up @@ -13,6 +13,7 @@
package org.flowable.engine.impl.delegate.event;

import org.flowable.engine.common.api.delegate.event.FlowableEntityEvent;
import org.flowable.engine.delegate.event.FlowableEngineEvent;

public interface FlowableEngineEntityEvent extends FlowableEntityEvent, FlowableEngineEvent {

Expand Down
2 changes: 1 addition & 1 deletion modules/flowable-engine/src/test/java/org/flowable/engine/test/api/event/JobEventsTest.java
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@
import org.flowable.engine.common.runtime.Clock;
import org.flowable.engine.delegate.event.FlowableActivityEvent;
import org.flowable.engine.delegate.event.FlowableEngineEventType;
import org.flowable.engine.impl.delegate.event.FlowableEngineEvent;
import org.flowable.engine.delegate.event.FlowableEngineEvent;
import org.flowable.engine.impl.test.PluggableFlowableTestCase;
import org.flowable.engine.runtime.Job;
import org.flowable.engine.runtime.ProcessInstance;
Expand Down