Making entity manager interfaces consistent: removing duplicate methods...

Making entity manager interfaces consistent: removing duplicate methods (findById/getEntity/..) and make sure they pass the entity cache

modules/activiti-engine/src/main/java/org/activiti/engine/impl/ProcessInstanceHistoryLogQueryImpl.java

@@ -77,7 +77,7 @@ public class ProcessInstanceHistoryLogQueryImpl implements ProcessInstanceHistor
   public ProcessInstanceHistoryLog execute(CommandContext commandContext) {
 
     // Fetch historic process instance
-    HistoricProcessInstanceEntity historicProcessInstance = commandContext.getHistoricProcessInstanceEntityManager().findHistoricProcessInstance(processInstanceId);
+    HistoricProcessInstanceEntity historicProcessInstance = commandContext.getHistoricProcessInstanceEntityManager().findById(processInstanceId);
 
     if (historicProcessInstance == null) {
       return null;

modules/activiti-engine/src/main/java/org/activiti/engine/impl/agenda/DestroyScopeOperation.java

@@ -39,12 +39,12 @@ public class DestroyScopeOperation extends AbstractOperation {
     if (execution.isScope()) {
       parentScopeExecution = executionEntity;
     } else {
-      ExecutionEntity currentlyExaminedExecution = executionEntityManager.findExecutionById(execution.getParentId());
+      ExecutionEntity currentlyExaminedExecution = executionEntityManager.findById(execution.getParentId());
       while (currentlyExaminedExecution != null && parentScopeExecution == null) {
         if (currentlyExaminedExecution.isScope()) {
           parentScopeExecution = currentlyExaminedExecution;
         } else {
-          currentlyExaminedExecution = executionEntityManager.findExecutionById(currentlyExaminedExecution.getParentId());
+          currentlyExaminedExecution = executionEntityManager.findById(currentlyExaminedExecution.getParentId());
         }
       }
     }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/agenda/EndExecutionOperation.java

@@ -47,7 +47,7 @@ public class EndExecutionOperation extends AbstractOperation {
     // Find parent execution. If not found, it's the process instance and other logic needs to happen
     ExecutionEntity parentExecution = null;
     if (executionEntity.getParentId() != null) {
-      parentExecution = executionEntityManager.getEntity(executionEntity.getParentId());
+      parentExecution = executionEntityManager.findById(executionEntity.getParentId());
     }
     
     if (parentExecution != null) {

modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/BoundaryEventActivityBehavior.java

@@ -74,15 +74,15 @@ public class BoundaryEventActivityBehavior extends FlowNodeActivityBehavior {
     // Which is what we need.
 
     ExecutionEntityManager executionEntityManager = commandContext.getExecutionEntityManager();
-    ExecutionEntity attachedRefScopeExecution = executionEntityManager.findExecutionById(executionEntity.getParentId());
+    ExecutionEntity attachedRefScopeExecution = executionEntityManager.findById(executionEntity.getParentId());
 
     ExecutionEntity parentScopeExecution = null;
-    ExecutionEntity currentlyExaminedExecution = executionEntityManager.findExecutionById(attachedRefScopeExecution.getParentId());
+    ExecutionEntity currentlyExaminedExecution = executionEntityManager.findById(attachedRefScopeExecution.getParentId());
     while (currentlyExaminedExecution != null && parentScopeExecution == null) {
       if (currentlyExaminedExecution.isScope()) {
         parentScopeExecution = currentlyExaminedExecution;
       } else {
-        currentlyExaminedExecution = executionEntityManager.findExecutionById(currentlyExaminedExecution.getParentId());
+        currentlyExaminedExecution = executionEntityManager.findById(currentlyExaminedExecution.getParentId());
       }
     }
 
@@ -112,15 +112,15 @@ public class BoundaryEventActivityBehavior extends FlowNodeActivityBehavior {
     
     ExecutionEntityManager executionEntityManager = commandContext.getExecutionEntityManager();
 
-    ExecutionEntity parentExecutionEntity = executionEntityManager.findExecutionById(executionEntity.getParentId());
+    ExecutionEntity parentExecutionEntity = executionEntityManager.findById(executionEntity.getParentId());
 
     ExecutionEntity scopeExecution = null;
-    ExecutionEntity currentlyExaminedExecution = executionEntityManager.findExecutionById(parentExecutionEntity.getParentId());
+    ExecutionEntity currentlyExaminedExecution = executionEntityManager.findById(parentExecutionEntity.getParentId());
     while (currentlyExaminedExecution != null && scopeExecution == null) {
       if (currentlyExaminedExecution.isScope()) {
         scopeExecution = currentlyExaminedExecution;
       } else {
-        currentlyExaminedExecution = executionEntityManager.findExecutionById(currentlyExaminedExecution.getParentId());
+        currentlyExaminedExecution = executionEntityManager.findById(currentlyExaminedExecution.getParentId());
       }
     }
 

modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/CancelEndEventActivityBehavior.java

@@ -45,7 +45,7 @@ public class CancelEndEventActivityBehavior extends FlowNodeActivityBehavior {
     
     // find cancel boundary event:
     ExecutionEntity parentScopeExecution = null;
-    ExecutionEntity currentlyExaminedExecution = executionEntityManager.findExecutionById(executionEntity.getParentId());
+    ExecutionEntity currentlyExaminedExecution = executionEntityManager.findById(executionEntity.getParentId());
     while (currentlyExaminedExecution != null && parentScopeExecution == null) {
       if (currentlyExaminedExecution.getCurrentFlowElement() instanceof SubProcess) {
         parentScopeExecution = currentlyExaminedExecution;
@@ -59,7 +59,7 @@ public class CancelEndEventActivityBehavior extends FlowNodeActivityBehavior {
         }
         
       } else {
-        currentlyExaminedExecution = executionEntityManager.findExecutionById(currentlyExaminedExecution.getParentId());
+        currentlyExaminedExecution = executionEntityManager.findById(currentlyExaminedExecution.getParentId());
       }
     }
     
@@ -85,12 +85,12 @@ public class CancelEndEventActivityBehavior extends FlowNodeActivityBehavior {
     }
 
     ExecutionEntity newParentScopeExecution = null;
-    currentlyExaminedExecution = executionEntityManager.findExecutionById(parentScopeExecution.getParentId());
+    currentlyExaminedExecution = executionEntityManager.findById(parentScopeExecution.getParentId());
     while (currentlyExaminedExecution != null && newParentScopeExecution == null) {
       if (currentlyExaminedExecution.isScope()) {
         newParentScopeExecution = currentlyExaminedExecution;
       } else {
-        currentlyExaminedExecution = executionEntityManager.findExecutionById(currentlyExaminedExecution.getParentId());
+        currentlyExaminedExecution = executionEntityManager.findById(currentlyExaminedExecution.getParentId());
       }
     }
 

modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/GatewayActivityBehavior.java

@@ -34,7 +34,7 @@ public abstract class GatewayActivityBehavior extends FlowNodeActivityBehavior {
     ExecutionEntity parentScopeExecution = null;
     ExecutionEntity currentExecution = (ExecutionEntity) execution;
     while (!found && currentExecution != null && currentExecution.getParentId() != null) {
-      parentScopeExecution = executionEntityManager.findExecutionById(currentExecution.getParentId());
+      parentScopeExecution = executionEntityManager.findById(currentExecution.getParentId());
       if (parentScopeExecution != null && parentScopeExecution.isScope()) {
         found = true;
       }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/ParallelMultiInstanceBehavior.java

@@ -216,7 +216,7 @@ public class ParallelMultiInstanceBehavior extends MultiInstanceActivityBehavior
     ExecutionEntity parentScopeExecution = null;
     ExecutionEntity currentExecution = (ExecutionEntity) execution;
     while (!found && currentExecution != null && currentExecution.getParentId() != null) {
-      parentScopeExecution = executionEntityManager.findExecutionById(currentExecution.getParentId());
+      parentScopeExecution = executionEntityManager.findById(currentExecution.getParentId());
       if (parentScopeExecution != null && parentScopeExecution.isScope()) {
         found = true;
       }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/TerminateEndEventActivityBehavior.java

@@ -71,7 +71,7 @@ public class TerminateEndEventActivityBehavior extends FlowNodeActivityBehavior
 				  executionEntityManager.deleteProcessInstanceExecutionEntity(scopeExecutionEntity.getId(), 
 				      execution.getCurrentFlowElement().getId(), "terminate end event", 
 				      false, false, true);
-					ExecutionEntity superExecutionEntity = executionEntityManager.findExecutionById(scopeExecutionEntity.getSuperExecutionId());
+					ExecutionEntity superExecutionEntity = executionEntityManager.findById(scopeExecutionEntity.getSuperExecutionId());
 					commandContext.getAgenda().planTakeOutgoingSequenceFlowsOperation(superExecutionEntity);
 					
 				} else {

modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/helper/ErrorPropagation.java

@@ -86,7 +86,7 @@ public class ErrorPropagation {
               
               for (String processInstanceId : toDeleteProcessInstanceIds) {
                 
-                ExecutionEntity processInstanceEntity = executionEntityManager.findExecutionById(processInstanceId);
+                ExecutionEntity processInstanceEntity = executionEntityManager.findById(processInstanceId);
                 
                 // Delete
                 executionEntityManager.deleteProcessInstanceExecutionEntity(processInstanceEntity.getId(), 

modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/helper/ErrorThrowingEventListener.java

@@ -35,7 +35,7 @@ public class ErrorThrowingEventListener extends BaseDelegateEventListener {
 
       if (event.getExecutionId() != null) {
         // Get the execution based on the event's execution ID instead
-        execution = Context.getCommandContext().getExecutionEntityManager().findExecutionById(event.getExecutionId());
+        execution = Context.getCommandContext().getExecutionEntityManager().findById(event.getExecutionId());
       }
 
       if (execution == null) {

modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/helper/ScopeUtil.java

@@ -47,7 +47,7 @@ public class ScopeUtil {
       // check whether compensating execution is already created (which is the case when compensating an embedded subprocess,
       // where the compensating execution is created when leaving the subprocess and holds snapshot data).
       if (eventSubscription.getConfiguration() != null) {
-        compensatingExecution = executionEntityManager.findExecutionById(eventSubscription.getConfiguration());
+        compensatingExecution = executionEntityManager.findById(eventSubscription.getConfiguration());
         // move the compensating execution under this execution:
         compensatingExecution.setParent((ExecutionEntity) execution);
         compensatingExecution.setEventScope(false);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AbstractCompleteTaskCmd.java

@@ -53,7 +53,7 @@ public abstract class AbstractCompleteTaskCmd extends NeedsActiveTaskCmd<Void> {
 
     fireEvent(commandContext, taskEntity, TaskListener.EVENTNAME_COMPLETE);
     if (Authentication.getAuthenticatedUserId() != null && taskEntity.getProcessInstanceId() != null) {
-      ExecutionEntity processInstanceEntity = commandContext.getExecutionEntityManager().findExecutionById(taskEntity.getProcessInstanceId());
+      ExecutionEntity processInstanceEntity = commandContext.getExecutionEntityManager().findById(taskEntity.getProcessInstanceId());
       commandContext.getIdentityLinkEntityManager().involveUser(processInstanceEntity, Authentication.getAuthenticatedUserId(),IdentityLinkType.PARTICIPANT);
     }
 
@@ -70,7 +70,7 @@ public abstract class AbstractCompleteTaskCmd extends NeedsActiveTaskCmd<Void> {
 
     // Continue process (if not a standalone task)
     if (taskEntity.getExecutionId() != null) {
-      ExecutionEntity executionEntity = commandContext.getExecutionEntityManager().findExecutionById(taskEntity.getExecutionId());
+      ExecutionEntity executionEntity = commandContext.getExecutionEntityManager().findById(taskEntity.getExecutionId());
       commandContext.getAgenda().planTriggerExecutionOperation(executionEntity);
     }
   }
@@ -82,7 +82,7 @@ public abstract class AbstractCompleteTaskCmd extends NeedsActiveTaskCmd<Void> {
       List<TaskListener> taskEventListeners = taskDefinition.getTaskListener(taskEventName);
       if (taskEventListeners != null) {
         for (TaskListener taskListener : taskEventListeners) {
-          ExecutionEntity execution = commandContext.getExecutionEntityManager().findExecutionById(taskEntity.getExecutionId());
+          ExecutionEntity execution = commandContext.getExecutionEntityManager().findById(taskEntity.getExecutionId());
           if (execution != null) {
             taskEntity.setEventName(taskEventName);
           }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AbstractSetProcessDefinitionStateCmd.java

@@ -113,7 +113,7 @@ public abstract class AbstractSetProcessDefinitionStateCmd implements Command<Vo
 
     if (processDefinitionId != null) {
 
-      ProcessDefinitionEntity processDefinitionEntity = processDefinitionManager.findProcessDefinitionById(processDefinitionId);
+      ProcessDefinitionEntity processDefinitionEntity = processDefinitionManager.findById(processDefinitionId);
       if (processDefinitionEntity == null) {
         throw new ActivitiObjectNotFoundException("Cannot find process definition for id '" + processDefinitionId + "'", ProcessDefinition.class);
       }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AbstractSetProcessInstanceStateCmd.java

@@ -45,7 +45,7 @@ public abstract class AbstractSetProcessInstanceStateCmd implements Command<Void
       throw new ActivitiIllegalArgumentException("ProcessInstanceId cannot be null.");
     }
 
-    ExecutionEntity executionEntity = commandContext.getExecutionEntityManager().findExecutionById(executionId);
+    ExecutionEntity executionEntity = commandContext.getExecutionEntityManager().findById(executionId);
 
     if (executionEntity == null) {
       throw new ActivitiObjectNotFoundException("Cannot find processInstance for id '" + executionId + "'.", Execution.class);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AddCommentCmd.java

@@ -56,7 +56,7 @@ public class AddCommentCmd implements Command<Comment> {
     TaskEntity task = null;
     // Validate task
     if (taskId != null) {
-      task = commandContext.getTaskEntityManager().findTaskById(taskId);
+      task = commandContext.getTaskEntityManager().findById(taskId);
 
       if (task == null) {
         throw new ActivitiObjectNotFoundException("Cannot find task with id " + taskId, Task.class);
@@ -69,7 +69,7 @@ public class AddCommentCmd implements Command<Comment> {
 
     ExecutionEntity execution = null;
     if (processInstanceId != null) {
-      execution = commandContext.getExecutionEntityManager().findExecutionById(processInstanceId);
+      execution = commandContext.getExecutionEntityManager().findById(processInstanceId);
 
       if (execution == null) {
         throw new ActivitiObjectNotFoundException("execution " + processInstanceId + " doesn't exist", Execution.class);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AddIdentityLinkForProcessDefinitionCmd.java

@@ -54,7 +54,7 @@ public class AddIdentityLinkForProcessDefinitionCmd implements Command<Void>, Se
   }
 
   public Void execute(CommandContext commandContext) {
-    ProcessDefinitionEntity processDefinition = commandContext.getProcessDefinitionEntityManager().findProcessDefinitionById(processDefinitionId);
+    ProcessDefinitionEntity processDefinition = commandContext.getProcessDefinitionEntityManager().findById(processDefinitionId);
 
     if (processDefinition == null) {
       throw new ActivitiObjectNotFoundException("Cannot find process definition with id " + processDefinitionId, ProcessDefinition.class);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AddIdentityLinkForProcessInstanceCmd.java

@@ -68,7 +68,7 @@ public class AddIdentityLinkForProcessInstanceCmd implements Command<Void>, Seri
   public Void execute(CommandContext commandContext) {
 
     ExecutionEntityManager executionEntityManager = commandContext.getExecutionEntityManager();
-    ExecutionEntity processInstance = executionEntityManager.findExecutionById(processInstanceId);
+    ExecutionEntity processInstance = executionEntityManager.findById(processInstanceId);
 
     if (processInstance == null) {
       throw new ActivitiObjectNotFoundException("Cannot find process instance with id " + processInstanceId, ExecutionEntity.class);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CancelJobsCmd.java

@@ -45,7 +45,7 @@ public class CancelJobsCmd implements Command<Void>, Serializable {
   public Void execute(CommandContext commandContext) {
     JobEntity jobToDelete = null;
     for (String jobId : jobIds) {
-      jobToDelete = commandContext.getJobEntityManager().findJobById(jobId);
+      jobToDelete = commandContext.getJobEntityManager().findById(jobId);
 
       if (jobToDelete != null) {
         // When given job doesn't exist, ignore

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/ChangeDeploymentTenantIdCmd.java

@@ -46,7 +46,7 @@ public class ChangeDeploymentTenantIdCmd implements Command<Void>, Serializable
 
     // Update all entities
 
-    DeploymentEntity deployment = commandContext.getDeploymentEntityManager().findDeploymentById(deploymentId);
+    DeploymentEntity deployment = commandContext.getDeploymentEntityManager().findById(deploymentId);
     if (deployment == null) {
       throw new ActivitiObjectNotFoundException("Could not find deployment with id " + deploymentId, Deployment.class);
     }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CreateAttachmentCmd.java

@@ -104,7 +104,7 @@ public class CreateAttachmentCmd implements Command<Attachment> {
       // process definition
       String processDefinitionId = null;
       if (attachment.getProcessInstanceId() != null) {
-        ExecutionEntity process = commandContext.getExecutionEntityManager().findExecutionById(processInstanceId);
+        ExecutionEntity process = commandContext.getExecutionEntityManager().findById(processInstanceId);
         if (process != null) {
           processDefinitionId = process.getProcessDefinitionId();
         }
@@ -120,7 +120,7 @@ public class CreateAttachmentCmd implements Command<Attachment> {
   }
 
   protected TaskEntity verifyTaskParameters(CommandContext commandContext) {
-    TaskEntity task = commandContext.getTaskEntityManager().findTaskById(taskId);
+    TaskEntity task = commandContext.getTaskEntityManager().findById(taskId);
 
     if (task == null) {
       throw new ActivitiObjectNotFoundException("Cannot find task with id " + taskId, Task.class);
@@ -134,7 +134,7 @@ public class CreateAttachmentCmd implements Command<Attachment> {
   }
 
   protected ExecutionEntity verifyExecutionParameters(CommandContext commandContext) {
-    ExecutionEntity execution = commandContext.getExecutionEntityManager().findExecutionById(processInstanceId);
+    ExecutionEntity execution = commandContext.getExecutionEntityManager().findById(processInstanceId);
 
     if (execution == null) {
       throw new ActivitiObjectNotFoundException("Process instance " + processInstanceId + " doesn't exist", ProcessInstance.class);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteAttachmentCmd.java

@@ -43,7 +43,7 @@ public class DeleteAttachmentCmd implements Command<Object>, Serializable {
     String processInstanceId = attachment.getProcessInstanceId();
     String processDefinitionId = null;
     if (attachment.getProcessInstanceId() != null) {
-      ExecutionEntity process = commandContext.getExecutionEntityManager().findExecutionById(processInstanceId);
+      ExecutionEntity process = commandContext.getExecutionEntityManager().findById(processInstanceId);
       if (process != null) {
         processDefinitionId = process.getProcessDefinitionId();
         if (Activiti5Util.isActiviti5ProcessDefinitionId(commandContext, process.getProcessDefinitionId())) {

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteCommentCmd.java

@@ -53,7 +53,7 @@ public class DeleteCommentCmd implements Command<Void>, Serializable {
       }
       
       if (comment.getProcessInstanceId() != null) {
-        ExecutionEntity execution = (ExecutionEntity) commandContext.getExecutionEntityManager().findExecutionById(comment.getProcessInstanceId());
+        ExecutionEntity execution = (ExecutionEntity) commandContext.getExecutionEntityManager().findById(comment.getProcessInstanceId());
         if (execution != null && Activiti5Util.isActiviti5ProcessDefinitionId(commandContext, execution.getProcessDefinitionId())) {
           Activiti5CompatibilityHandler activiti5CompatibilityHandler = Activiti5Util.getActiviti5CompatibilityHandler(); 
           activiti5CompatibilityHandler.deleteComment(commentId, taskId, processInstanceId);
@@ -61,7 +61,7 @@ public class DeleteCommentCmd implements Command<Void>, Serializable {
         }
       
       } else if (comment.getTaskId() != null) {
-        Task task = commandContext.getTaskEntityManager().findTaskById(comment.getTaskId());
+        Task task = commandContext.getTaskEntityManager().findById(comment.getTaskId());
         if (task != null && task.getProcessDefinitionId() != null && Activiti5Util.isActiviti5ProcessDefinitionId(commandContext, task.getProcessDefinitionId())) {
           Activiti5CompatibilityHandler activiti5CompatibilityHandler = Activiti5Util.getActiviti5CompatibilityHandler(); 
           activiti5CompatibilityHandler.deleteComment(commentId, taskId, processInstanceId);
@@ -76,7 +76,7 @@ public class DeleteCommentCmd implements Command<Void>, Serializable {
       ArrayList<Comment> comments = new ArrayList<Comment>();
       if (processInstanceId != null) {
         
-        ExecutionEntity execution = (ExecutionEntity) commandContext.getExecutionEntityManager().findExecutionById(processInstanceId);
+        ExecutionEntity execution = (ExecutionEntity) commandContext.getExecutionEntityManager().findById(processInstanceId);
         if (execution != null && Activiti5Util.isActiviti5ProcessDefinitionId(commandContext, execution.getProcessDefinitionId())) {
           Activiti5CompatibilityHandler activiti5CompatibilityHandler = Activiti5Util.getActiviti5CompatibilityHandler(); 
           activiti5CompatibilityHandler.deleteComment(commentId, taskId, processInstanceId);
@@ -87,7 +87,7 @@ public class DeleteCommentCmd implements Command<Void>, Serializable {
       }
       if (taskId != null) {
         
-        Task task = commandContext.getTaskEntityManager().findTaskById(taskId);
+        Task task = commandContext.getTaskEntityManager().findById(taskId);
         if (task != null && task.getProcessDefinitionId() != null && Activiti5Util.isActiviti5ProcessDefinitionId(commandContext, task.getProcessDefinitionId())) {
           Activiti5CompatibilityHandler activiti5CompatibilityHandler = Activiti5Util.getActiviti5CompatibilityHandler(); 
           activiti5CompatibilityHandler.deleteComment(commentId, taskId, processInstanceId);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteGroupCmd.java

@@ -34,7 +34,7 @@ public class DeleteGroupCmd implements Command<Void>, Serializable {
     if (groupId == null) {
       throw new ActivitiIllegalArgumentException("groupId is null");
     }
-    commandContext.getGroupEntityManager().deleteGroup(groupId);
+    commandContext.getGroupEntityManager().delete(groupId);
 
     return null;
   }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteHistoricProcessInstanceCmd.java

@@ -41,7 +41,7 @@ public class DeleteHistoricProcessInstanceCmd implements Command<Object>, Serial
       throw new ActivitiIllegalArgumentException("processInstanceId is null");
     }
     // Check if process instance is still running
-    HistoricProcessInstance instance = commandContext.getHistoricProcessInstanceEntityManager().findHistoricProcessInstance(processInstanceId);
+    HistoricProcessInstance instance = commandContext.getHistoricProcessInstanceEntityManager().findById(processInstanceId);
 
     if (instance == null) {
       throw new ActivitiObjectNotFoundException("No historic process instance found with id: " + processInstanceId, HistoricProcessInstance.class);
@@ -56,7 +56,7 @@ public class DeleteHistoricProcessInstanceCmd implements Command<Object>, Serial
       return null;
     }
     
-    commandContext.getHistoricProcessInstanceEntityManager().deleteHistoricProcessInstanceById(processInstanceId);
+    commandContext.getHistoricProcessInstanceEntityManager().delete(processInstanceId);
 
     return null;
   }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteHistoricTaskInstanceCmd.java

@@ -36,7 +36,7 @@ public class DeleteHistoricTaskInstanceCmd implements Command<Object>, Serializa
     if (taskId == null) {
       throw new ActivitiIllegalArgumentException("taskId is null");
     }
-    commandContext.getHistoricTaskInstanceEntityManager().deleteHistoricTaskInstanceById(taskId);
+    commandContext.getHistoricTaskInstanceEntityManager().delete(taskId);
     return null;
   }
 

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteIdentityLinkForProcessDefinitionCmd.java

@@ -55,7 +55,7 @@ public class DeleteIdentityLinkForProcessDefinitionCmd implements Command<Object
   }
 
   public Void execute(CommandContext commandContext) {
-    ProcessDefinitionEntity processDefinition = commandContext.getProcessDefinitionEntityManager().findProcessDefinitionById(processDefinitionId);
+    ProcessDefinitionEntity processDefinition = commandContext.getProcessDefinitionEntityManager().findById(processDefinitionId);
 
     if (processDefinition == null) {
       throw new ActivitiObjectNotFoundException("Cannot find process definition with id " + processDefinitionId, ProcessDefinition.class);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteIdentityLinkForProcessInstanceCmd.java

@@ -62,7 +62,7 @@ public class DeleteIdentityLinkForProcessInstanceCmd implements Command<Object>,
   }
 
   public Void execute(CommandContext commandContext) {
-    ExecutionEntity processInstance = commandContext.getExecutionEntityManager().findExecutionById(processInstanceId);
+    ExecutionEntity processInstance = commandContext.getExecutionEntityManager().findById(processInstanceId);
 
     if (processInstance == null) {
       throw new ActivitiObjectNotFoundException("Cannot find process instance with id " + processInstanceId, ExecutionEntity.class);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteJobCmd.java

@@ -62,7 +62,7 @@ public class DeleteJobCmd implements Command<Object>, Serializable {
       log.debug("Deleting job {}", jobId);
     }
 
-    JobEntity job = commandContext.getJobEntityManager().findJobById(jobId);
+    JobEntity job = commandContext.getJobEntityManager().findById(jobId);
     if (job == null) {
       throw new ActivitiObjectNotFoundException("No job found with id '" + jobId + "'", Job.class);
     }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteProcessInstanceCmd.java

@@ -53,7 +53,7 @@ public class DeleteProcessInstanceCmd implements Command<Void>, Serializable {
         .dispatchEvent(ActivitiEventBuilder.createCancelledEvent(this.processInstanceId, this.processInstanceId, null, deleteReason));
     }
 
-    ExecutionEntity processInstanceEntity = commandContext.getExecutionEntityManager().findExecutionById(processInstanceId);
+    ExecutionEntity processInstanceEntity = commandContext.getExecutionEntityManager().findById(processInstanceId);
     
     if (processInstanceEntity == null) {
       throw new ActivitiObjectNotFoundException("No process instance found for id '" + processInstanceId + "'", ProcessInstance.class);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteUserCmd.java

@@ -34,7 +34,7 @@ public class DeleteUserCmd implements Command<Void>, Serializable {
     if (userId == null) {
       throw new ActivitiIllegalArgumentException("userId is null");
     }
-    commandContext.getUserEntityManager().deleteUser(userId);
+    commandContext.getUserEntityManager().delete(userId);
 
     return null;
   }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeployCmd.java

@@ -95,7 +95,7 @@ public class DeployCmd<T> implements Command<Deployment>, Serializable {
     deployment.setNew(true);
 
     // Save the data
-    commandContext.getDeploymentEntityManager().insertDeployment(deployment);
+    commandContext.getDeploymentEntityManager().insert(deployment);
 
     if (commandContext.getProcessEngineConfiguration().getEventDispatcher().isEnabled()) {
       commandContext.getProcessEngineConfiguration().getEventDispatcher().dispatchEvent(ActivitiEventBuilder.createEntityEvent(ActivitiEventType.ENTITY_CREATED, deployment));

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/ExecuteJobsCmd.java

@@ -58,7 +58,7 @@ public class ExecuteJobsCmd implements Command<Object>, Serializable {
     }
 
     if (job == null) {
-      job = commandContext.getJobEntityManager().findJobById(jobId);
+      job = commandContext.getJobEntityManager().findById(jobId);
     }
 
     if (job == null) {

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/FindActiveActivityIdsCmd.java

@@ -44,7 +44,7 @@ public class FindActiveActivityIdsCmd implements Command<List<String>>, Serializ
     }
 
     ExecutionEntityManager executionEntityManager = commandContext.getExecutionEntityManager();
-    ExecutionEntity execution = executionEntityManager.findExecutionById(executionId);
+    ExecutionEntity execution = executionEntityManager.findById(executionId);
 
     if (execution == null) {
       throw new ActivitiObjectNotFoundException("execution " + executionId + " doesn't exist", Execution.class);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetDeploymentResourceCmd.java

@@ -47,7 +47,7 @@ public class GetDeploymentResourceCmd implements Command<InputStream>, Serializa
 
     ResourceEntity resource = commandContext.getResourceEntityManager().findResourceByDeploymentIdAndResourceName(deploymentId, resourceName);
     if (resource == null) {
-      if (commandContext.getDeploymentEntityManager().findDeploymentById(deploymentId) == null) {
+      if (commandContext.getDeploymentEntityManager().findById(deploymentId) == null) {
         throw new ActivitiObjectNotFoundException("deployment does not exist: " + deploymentId, Deployment.class);
       } else {
         throw new ActivitiObjectNotFoundException("no resource found with name '" + resourceName + "' in deployment '" + deploymentId + "'", InputStream.class);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetExecutionVariableCmd.java

@@ -48,7 +48,7 @@ public class GetExecutionVariableCmd implements Command<Object>, Serializable {
       throw new ActivitiIllegalArgumentException("variableName is null");
     }
 
-    ExecutionEntity execution = commandContext.getExecutionEntityManager().findExecutionById(executionId);
+    ExecutionEntity execution = commandContext.getExecutionEntityManager().findById(executionId);
 
     if (execution == null) {
       throw new ActivitiObjectNotFoundException("execution " + executionId + " doesn't exist", Execution.class);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetExecutionVariablesCmd.java

@@ -49,7 +49,7 @@ public class GetExecutionVariablesCmd implements Command<Map<String, Object>>, S
       throw new ActivitiIllegalArgumentException("executionId is null");
     }
 
-    ExecutionEntity execution = commandContext.getExecutionEntityManager().findExecutionById(executionId);
+    ExecutionEntity execution = commandContext.getExecutionEntityManager().findById(executionId);
 
     if (execution == null) {
       throw new ActivitiObjectNotFoundException("execution " + executionId + " doesn't exist", Execution.class);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetHistoricIdentityLinksForTaskCmd.java

@@ -52,7 +52,7 @@ public class GetHistoricIdentityLinksForTaskCmd implements Command<List<Historic
 
   @SuppressWarnings({ "unchecked", "rawtypes" })
   protected List<HistoricIdentityLink> getLinksForTask(CommandContext commandContext) {
-    HistoricTaskInstanceEntity task = commandContext.getHistoricTaskInstanceEntityManager().findHistoricTaskInstanceById(taskId);
+    HistoricTaskInstanceEntity task = commandContext.getHistoricTaskInstanceEntityManager().findById(taskId);
 
     if (task == null) {
       throw new ActivitiObjectNotFoundException("No historic task exists with the given id: " + taskId, HistoricTaskInstance.class);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetIdentityLinksForProcessDefinitionCmd.java

@@ -36,7 +36,7 @@ public class GetIdentityLinksForProcessDefinitionCmd implements Command<List<Ide
 
   @SuppressWarnings({ "unchecked", "rawtypes" })
   public List<IdentityLink> execute(CommandContext commandContext) {
-    ProcessDefinitionEntity processDefinition = commandContext.getProcessDefinitionEntityManager().findProcessDefinitionById(processDefinitionId);
+    ProcessDefinitionEntity processDefinition = commandContext.getProcessDefinitionEntityManager().findById(processDefinitionId);
 
     if (processDefinition == null) {
       throw new ActivitiObjectNotFoundException("Cannot find process definition with id " + processDefinitionId, ProcessDefinition.class);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetIdentityLinksForProcessInstanceCmd.java

@@ -36,7 +36,7 @@ public class GetIdentityLinksForProcessInstanceCmd implements Command<List<Ident
 
   @SuppressWarnings({ "unchecked", "rawtypes" })
   public List<IdentityLink> execute(CommandContext commandContext) {
-    ExecutionEntity processInstance = commandContext.getExecutionEntityManager().findExecutionById(processInstanceId);
+    ExecutionEntity processInstance = commandContext.getExecutionEntityManager().findById(processInstanceId);
 
     if (processInstance == null) {
       throw new ActivitiObjectNotFoundException("Cannot find process definition with id " + processInstanceId, ExecutionEntity.class);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetIdentityLinksForTaskCmd.java

@@ -37,7 +37,7 @@ public class GetIdentityLinksForTaskCmd implements Command<List<IdentityLink>>,
 
   @SuppressWarnings({ "unchecked", "rawtypes" })
   public List<IdentityLink> execute(CommandContext commandContext) {
-    TaskEntity task = commandContext.getTaskEntityManager().findTaskById(taskId);
+    TaskEntity task = commandContext.getTaskEntityManager().findById(taskId);
 
     List<IdentityLink> identityLinks = (List) task.getIdentityLinks();
 

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetJobExceptionStacktraceCmd.java

@@ -39,7 +39,7 @@ public class GetJobExceptionStacktraceCmd implements Command<String>, Serializab
       throw new ActivitiIllegalArgumentException("jobId is null");
     }
 
-    JobEntity job = commandContext.getJobEntityManager().findJobById(jobId);
+    JobEntity job = commandContext.getJobEntityManager().findById(jobId);
 
     if (job == null) {
       throw new ActivitiObjectNotFoundException("No job found with id " + jobId, Job.class);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetModelCmd.java

@@ -32,6 +32,6 @@ public class GetModelCmd implements Command<ModelEntity>, Serializable {
   }
 
   public ModelEntity execute(CommandContext commandContext) {
-    return commandContext.getModelEntityManager().findModelById(modelId);
+    return commandContext.getModelEntityManager().findById(modelId);
   }
 }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetNextIdBlockCmd.java

@@ -30,7 +30,7 @@ public class GetNextIdBlockCmd implements Command<IdBlock> {
   }
 
   public IdBlock execute(CommandContext commandContext) {
-    PropertyEntity property = (PropertyEntity) commandContext.getPropertyEntityManager().findPropertyById("next.dbid");
+    PropertyEntity property = (PropertyEntity) commandContext.getPropertyEntityManager().findById("next.dbid");
     long oldValue = Long.parseLong(property.getValue());
     long newValue = oldValue + idBlockSize;
     property.setValue(Long.toString(newValue));

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetRenderedTaskFormCmd.java

@@ -40,7 +40,7 @@ public class GetRenderedTaskFormCmd implements Command<Object>, Serializable {
   }
 
   public Object execute(CommandContext commandContext) {
-    TaskEntity task = commandContext.getTaskEntityManager().findTaskById(taskId);
+    TaskEntity task = commandContext.getTaskEntityManager().findById(taskId);
     if (task == null) {
       throw new ActivitiObjectNotFoundException("Task '" + taskId + "' not found", Task.class);
     }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetTaskFormCmd.java

@@ -37,7 +37,7 @@ public class GetTaskFormCmd implements Command<TaskFormData>, Serializable {
   }
 
   public TaskFormData execute(CommandContext commandContext) {
-    TaskEntity task = commandContext.getTaskEntityManager().findTaskById(taskId);
+    TaskEntity task = commandContext.getTaskEntityManager().findById(taskId);
     if (task == null) {
       throw new ActivitiObjectNotFoundException("No task found for taskId '" + taskId + "'", Task.class);
     }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetTaskVariableCmd.java

@@ -47,7 +47,7 @@ public class GetTaskVariableCmd implements Command<Object>, Serializable {
       throw new ActivitiIllegalArgumentException("variableName is null");
     }
 
-    TaskEntity task = commandContext.getTaskEntityManager().findTaskById(taskId);
+    TaskEntity task = commandContext.getTaskEntityManager().findById(taskId);
 
     if (task == null) {
       throw new ActivitiObjectNotFoundException("task " + taskId + " doesn't exist", Task.class);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetTaskVariablesCmd.java

@@ -46,7 +46,7 @@ public class GetTaskVariablesCmd implements Command<Map<String, Object>>, Serial
       throw new ActivitiIllegalArgumentException("taskId is null");
     }
 
-    TaskEntity task = commandContext.getTaskEntityManager().findTaskById(taskId);
+    TaskEntity task = commandContext.getTaskEntityManager().findById(taskId);
 
     if (task == null) {
       throw new ActivitiObjectNotFoundException("task " + taskId + " doesn't exist", Task.class);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetUserPictureCmd.java

@@ -38,7 +38,7 @@ public class GetUserPictureCmd implements Command<Picture>, Serializable {
     if (userId == null) {
       throw new ActivitiIllegalArgumentException("userId is null");
     }
-    User user = commandContext.getUserEntityManager().findUserById(userId);
+    User user = commandContext.getUserEntityManager().findById(userId);
     if (user == null) {
       throw new ActivitiObjectNotFoundException("user " + userId + " doesn't exist", User.class);
     }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/HasExecutionVariableCmd.java

@@ -45,7 +45,7 @@ public class HasExecutionVariableCmd implements Command<Boolean>, Serializable {
       throw new ActivitiIllegalArgumentException("variableName is null");
     }
 
-    ExecutionEntity execution = commandContext.getExecutionEntityManager().findExecutionById(executionId);
+    ExecutionEntity execution = commandContext.getExecutionEntityManager().findById(executionId);
 
     if (execution == null) {
       throw new ActivitiObjectNotFoundException("execution " + executionId + " doesn't exist", Execution.class);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/HasTaskVariableCmd.java

@@ -46,7 +46,7 @@ public class HasTaskVariableCmd implements Command<Boolean>, Serializable {
       throw new ActivitiIllegalArgumentException("variableName is null");
     }
 
-    TaskEntity task = commandContext.getTaskEntityManager().findTaskById(taskId);
+    TaskEntity task = commandContext.getTaskEntityManager().findById(taskId);
 
     if (task == null) {
       throw new ActivitiObjectNotFoundException("task " + taskId + " doesn't exist", Task.class);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/JobRetryCmd.java

@@ -56,7 +56,7 @@ public class JobRetryCmd implements Command<Object> {
   }
 
   public Object execute(CommandContext commandContext) {
-    JobEntity job = commandContext.getJobEntityManager().findJobById(jobId);
+    JobEntity job = commandContext.getJobEntityManager().findById(jobId);
     if (job == null) {
       return null;
     }
@@ -152,7 +152,7 @@ public class JobRetryCmd implements Command<Object> {
     if (executionId == null) {
       return null;
     }
-    return commandContext.getExecutionEntityManager().findExecutionById(executionId);
+    return commandContext.getExecutionEntityManager().findById(executionId);
   }
 
 }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/LockExclusiveJobCmd.java

@@ -49,7 +49,7 @@ public class LockExclusiveJobCmd implements Command<Object>, Serializable {
 
     if (job.isExclusive()) {
       if (job.getExecutionId() != null) {
-        ExecutionEntity execution = commandContext.getExecutionEntityManager().findExecutionById(job.getExecutionId());
+        ExecutionEntity execution = commandContext.getExecutionEntityManager().findById(job.getExecutionId());
         if (execution != null) {
           commandContext.getExecutionEntityManager().updateProcessInstanceLockTime(execution.getProcessInstanceId());
         }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/NeedsActiveExecutionCmd.java

@@ -40,7 +40,7 @@ public abstract class NeedsActiveExecutionCmd<T> implements Command<T>, Serializ
       throw new ActivitiIllegalArgumentException("executionId is null");
     }
 
-    ExecutionEntity execution = commandContext.getExecutionEntityManager().findExecutionById(executionId);
+    ExecutionEntity execution = commandContext.getExecutionEntityManager().findById(executionId);
 
     if (execution == null) {
       throw new ActivitiObjectNotFoundException("execution " + executionId + " doesn't exist", Execution.class);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/NeedsActiveTaskCmd.java

@@ -43,7 +43,7 @@ public abstract class NeedsActiveTaskCmd<T> implements Command<T>, Serializable
       throw new ActivitiIllegalArgumentException("taskId is null");
     }
 
-    TaskEntity task = commandContext.getTaskEntityManager().findTaskById(taskId);
+    TaskEntity task = commandContext.getTaskEntityManager().findById(taskId);
 
     if (task == null) {
       throw new ActivitiObjectNotFoundException("Cannot find task with id " + taskId, Task.class);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SaveAttachmentCmd.java

@@ -43,7 +43,7 @@ public class SaveAttachmentCmd implements Command<Object>, Serializable {
     String processInstanceId = updateAttachment.getProcessInstanceId();
     String processDefinitionId = null;
     if (updateAttachment.getProcessInstanceId() != null) {
-      ExecutionEntity process = commandContext.getExecutionEntityManager().findExecutionById(processInstanceId);
+      ExecutionEntity process = commandContext.getExecutionEntityManager().findById(processInstanceId);
       if (process != null) {
         processDefinitionId = process.getProcessDefinitionId();
         if (Activiti5Util.isActiviti5ProcessDefinitionId(commandContext, process.getProcessDefinitionId())) {

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SaveGroupCmd.java

@@ -16,8 +16,10 @@ import java.io.Serializable;
 
 import org.activiti.engine.ActivitiIllegalArgumentException;
 import org.activiti.engine.identity.Group;
+import org.activiti.engine.impl.db.PersistentObject;
 import org.activiti.engine.impl.interceptor.Command;
 import org.activiti.engine.impl.interceptor.CommandContext;
+import org.activiti.engine.impl.persistence.entity.GroupEntity;
 
 /**
  * @author Joram Barrez
@@ -37,7 +39,11 @@ public class SaveGroupCmd implements Command<Void>, Serializable {
     }
 
     if (commandContext.getGroupEntityManager().isNewGroup(group)) {
-      commandContext.getGroupEntityManager().insertGroup(group);
+      if (group instanceof GroupEntity) {
+        commandContext.getGroupEntityManager().insert((GroupEntity) group);
+      } else {
+        commandContext.getDbSqlSession().insert((PersistentObject) group);
+      }
     } else {
       commandContext.getGroupEntityManager().updateGroup(group);
     }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SaveUserCmd.java

@@ -16,8 +16,10 @@ import java.io.Serializable;
 
 import org.activiti.engine.ActivitiIllegalArgumentException;
 import org.activiti.engine.identity.User;
+import org.activiti.engine.impl.db.PersistentObject;
 import org.activiti.engine.impl.interceptor.Command;
 import org.activiti.engine.impl.interceptor.CommandContext;
+import org.activiti.engine.impl.persistence.entity.UserEntity;
 
 /**
  * @author Joram Barrez
@@ -36,7 +38,11 @@ public class SaveUserCmd implements Command<Void>, Serializable {
       throw new ActivitiIllegalArgumentException("user is null");
     }
     if (commandContext.getUserEntityManager().isNewUser(user)) {
-      commandContext.getUserEntityManager().insertUser(user);
+      if (user instanceof UserEntity) {
+        commandContext.getUserEntityManager().insert((UserEntity) user,true);
+      } else {
+        commandContext.getDbSqlSession().insert((PersistentObject) user);
+      }
     } else {
       commandContext.getUserEntityManager().updateUser(user);
     }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetDeploymentCategoryCmd.java

@@ -41,7 +41,7 @@ public class SetDeploymentCategoryCmd implements Command<Void> {
       throw new ActivitiIllegalArgumentException("Deployment id is null");
     }
 
-    DeploymentEntity deployment = commandContext.getDeploymentEntityManager().findDeploymentById(deploymentId);
+    DeploymentEntity deployment = commandContext.getDeploymentEntityManager().findById(deploymentId);
 
     if (deployment == null) {
       throw new ActivitiObjectNotFoundException("No deployment found for id = '" + deploymentId + "'", Deployment.class);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetJobRetriesCmd.java

@@ -48,7 +48,7 @@ public class SetJobRetriesCmd implements Command<Void>, Serializable {
   }
 
   public Void execute(CommandContext commandContext) {
-    JobEntity job = commandContext.getJobEntityManager().findJobById(jobId);
+    JobEntity job = commandContext.getJobEntityManager().findById(jobId);
     if (job != null) {
       
       if (Activiti5Util.isActiviti5ProcessDefinitionId(commandContext, job.getProcessDefinitionId())) {

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetProcessDefinitionCategoryCmd.java

@@ -44,7 +44,7 @@ public class SetProcessDefinitionCategoryCmd implements Command<Void> {
       throw new ActivitiIllegalArgumentException("Process definition id is null");
     }
 
-    ProcessDefinitionEntity processDefinition = commandContext.getProcessDefinitionEntityManager().findProcessDefinitionById(processDefinitionId);
+    ProcessDefinitionEntity processDefinition = commandContext.getProcessDefinitionEntityManager().findById(processDefinitionId);
 
     if (processDefinition == null) {
       throw new ActivitiObjectNotFoundException("No process definition found for id = '" + processDefinitionId + "'", ProcessDefinition.class);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetProcessDefinitionVersionCmd.java

@@ -75,7 +75,7 @@ public class SetProcessDefinitionVersionCmd implements Command<Void>, Serializab
     // same
     // process definition that the process instance is using
     ExecutionEntityManager executionManager = commandContext.getExecutionEntityManager();
-    ExecutionEntity processInstance = executionManager.findExecutionById(processInstanceId);
+    ExecutionEntity processInstance = executionManager.findById(processInstanceId);
     if (processInstance == null) {
       throw new ActivitiObjectNotFoundException("No process instance found for id = '" + processInstanceId + "'.", ProcessInstance.class);
     } else if (!processInstance.isProcessInstanceType()) {

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetProcessInstanceBusinessKeyCmd.java

@@ -50,7 +50,7 @@ public class SetProcessInstanceBusinessKeyCmd implements Command<Void>, Serializ
 
   public Void execute(CommandContext commandContext) {
     ExecutionEntityManager executionManager = commandContext.getExecutionEntityManager();
-    ExecutionEntity processInstance = executionManager.findExecutionById(processInstanceId);
+    ExecutionEntity processInstance = executionManager.findById(processInstanceId);
     if (processInstance == null) {
       throw new ActivitiObjectNotFoundException("No process instance found for id = '" + processInstanceId + "'.", ProcessInstance.class);
     } else if (!processInstance.isProcessInstanceType()) {

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetProcessInstanceNameCmd.java

@@ -40,7 +40,7 @@ public class SetProcessInstanceNameCmd implements Command<Void>, Serializable {
       throw new ActivitiIllegalArgumentException("processInstanceId is null");
     }
 
-    ExecutionEntity execution = commandContext.getExecutionEntityManager().findExecutionById(processInstanceId);
+    ExecutionEntity execution = commandContext.getExecutionEntityManager().findById(processInstanceId);
 
     if (execution == null) {
       throw new ActivitiObjectNotFoundException("process instance " + processInstanceId + " doesn't exist", ProcessInstance.class);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetUserPictureCmd.java

@@ -40,7 +40,7 @@ public class SetUserPictureCmd implements Command<Object>, Serializable {
     if (userId == null) {
       throw new ActivitiIllegalArgumentException("userId is null");
     }
-    User user = commandContext.getUserEntityManager().findUserById(userId);
+    User user = commandContext.getUserEntityManager().findById(userId);
     if (user == null) {
       throw new ActivitiObjectNotFoundException("user " + userId + " doesn't exist", User.class);
     }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SignalEventReceivedCmd.java

@@ -73,7 +73,7 @@ public class SignalEventReceivedCmd implements Command<Void> {
       signalEvents = eventSubscriptionEntityManager.findSignalEventSubscriptionsByEventName(eventName, tenantId);
     } else {
 
-      ExecutionEntity execution = commandContext.getExecutionEntityManager().findExecutionById(executionId);
+      ExecutionEntity execution = commandContext.getExecutionEntityManager().findById(executionId);
 
       if (execution == null) {
         throw new ActivitiObjectNotFoundException("Cannot find execution with id '" + executionId + "'", Execution.class);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/UnlockExclusiveJobCmd.java

@@ -50,7 +50,7 @@ public class UnlockExclusiveJobCmd implements Command<Object>, Serializable {
 
     if (job.isExclusive()) {
       if (job.getProcessInstanceId() != null) {
-        ExecutionEntity execution = commandContext.getExecutionEntityManager().findExecutionById(job.getProcessInstanceId());
+        ExecutionEntity execution = commandContext.getExecutionEntityManager().findById(job.getProcessInstanceId());
         if (execution != null) {
           commandContext.getExecutionEntityManager().clearProcessInstanceLockTime(execution.getId());
         } 

modules/activiti-engine/src/main/java/org/activiti/engine/impl/context/ExecutionContext.java

@@ -43,7 +43,7 @@ public class ExecutionContext {
 
   public DeploymentEntity getDeployment() {
     String deploymentId = getProcessDefinition().getDeploymentId();
-    DeploymentEntity deployment = Context.getCommandContext().getDeploymentEntityManager().findDeploymentById(deploymentId);
+    DeploymentEntity deployment = Context.getCommandContext().getDeploymentEntityManager().findById(deploymentId);
     return deployment;
   }
 }

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

@@ -101,7 +101,7 @@ public abstract class AbstractEventHandler implements EventHandler {
     
     if (flowNode instanceof SubProcess) {
       // The parent of the boundary event execution will be the one on which the boundary event is set
-      ExecutionEntity parentExecutionEntity = commandContext.getExecutionEntityManager().findExecutionById(boundaryEventExecution.getParentId());
+      ExecutionEntity parentExecutionEntity = commandContext.getExecutionEntityManager().findById(boundaryEventExecution.getParentId());
       if (parentExecutionEntity != null) {
         dispatchActivityCancelledForChildExecution(eventSubscription, parentExecutionEntity, boundaryEventExecution, commandContext);
       }

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

@@ -45,7 +45,7 @@ public class CompensationEventHandler implements EventHandler {
       throw new ActivitiException("Compensating execution not set for compensate event subscription with id " + eventSubscription.getId());
     }
 
-    ExecutionEntity compensatingExecution = commandContext.getExecutionEntityManager().findExecutionById(configuration);
+    ExecutionEntity compensatingExecution = commandContext.getExecutionEntityManager().findById(configuration);
 
     String processDefinitionId = compensatingExecution.getProcessDefinitionId();
     Process process = ProcessDefinitionUtil.getProcess(processDefinitionId);

modules/activiti-engine/src/main/java/org/activiti/engine/impl/history/DefaultHistoryManager.java

@@ -96,7 +96,7 @@ public class DefaultHistoryManager extends AbstractManager implements HistoryMan
   public void recordProcessInstanceEnd(String processInstanceId, String deleteReason, String activityId) {
 
     if (isHistoryLevelAtLeast(HistoryLevel.ACTIVITY)) {
-      HistoricProcessInstanceEntity historicProcessInstance = getHistoricProcessInstanceEntityManager().findHistoricProcessInstance(processInstanceId);
+      HistoricProcessInstanceEntity historicProcessInstance = getHistoricProcessInstanceEntityManager().findById(processInstanceId);
 
       if (historicProcessInstance != null) {
         historicProcessInstance.markEnded(deleteReason);
@@ -108,7 +108,7 @@ public class DefaultHistoryManager extends AbstractManager implements HistoryMan
   @Override
   public void recordProcessInstanceNameChange(String processInstanceId, String newName) {
     if (isHistoryLevelAtLeast(HistoryLevel.ACTIVITY)) {
-      HistoricProcessInstanceEntity historicProcessInstance = getHistoricProcessInstanceEntityManager().findHistoricProcessInstance(processInstanceId);
+      HistoricProcessInstanceEntity historicProcessInstance = getHistoricProcessInstanceEntityManager().findById(processInstanceId);
 
       if (historicProcessInstance != null) {
         historicProcessInstance.setName(newName);
@@ -373,7 +373,7 @@ public class DefaultHistoryManager extends AbstractManager implements HistoryMan
   @Override
   public void recordProcessDefinitionChange(String processInstanceId, String processDefinitionId) {
     if (isHistoryLevelAtLeast(HistoryLevel.ACTIVITY)) {
-      HistoricProcessInstanceEntity historicProcessInstance = getHistoricProcessInstanceEntityManager().findHistoricProcessInstance(processInstanceId);
+      HistoricProcessInstanceEntity historicProcessInstance = getHistoricProcessInstanceEntityManager().findById(processInstanceId);
       if (historicProcessInstance != null) {
         historicProcessInstance.setProcessDefinitionId(processDefinitionId);
       }

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.getEntity(configuration);
+    EventSubscriptionEntity eventSubscriptionEntity = eventSubscriptionEntityManager.findById(configuration);
 
     // if event subscription is null, ignore
     if (eventSubscriptionEntity != null) {

modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/deploy/DeploymentManager.java

@@ -63,7 +63,7 @@ public class DeploymentManager {
     ProcessDefinitionEntity processDefinition = cacheEntry != null ? cacheEntry.getProcessDefinitionEntity() : null;
 
     if (processDefinition == null) {
-      processDefinition = Context.getCommandContext().getProcessDefinitionEntityManager().findProcessDefinitionById(processDefinitionId);
+      processDefinition = Context.getCommandContext().getProcessDefinitionEntityManager().findById(processDefinitionId);
       if (processDefinition == null) {
         throw new ActivitiObjectNotFoundException("no deployed process definition found with id '" + processDefinitionId + "'", ProcessDefinition.class);
       }
@@ -111,7 +111,7 @@ public class DeploymentManager {
     ProcessDefinitionCacheEntry cachedProcessDefinition = processDefinitionCache.get(processDefinitionId);
 
     if (cachedProcessDefinition == null) {
-      DeploymentEntity deployment = Context.getCommandContext().getDeploymentEntityManager().findDeploymentById(deploymentId);
+      DeploymentEntity deployment = Context.getCommandContext().getDeploymentEntityManager().findById(deploymentId);
       deployment.setNew(false);
       deploy(deployment, null);
       cachedProcessDefinition = processDefinitionCache.get(processDefinitionId);
@@ -127,7 +127,7 @@ public class DeploymentManager {
     CommandContext commandContext = Context.getCommandContext();
     DeploymentEntityManager deploymentEntityManager = commandContext.getDeploymentEntityManager();
 
-    DeploymentEntity deployment = deploymentEntityManager.findDeploymentById(deploymentId);
+    DeploymentEntity deployment = deploymentEntityManager.findById(deploymentId);
     if (deployment == null) {
       throw new ActivitiObjectNotFoundException("Could not find a deployment with id '" + deploymentId + "'.", DeploymentEntity.class);
     }

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

@@ -50,7 +50,7 @@ public class AbstractEntityManager<Entity extends PersistentObject> extends Abst
   
   @Override
   public void delete(String id) {
-    Entity entity = getEntity(id);
+    Entity entity = findById(id);
     delete(entity);
   }
   
@@ -73,22 +73,21 @@ public class AbstractEntityManager<Entity extends PersistentObject> extends Abst
    */
 
   @Override
-  public Entity getEntity(String entityId) {
+  public Entity findById(String entityId) {
 
     // Cache
-    for (Entity cachedEntity : getPersistentObjectCache().findInCache(getManagedPersistentObject())) {
-      if (entityId.equals(cachedEntity.getId())) {
-        return cachedEntity;
-      }
+    Entity cachedEntity = getPersistentObjectCache().findInCache(getManagedPersistentObject(), entityId);
+    if (cachedEntity != null) {
+      return cachedEntity;
     }
-
+    
     // Database
     return getDbSqlSession().selectById(getManagedPersistentObject(), entityId);
   }
   
   @Override
   @SuppressWarnings("unchecked")
-  public Entity getEntity(String selectQuery, Object parameter, CachedPersistentObjectMatcher<Entity> cachedEntityMatcher) {
+  public Entity findByQuery(String selectQuery, Object parameter, CachedPersistentObjectMatcher<Entity> cachedEntityMatcher) {
     // Cache
     for (Entity cachedEntity : getPersistentObjectCache().findInCache(getManagedPersistentObject())) {
       if (cachedEntityMatcher.isRetained(cachedEntity)) {

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

@@ -27,6 +27,11 @@ import org.activiti.engine.task.Task;
  */
 public class AttachmentEntityManagerImpl extends AbstractEntityManager<AttachmentEntity> implements AttachmentEntityManager {
 
+  @Override
+  public Class<AttachmentEntity> getManagedPersistentObject() {
+    return AttachmentEntity.class;
+  }
+  
   @Override
   @SuppressWarnings("unchecked")
   public List<Attachment> findAttachmentsByProcessInstanceId(String processInstanceId) {
@@ -55,7 +60,7 @@ public class AttachmentEntityManagerImpl extends AbstractEntityManager<Attachmen
     if (dispatchEvents && attachments != null && !attachments.isEmpty()) {
       // Forced to fetch the task to get hold of the process definition
       // for event-dispatching, if available
-      Task task = getTaskEntityManager().findTaskById(taskId);
+      Task task = getTaskEntityManager().findById(taskId);
       if (task != null) {
         processDefinitionId = task.getProcessDefinitionId();
         processInstanceId = task.getProcessInstanceId();

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

@@ -21,8 +21,6 @@ public interface ByteArrayEntityManager extends EntityManager<ByteArrayEntity> {
 
   ByteArrayEntity createAndInsert(String name, byte[] bytes);
 
-  ByteArrayEntity findById(String byteArrayEntityId);
-
   /**
    * Deletes the {@link ByteArrayEntity} with the given id from the database. 
    * Important: this operation will NOT do any optimistic locking, to avoid loading the bytes in memory. So use this method

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

@@ -19,6 +19,11 @@ package org.activiti.engine.impl.persistence.entity;
  * @author Marcus Klimstra (CGI)
  */
 public class ByteArrayEntityManagerImpl extends AbstractEntityManager<ByteArrayEntity> implements ByteArrayEntityManager {
+   
+  @Override
+  public Class<ByteArrayEntity> getManagedPersistentObject() {
+    return ByteArrayEntity.class;
+  }
   
   @Override
   public ByteArrayEntity createAndInsert(byte[] bytes) {
@@ -32,11 +37,6 @@ public class ByteArrayEntityManagerImpl extends AbstractEntityManager<ByteArrayE
     return byteArrayEntity;
   }
 
-  @Override
-  public ByteArrayEntity findById(String byteArrayEntityId) {
-    return getDbSqlSession().selectById(ByteArrayEntity.class, byteArrayEntityId);
-  }
-
   @Override
   public void deleteByteArrayById(String byteArrayEntityId) {
     getDbSqlSession().delete("deleteByteArrayNoRevisionCheck", byteArrayEntityId);

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

@@ -22,8 +22,6 @@ import org.activiti.engine.task.Event;
  */
 public interface CommentEntityManager extends EntityManager<CommentEntity> {
 
-  void insert(CommentEntity commentEntity);
-
   List<Comment> findCommentsByTaskId(String taskId);
 
   List<Comment> findCommentsByTaskIdAndType(String taskId, String type);
@@ -46,6 +44,4 @@ public interface CommentEntityManager extends EntityManager<CommentEntity> {
 
   Event findEvent(String commentId);
 
-  void delete(CommentEntity commentEntity);
-
 }
\ No newline at end of file

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

@@ -29,6 +29,11 @@ import org.activiti.engine.task.Event;
  */
 public class CommentEntityManagerImpl extends AbstractEntityManager<CommentEntity> implements CommentEntityManager {
 
+  @Override
+  public Class<CommentEntity> getManagedPersistentObject() {
+    return CommentEntity.class;
+  }
+  
   @Override
   public void insert(CommentEntity commentEntity) {
     checkHistoryEnabled();
@@ -41,7 +46,7 @@ public class CommentEntityManagerImpl extends AbstractEntityManager<CommentEntit
       String processDefinitionId = null;
       String processInstanceId = comment.getProcessInstanceId();
       if (comment.getProcessInstanceId() != null) {
-        ExecutionEntity process = getExecutionEntityManager().findExecutionById(comment.getProcessInstanceId());
+        ExecutionEntity process = getExecutionEntityManager().findById(comment.getProcessInstanceId());
         if (process != null) {
           processDefinitionId = process.getProcessDefinitionId();
         }
@@ -142,7 +147,7 @@ public class CommentEntityManagerImpl extends AbstractEntityManager<CommentEntit
       String processDefinitionId = null;
       String processInstanceId = comment.getProcessInstanceId();
       if (comment.getProcessInstanceId() != null) {
-        ExecutionEntity process = getExecutionEntityManager().findExecutionById(comment.getProcessInstanceId());
+        ExecutionEntity process = getExecutionEntityManager().findById(comment.getProcessInstanceId());
         if (process != null) {
           processDefinitionId = process.getProcessDefinitionId();
         }

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

@@ -24,12 +24,8 @@ import org.activiti.engine.repository.Deployment;
  */
 public interface DeploymentEntityManager extends EntityManager<DeploymentEntity> {
 
-  void insertDeployment(DeploymentEntity deployment);
-
   DeploymentEntity findLatestDeploymentByName(String deploymentName);
 
-  DeploymentEntity findDeploymentById(String deploymentId);
-
   List<Deployment> findDeploymentsByQueryCriteria(DeploymentQueryImpl deploymentQuery, Page page);
 
   List<String> getDeploymentResourceNames(String deploymentId);

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

@@ -42,7 +42,12 @@ import org.apache.commons.collections.CollectionUtils;
 public class DeploymentEntityManagerImpl extends AbstractEntityManager<DeploymentEntity> implements DeploymentEntityManager {
 
   @Override
-  public void insertDeployment(DeploymentEntity deployment) {
+  public Class<DeploymentEntity> getManagedPersistentObject() {
+    return DeploymentEntity.class;
+  }
+  
+  @Override
+  public void insert(DeploymentEntity deployment) {
     getDbSqlSession().insert(deployment);
 
     for (ResourceEntity resource : deployment.getResources().values()) {
@@ -187,11 +192,6 @@ public class DeploymentEntityManagerImpl extends AbstractEntityManager<Deploymen
     return null;
   }
 
-  @Override
-  public DeploymentEntity findDeploymentById(String deploymentId) {
-    return (DeploymentEntity) getDbSqlSession().selectOne("selectDeploymentById", deploymentId);
-  }
-
   @Override
   public long findDeploymentCountByQueryCriteria(DeploymentQueryImpl deploymentQuery) {
     return (Long) getDbSqlSession().selectOne("selectDeploymentCountByQueryCriteria", deploymentQuery);

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

@@ -26,9 +26,9 @@ public interface EntityManager<Entity extends PersistentObject> {
 
   void insert(Entity entity, boolean fireCreateEvent);
 
-  Entity getEntity(String entityId);
+  Entity findById(String entityId);
 
-  Entity getEntity(String selectQuery, Object parameter, CachedPersistentObjectMatcher<Entity> cachedEntityMatcher);
+  Entity findByQuery(String selectQuery, Object parameter, CachedPersistentObjectMatcher<Entity> cachedEntityMatcher);
 
   /**
    * Gets a list by querying the database and the cache using {@link CachedPersistentObjectMatcher}.

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

@@ -24,6 +24,11 @@ import org.activiti.engine.event.EventLogEntry;
  */
 public class EventLogEntryEntityManagerImpl extends AbstractEntityManager<EventLogEntryEntity> implements EventLogEntryEntityManager {
 
+  @Override
+  public Class<EventLogEntryEntity> getManagedPersistentObject() {
+    return EventLogEntryEntity.class;
+  }
+  
   @Override
   @SuppressWarnings("unchecked")
   public List<EventLogEntry> findAllEventLogEntries() {

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

@@ -104,7 +104,7 @@ public abstract class EventSubscriptionEntity implements PersistentObject, HasRe
   
   public ExecutionEntity getExecution() {
     if (execution == null && executionId != null) {
-      execution = Context.getCommandContext().getExecutionEntityManager().findExecutionById(executionId);
+      execution = Context.getCommandContext().getExecutionEntityManager().findById(executionId);
     }
     return execution;
   }

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

@@ -318,7 +318,7 @@ public class ExecutionEntity extends VariableScopeImpl
 
   protected void ensureProcessInstanceInitialized() {
     if ((processInstance == null) && (processInstanceId != null)) {
-      processInstance = Context.getCommandContext().getExecutionEntityManager().findExecutionById(processInstanceId);
+      processInstance = Context.getCommandContext().getExecutionEntityManager().findById(processInstanceId);
     }
   }
 
@@ -343,7 +343,7 @@ public class ExecutionEntity extends VariableScopeImpl
 
   protected void ensureParentInitialized() {
     if (parent == null && parentId != null) {
-      parent = Context.getCommandContext().getExecutionEntityManager().findExecutionById(parentId);
+      parent = Context.getCommandContext().getExecutionEntityManager().findById(parentId);
     }
   }
 
@@ -383,7 +383,7 @@ public class ExecutionEntity extends VariableScopeImpl
 
   protected void ensureSuperExecutionInitialized() {
     if (superExecution == null && superExecutionId != null) {
-      superExecution = Context.getCommandContext().getExecutionEntityManager().findExecutionById(superExecutionId);
+      superExecution = Context.getCommandContext().getExecutionEntityManager().findById(superExecutionId);
     }
   }
 

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

@@ -39,8 +39,6 @@ public interface ExecutionEntityManager extends EntityManager<ExecutionEntity> {
 
   List<ExecutionEntity> findChildExecutionsByProcessInstanceId(String processInstanceId);
 
-  ExecutionEntity findExecutionById(String executionId);
-
   List<ExecutionEntity> findExecutionsByParentExecutionAndActivityIds(String parentExecutionId, Collection<String> activityIds);
 
   long findExecutionCountByQueryCriteria(ExecutionQueryImpl executionQuery);

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

@@ -58,7 +58,7 @@ public class ExecutionEntityManagerImpl extends AbstractEntityManager<ExecutionE
 
   @Override
   public ExecutionEntity findSubProcessInstanceBySuperExecutionId(final String superExecutionId) {
-    return getEntity("selectSubProcessInstanceBySuperExecutionId", superExecutionId, new CachedPersistentObjectMatcher<ExecutionEntity>() {
+    return findByQuery("selectSubProcessInstanceBySuperExecutionId", superExecutionId, new CachedPersistentObjectMatcher<ExecutionEntity>() {
 
       public boolean isRetained(ExecutionEntity executionEntity) {
         return executionEntity.getSuperExecutionId() != null && superExecutionId.equals(executionEntity.getSuperExecutionId());
@@ -87,11 +87,6 @@ public class ExecutionEntityManagerImpl extends AbstractEntityManager<ExecutionE
     }, true);
   }
 
-  @Override
-  public ExecutionEntity findExecutionById(final String executionId) {
-    return getEntity(executionId);
-  }
-  
   @Override
   public List<ExecutionEntity> findExecutionsByParentExecutionAndActivityIds(final String parentExecutionId, final Collection<String> activityIds) {
     
@@ -362,7 +357,7 @@ public class ExecutionEntityManagerImpl extends AbstractEntityManager<ExecutionE
 
   @Override
   public void deleteProcessInstance(String processInstanceId, String deleteReason, boolean cascade) {
-    ExecutionEntity execution = findExecutionById(processInstanceId);
+    ExecutionEntity execution = findById(processInstanceId);
 
     if (execution == null) {
       throw new ActivitiObjectNotFoundException("No process instance found for id '" + processInstanceId + "'", ProcessInstance.class);
@@ -408,7 +403,7 @@ public class ExecutionEntityManagerImpl extends AbstractEntityManager<ExecutionE
     deleteExecutionAndRelatedData(execution, deleteReason, false);
 
     if (deleteHistory) {
-      getHistoricProcessInstanceEntityManager().deleteHistoricProcessInstanceById(execution.getId());
+      getHistoricProcessInstanceEntityManager().delete(execution.getId());
     }
   }
   
@@ -422,7 +417,7 @@ public class ExecutionEntityManagerImpl extends AbstractEntityManager<ExecutionE
   public void deleteProcessInstanceExecutionEntity(String processInstanceId, 
       String currentFlowElementId, String deleteReason, boolean cascade, boolean cancel, boolean fireEvent) {
     
-    ExecutionEntity processInstanceEntity = findExecutionById(processInstanceId);
+    ExecutionEntity processInstanceEntity = findById(processInstanceId);
     
     if (processInstanceEntity == null) {
       throw new ActivitiObjectNotFoundException("No process instance found for id '" + processInstanceId + "'", ProcessInstance.class);

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

@@ -28,12 +28,8 @@ public interface GroupEntityManager extends EntityManager<GroupEntity> {
 
   Group createNewGroup(String groupId);
 
-  void insertGroup(Group group);
-
   void updateGroup(Group updatedGroup);
 
-  void deleteGroup(String groupId);
-
   GroupQuery createNewGroupQuery();
 
   List<Group> findGroupByQueryCriteria(GroupQueryImpl query, Page page);

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

@@ -22,7 +22,6 @@ import org.activiti.engine.identity.Group;
 import org.activiti.engine.identity.GroupQuery;
 import org.activiti.engine.impl.GroupQueryImpl;
 import org.activiti.engine.impl.Page;
-import org.activiti.engine.impl.db.PersistentObject;
 
 /**
  * @author Tom Baeyens
@@ -31,19 +30,15 @@ import org.activiti.engine.impl.db.PersistentObject;
  */
 public class GroupEntityManagerImpl extends AbstractEntityManager<GroupEntity> implements GroupEntityManager {
 
+  @Override
+  public Class<GroupEntity> getManagedPersistentObject() {
+    return GroupEntity.class;
+  }
+  
   public Group createNewGroup(String groupId) {
     return new GroupEntity(groupId);
   }
 
-  public void insertGroup(Group group) {
-    getDbSqlSession().insert((PersistentObject) group);
-
-    if (getEventDispatcher().isEnabled()) {
-      getEventDispatcher().dispatchEvent(ActivitiEventBuilder.createEntityEvent(ActivitiEventType.ENTITY_CREATED, group));
-      getEventDispatcher().dispatchEvent(ActivitiEventBuilder.createEntityEvent(ActivitiEventType.ENTITY_INITIALIZED, group));
-    }
-  }
-
   public void updateGroup(Group updatedGroup) {
     getDbSqlSession().update((GroupEntity) updatedGroup);
 
@@ -51,8 +46,9 @@ public class GroupEntityManagerImpl extends AbstractEntityManager<GroupEntity> i
       getEventDispatcher().dispatchEvent(ActivitiEventBuilder.createEntityEvent(ActivitiEventType.ENTITY_UPDATED, updatedGroup));
     }
   }
-
-  public void deleteGroup(String groupId) {
+  
+  @Override
+  public void delete(String groupId) {
     GroupEntity group = getDbSqlSession().selectById(GroupEntity.class, groupId);
 
     if (group != null) {

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

@@ -23,8 +23,6 @@ import org.activiti.engine.impl.HistoricProcessInstanceQueryImpl;
  */
 public interface HistoricProcessInstanceEntityManager extends EntityManager<HistoricProcessInstanceEntity> {
 
-  HistoricProcessInstanceEntity findHistoricProcessInstance(String processInstanceId);
-
   long findHistoricProcessInstanceCountByQueryCriteria(HistoricProcessInstanceQueryImpl historicProcessInstanceQuery);
 
   List<HistoricProcessInstance> findHistoricProcessInstancesByQueryCriteria(HistoricProcessInstanceQueryImpl historicProcessInstanceQuery);
@@ -35,8 +33,6 @@ public interface HistoricProcessInstanceEntityManager extends EntityManager<Hist
 
   long findHistoricProcessInstanceCountByNativeQuery(Map<String, Object> parameterMap);
   
-  void deleteHistoricProcessInstanceById(String historicProcessInstanceId);
-
   void deleteHistoricProcessInstanceByProcessDefinitionId(String processDefinitionId);
 
 }
\ No newline at end of file

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

@@ -27,13 +27,10 @@ import org.activiti.engine.impl.HistoricProcessInstanceQueryImpl;
 public class HistoricProcessInstanceEntityManagerImpl extends AbstractEntityManager<HistoricProcessInstanceEntity> implements HistoricProcessInstanceEntityManager {
 
   @Override
-  public HistoricProcessInstanceEntity findHistoricProcessInstance(String processInstanceId) {
-    if (getHistoryManager().isHistoryEnabled()) {
-      return (HistoricProcessInstanceEntity) getDbSqlSession().selectById(HistoricProcessInstanceEntity.class, processInstanceId);
-    }
-    return null;
+  public Class<HistoricProcessInstanceEntity> getManagedPersistentObject() {
+    return HistoricProcessInstanceEntity.class;
   }
-
+  
   @Override
   @SuppressWarnings("unchecked")
   public void deleteHistoricProcessInstanceByProcessDefinitionId(String processDefinitionId) {
@@ -41,16 +38,15 @@ public class HistoricProcessInstanceEntityManagerImpl extends AbstractEntityMana
       List<String> historicProcessInstanceIds = getDbSqlSession().selectList("selectHistoricProcessInstanceIdsByProcessDefinitionId", processDefinitionId);
 
       for (String historicProcessInstanceId : historicProcessInstanceIds) {
-        deleteHistoricProcessInstanceById(historicProcessInstanceId);
+        delete(historicProcessInstanceId);
       }
     }
   }
-
+  
   @Override
-  @SuppressWarnings("unchecked")
-  public void deleteHistoricProcessInstanceById(String historicProcessInstanceId) {
+  public void delete(String historicProcessInstanceId) {
     if (getHistoryManager().isHistoryEnabled()) {
-      HistoricProcessInstanceEntity historicProcessInstance = findHistoricProcessInstance(historicProcessInstanceId);
+      HistoricProcessInstanceEntity historicProcessInstance = findById(historicProcessInstanceId);
 
       getHistoricDetailEntityManager().deleteHistoricDetailsByProcessInstanceId(historicProcessInstanceId);
       getHistoricVariableInstanceEntityManager().deleteHistoricVariableInstanceByProcessInstanceId(historicProcessInstanceId);
@@ -67,7 +63,7 @@ public class HistoricProcessInstanceEntityManagerImpl extends AbstractEntityMana
 
       List<HistoricProcessInstance> selectList = getDbSqlSession().selectList("selectHistoricProcessInstancesByQueryCriteria", subProcessesQueryImpl);
       for (HistoricProcessInstance child : selectList) {
-        deleteHistoricProcessInstanceById(child.getId());
+        delete(child.getId());
       }
     }
   }

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

@@ -29,14 +29,10 @@ public interface HistoricTaskInstanceEntityManager extends EntityManager<Histori
 
   List<HistoricTaskInstance> findHistoricTaskInstancesAndVariablesByQueryCriteria(HistoricTaskInstanceQueryImpl historicTaskInstanceQuery);
 
-  HistoricTaskInstanceEntity findHistoricTaskInstanceById(String taskId);
-
   List<HistoricTaskInstance> findHistoricTaskInstancesByNativeQuery(Map<String, Object> parameterMap, int firstResult, int maxResults);
 
   long findHistoricTaskInstanceCountByNativeQuery(Map<String, Object> parameterMap);
   
-  void deleteHistoricTaskInstanceById(String taskId);
-  
   void deleteHistoricTaskInstancesByProcessInstanceId(String processInstanceId);
 
 }
\ No newline at end of file

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

@@ -17,12 +17,10 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import org.activiti.engine.ActivitiIllegalArgumentException;
 import org.activiti.engine.compatibility.Activiti5CompatibilityHandler;
 import org.activiti.engine.history.HistoricTaskInstance;
 import org.activiti.engine.impl.HistoricTaskInstanceQueryImpl;
 import org.activiti.engine.impl.history.HistoryLevel;
-import org.activiti.engine.impl.interceptor.CommandContext;
 import org.activiti.engine.impl.util.Activiti5Util;
 
 /**
@@ -31,13 +29,18 @@ import org.activiti.engine.impl.util.Activiti5Util;
  */
 public class HistoricTaskInstanceEntityManagerImpl extends AbstractEntityManager<HistoricTaskInstanceEntity> implements HistoricTaskInstanceEntityManager {
 
+  @Override
+  public Class<HistoricTaskInstanceEntity> getManagedPersistentObject() {
+    return HistoricTaskInstanceEntity.class;
+  }
+  
   @Override
   @SuppressWarnings("unchecked")
   public void deleteHistoricTaskInstancesByProcessInstanceId(String processInstanceId) {
     if (getHistoryManager().isHistoryLevelAtLeast(HistoryLevel.AUDIT)) {
       List<String> taskInstanceIds = (List<String>) getDbSqlSession().selectList("selectHistoricTaskInstanceIdsByProcessInstanceId", processInstanceId);
       for (String taskInstanceId : taskInstanceIds) {
-        deleteHistoricTaskInstanceById(taskInstanceId);
+        delete(taskInstanceId);
       }
     }
   }
@@ -98,34 +101,23 @@ public class HistoricTaskInstanceEntityManagerImpl extends AbstractEntityManager
   }
 
   @Override
-  public HistoricTaskInstanceEntity findHistoricTaskInstanceById(String taskId) {
-    if (taskId == null) {
-      throw new ActivitiIllegalArgumentException("Invalid historic task id : null");
-    }
-    if (getHistoryManager().isHistoryEnabled()) {
-      return (HistoricTaskInstanceEntity) getDbSqlSession().selectOne("selectHistoricTaskInstance", taskId);
-    }
-    return null;
-  }
-
-  @Override
-  public void deleteHistoricTaskInstanceById(String taskId) {
+  public void delete(String id) {
     if (getHistoryManager().isHistoryEnabled()) {
-      HistoricTaskInstanceEntity historicTaskInstance = findHistoricTaskInstanceById(taskId);
+      HistoricTaskInstanceEntity historicTaskInstance = findById(id);
       if (historicTaskInstance != null) {
         
         if (historicTaskInstance.getProcessDefinitionId() != null 
             && Activiti5Util.isActiviti5ProcessDefinitionId(getCommandContext(), historicTaskInstance.getProcessDefinitionId())) {
           Activiti5CompatibilityHandler activiti5CompatibilityHandler = Activiti5Util.getActiviti5CompatibilityHandler(); 
-          activiti5CompatibilityHandler.deleteHistoricTask(taskId);
+          activiti5CompatibilityHandler.deleteHistoricTask(id);
           return;
         }
 
-        getHistoricDetailEntityManager().deleteHistoricDetailsByTaskId(taskId);
-        getHistoricVariableInstanceEntityManager().deleteHistoricVariableInstancesByTaskId(taskId);
-        getCommentEntityManager().deleteCommentsByTaskId(taskId);
-        getAttachmentEntityManager().deleteAttachmentsByTaskId(taskId);
-        getHistoricIdentityLinkEntityManager().deleteHistoricIdentityLinksByTaskId(taskId);
+        getHistoricDetailEntityManager().deleteHistoricDetailsByTaskId(id);
+        getHistoricVariableInstanceEntityManager().deleteHistoricVariableInstancesByTaskId(id);
+        getCommentEntityManager().deleteCommentsByTaskId(id);
+        getAttachmentEntityManager().deleteAttachmentsByTaskId(id);
+        getHistoricIdentityLinkEntityManager().deleteHistoricIdentityLinksByTaskId(id);
         
         getDbSqlSession().delete(historicTaskInstance);
       }

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

@@ -25,6 +25,11 @@ import java.util.Set;
  */
 public class IdentityInfoEntityManagerImpl extends AbstractEntityManager<IdentityInfoEntity> implements IdentityInfoEntityManager {
 
+  @Override
+  public Class<IdentityInfoEntity> getManagedPersistentObject() {
+    return IdentityInfoEntity.class;
+  }
+  
   @Override
   public void deleteUserInfoByUserIdAndKey(String userId, String key) {
     IdentityInfoEntity identityInfoEntity = findUserInfoByUserIdAndKey(userId, key);

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

@@ -149,7 +149,7 @@ public class IdentityLinkEntity implements Serializable, IdentityLink, BulkDelet
 
   public TaskEntity getTask() {
     if ((task == null) && (taskId != null)) {
-      this.task = Context.getCommandContext().getTaskEntityManager().findTaskById(taskId);
+      this.task = Context.getCommandContext().getTaskEntityManager().findById(taskId);
     }
     return task;
   }
@@ -161,7 +161,7 @@ public class IdentityLinkEntity implements Serializable, IdentityLink, BulkDelet
 
   public ExecutionEntity getProcessInstance() {
     if ((processInstance == null) && (processInstanceId != null)) {
-      this.processInstance = Context.getCommandContext().getExecutionEntityManager().findExecutionById(processInstanceId);
+      this.processInstance = Context.getCommandContext().getExecutionEntityManager().findById(processInstanceId);
     }
     return processInstance;
   }
@@ -173,7 +173,7 @@ public class IdentityLinkEntity implements Serializable, IdentityLink, BulkDelet
 
   public ProcessDefinitionEntity getProcessDef() {
     if ((processDef == null) && (processDefId != null)) {
-      this.processDef = Context.getCommandContext().getProcessDefinitionEntityManager().findProcessDefinitionById(processDefId);
+      this.processDef = Context.getCommandContext().getProcessDefinitionEntityManager().findById(processDefId);
     }
     return processDef;
   }

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

@@ -30,6 +30,11 @@ import org.activiti.engine.task.IdentityLinkType;
  */
 public class IdentityLinkEntityManagerImpl extends AbstractEntityManager<IdentityLinkEntity> implements IdentityLinkEntityManager {
   
+  @Override
+  public Class<IdentityLinkEntity> getManagedPersistentObject() {
+    return IdentityLinkEntity.class;
+  }
+  
   @Override
   public void insert(IdentityLinkEntity entity, boolean fireCreateEvent) {
     super.insert(entity, fireCreateEvent);

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

@@ -33,8 +33,6 @@ public interface JobEntityManager extends EntityManager<JobEntity> {
   void retryAsyncJob(JobEntity job);
   
 
-  JobEntity findJobById(String jobId);
-
   List<JobEntity> findNextJobsToExecute(Page page);
 
   List<JobEntity> findNextTimerJobsToExecute(Page page);

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

@@ -75,7 +75,7 @@ public class JobEntityManagerImpl extends AbstractEntityManager<JobEntity> imple
 
     // add link to execution
     if (jobEntity.getExecutionId() != null) {
-      ExecutionEntity execution = getExecutionEntityManager().findExecutionById(jobEntity.getExecutionId());
+      ExecutionEntity execution = getExecutionEntityManager().findById(jobEntity.getExecutionId());
       execution.getJobs().add(jobEntity);
 
       // Inherit tenant if (if applicable)
@@ -162,11 +162,6 @@ public class JobEntityManagerImpl extends AbstractEntityManager<JobEntity> imple
     getCommandContext().getTransactionContext().addTransactionListener(TransactionState.COMMITTED, transactionListener);
   }
 
-  @Override
-  public JobEntity findJobById(String jobId) {
-    return (JobEntity) getDbSqlSession().selectOne("selectJob", jobId);
-  }
-
   @Override
   @SuppressWarnings("unchecked")
   public List<JobEntity> findNextJobsToExecute(Page page) {
@@ -298,7 +293,7 @@ public class JobEntityManagerImpl extends AbstractEntityManager<JobEntity> imple
 
     // remove link to execution
     if (jobEntity.getExecutionId() != null) {
-      ExecutionEntity execution = getExecutionEntityManager().findExecutionById(jobEntity.getExecutionId());
+      ExecutionEntity execution = getExecutionEntityManager().findById(jobEntity.getExecutionId());
       execution.getJobs().remove(this);
     }
     
@@ -323,7 +318,7 @@ public class JobEntityManagerImpl extends AbstractEntityManager<JobEntity> imple
     
     ExecutionEntity execution = null;
     if (jobEntity.getExecutionId() != null) {
-      execution = getExecutionEntityManager().findExecutionById(jobEntity.getExecutionId());
+      execution = getExecutionEntityManager().findById(jobEntity.getExecutionId());
     }
 
     Map<String, JobHandler> jobHandlers = getProcessEngineConfiguration().getJobHandlers();
@@ -389,7 +384,7 @@ public class JobEntityManagerImpl extends AbstractEntityManager<JobEntity> imple
 
         VariableScope executionEntity = null;
         if (timerEntity.getExecutionId() != null) {
-          executionEntity = getExecutionEntityManager().findExecutionById(timerEntity.getExecutionId());
+          executionEntity = getExecutionEntityManager().findById(timerEntity.getExecutionId());
         }
         
         if (executionEntity == null) {

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

@@ -25,6 +25,11 @@ import org.activiti.engine.delegate.event.impl.ActivitiEventBuilder;
  */
 public class MembershipEntityManagerImpl extends AbstractEntityManager<MembershipEntity> implements MembershipEntityManager {
 
+  @Override
+  public Class<MembershipEntity> getManagedPersistentObject() {
+    return MembershipEntity.class;
+  }
+  
   public void createMembership(String userId, String groupId) {
     MembershipEntity membershipEntity = new MembershipEntity();
     membershipEntity.setUserId(userId);

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

@@ -30,8 +30,6 @@ public interface ModelEntityManager extends EntityManager<ModelEntity> {
 
   void insertEditorSourceExtraForModel(String modelId, byte[] modelSource);
 
-  ModelEntity findModelById(String modelId);
-  
   List<Model> findModelsByQueryCriteria(ModelQueryImpl query, Page page);
 
   long findModelCountByQueryCriteria(ModelQueryImpl query);

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

@@ -27,6 +27,11 @@ import org.activiti.engine.repository.Model;
  * @author Joram Barrez
  */
 public class ModelEntityManagerImpl extends AbstractEntityManager<ModelEntity> implements ModelEntityManager {
+  
+  @Override
+  public Class<ModelEntity> getManagedPersistentObject() {
+    return ModelEntity.class;
+  }
 
   @Override
   public Model createNewModel() {
@@ -61,7 +66,7 @@ public class ModelEntityManagerImpl extends AbstractEntityManager<ModelEntity> i
 
   @Override
   public void insertEditorSourceForModel(String modelId, byte[] modelSource) {
-    ModelEntity model = findModelById(modelId);
+    ModelEntity model = findById(modelId);
     if (model != null) {
       ByteArrayRef ref = new ByteArrayRef(model.getEditorSourceValueId());
       ref.setValue("source", modelSource);
@@ -91,7 +96,7 @@ public class ModelEntityManagerImpl extends AbstractEntityManager<ModelEntity> i
 
   @Override
   public void insertEditorSourceExtraForModel(String modelId, byte[] modelSource) {
-    ModelEntity model = findModelById(modelId);
+    ModelEntity model = findById(modelId);
     if (model != null) {
       ByteArrayRef ref = new ByteArrayRef(model.getEditorSourceExtraValueId());
       ref.setValue("source-extra", modelSource);
@@ -114,14 +119,9 @@ public class ModelEntityManagerImpl extends AbstractEntityManager<ModelEntity> i
     return (Long) getDbSqlSession().selectOne("selectModelCountByQueryCriteria", query);
   }
 
-  @Override
-  public ModelEntity findModelById(String modelId) {
-    return (ModelEntity) getDbSqlSession().selectOne("selectModel", modelId);
-  }
-
   @Override
   public byte[] findEditorSourceByModelId(String modelId) {
-    ModelEntity model = findModelById(modelId);
+    ModelEntity model = findById(modelId);
     if (model == null || model.getEditorSourceValueId() == null) {
       return null;
     }
@@ -132,7 +132,7 @@ public class ModelEntityManagerImpl extends AbstractEntityManager<ModelEntity> i
 
   @Override
   public byte[] findEditorSourceExtraByModelId(String modelId) {
-    ModelEntity model = findModelById(modelId);
+    ModelEntity model = findById(modelId);
     if (model == null || model.getEditorSourceExtraValueId() == null) {
       return null;
     }