Refactoring EventSubscriptionEntityManagerImpl: use the getList that goes to...

Refactoring EventSubscriptionEntityManagerImpl: use the getList that goes to the cache instead of use a local list (needed to make entityManager classes engine scoped, instead of command scoped.

modules/activiti-engine/src/main/java/org/activiti/engine/impl/event/CompensationEventHandler.java

@@ -34,10 +34,8 @@ import org.activiti.engine.impl.util.ProcessDefinitionUtil;
  */
 public class CompensationEventHandler implements EventHandler {
 
-  public final static String EVENT_HANDLER_TYPE = "compensate";
-
   public String getEventHandlerType() {
-    return EVENT_HANDLER_TYPE;
+    return CompensateEventSubscriptionEntity.EVENT_TYPE;
   }
 
   public void handleEvent(EventSubscriptionEntity eventSubscription, Object payload, CommandContext commandContext) {

modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/ProcessEventJobHandler.java

@@ -36,7 +36,7 @@ public class ProcessEventJobHandler implements JobHandler {
     EventSubscriptionEntityManager eventSubscriptionEntityManager = commandContext.getEventSubscriptionEntityManager();
     
     // lookup subscription:
-    EventSubscriptionEntity eventSubscriptionEntity = eventSubscriptionEntityManager.findEventSubscriptionbyId(configuration);
+    EventSubscriptionEntity eventSubscriptionEntity = eventSubscriptionEntityManager.getEntity(configuration);
 
     // if event subscription is null, ignore
     if (eventSubscriptionEntity != null) {

modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/CompensateEventSubscriptionEntity.java

@@ -13,7 +13,6 @@
 
 package org.activiti.engine.impl.persistence.entity;
 
-import org.activiti.engine.impl.event.CompensationEventHandler;
 
 /**
  * @author Joram Barrez
@@ -23,8 +22,10 @@ public class CompensateEventSubscriptionEntity extends EventSubscriptionEntity {
 
   private static final long serialVersionUID = 1L;
 
+  public static final String EVENT_TYPE = "compensate";
+  
   public CompensateEventSubscriptionEntity() {
-    eventType = CompensationEventHandler.EVENT_HANDLER_TYPE;
+    eventType = EVENT_TYPE;
   }
 
 }
\ No newline at end of file

modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/EventSubscriptionEntityManager.java

@@ -37,8 +37,6 @@ public interface EventSubscriptionEntityManager extends EntityManager<EventSubsc
   
   
 
-  EventSubscriptionEntity findEventSubscriptionbyId(String id);
-
   List<EventSubscriptionEntity> findEventSubscriptionsByQueryCriteria(EventSubscriptionQueryImpl eventSubscriptionQueryImpl, Page page);
 
   List<MessageEventSubscriptionEntity> findMessageEventSubscriptionsByProcessInstanceAndEventName(String processInstanceId, String eventName);
@@ -57,8 +55,6 @@ public interface EventSubscriptionEntityManager extends EntityManager<EventSubsc
 
   List<EventSubscriptionEntity> findEventSubscriptionsByExecution(String executionId);
 
-  List<EventSubscriptionEntity> findEventSubscriptions(String executionId, String type, String activityId);
-
   List<EventSubscriptionEntity> findEventSubscriptionsByConfiguration(String type, String configuration, String tenantId);
 
   List<EventSubscriptionEntity> findEventSubscriptionsByName(String type, String eventName, String tenantId);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/MessageEventSubscriptionEntity.java

@@ -19,9 +19,11 @@ package org.activiti.engine.impl.persistence.entity;
 public class MessageEventSubscriptionEntity extends EventSubscriptionEntity {
 
   private static final long serialVersionUID = 1L;
+  
+  public static final String EVENT_TYPE = "message";
 
   public MessageEventSubscriptionEntity() {
-    eventType = "message";
+    eventType = EVENT_TYPE;
   }
 
 }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/SignalEventSubscriptionEntity.java

@@ -24,12 +24,14 @@ import org.activiti.bpmn.model.Signal;
 public class SignalEventSubscriptionEntity extends EventSubscriptionEntity {
 
   private static final long serialVersionUID = 1L;
+  
+  public static final String EVENT_TYPE = "signal";
 
   // Using json here, but not worth of adding json dependency lib for this
   private static final String CONFIGURATION_TEMPLATE = "'{'\"scope\":\"{0}\"'}'";
 
   public SignalEventSubscriptionEntity() {
-    eventType = "signal";
+    eventType = EVENT_TYPE;
   }
   
   @Override