Removing ReadonlyProcessDefinition interface. PVM heritage + all methods were...

Removing ReadonlyProcessDefinition interface. PVM heritage + all methods were already in ProcessDefinition.

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

@@ -46,7 +46,6 @@ import org.activiti.engine.impl.cmd.SetProcessDefinitionCategoryCmd;
 import org.activiti.engine.impl.cmd.SuspendProcessDefinitionCmd;
 import org.activiti.engine.impl.cmd.ValidateBpmnModelCmd;
 import org.activiti.engine.impl.persistence.entity.ModelEntity;
-import org.activiti.engine.impl.pvm.ReadOnlyProcessDefinition;
 import org.activiti.engine.impl.repository.DeploymentBuilderImpl;
 import org.activiti.engine.repository.Deployment;
 import org.activiti.engine.repository.DeploymentBuilder;
@@ -133,7 +132,7 @@ public class RepositoryServiceImpl extends ServiceImpl implements RepositoryServ
     return commandExecutor.execute(new GetBpmnModelCmd(processDefinitionId));
   }
 
-  public ReadOnlyProcessDefinition getDeployedProcessDefinition(String processDefinitionId) {
+  public ProcessDefinition getDeployedProcessDefinition(String processDefinitionId) {
     return commandExecutor.execute(new GetDeploymentProcessDefinitionCmd(processDefinitionId));
   }
 

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

@@ -29,7 +29,6 @@ import org.activiti.engine.impl.bpmn.data.IOSpecification;
 import org.activiti.engine.impl.context.Context;
 import org.activiti.engine.impl.db.HasRevision;
 import org.activiti.engine.impl.db.PersistentObject;
-import org.activiti.engine.impl.pvm.ReadOnlyProcessDefinition;
 import org.activiti.engine.impl.task.TaskDefinition;
 import org.activiti.engine.repository.ProcessDefinition;
 import org.activiti.engine.task.IdentityLinkType;
@@ -38,7 +37,7 @@ import org.activiti.engine.task.IdentityLinkType;
  * @author Joram Barrez
  * @author Tijs Rademakers
  */
-public class ProcessDefinitionEntity implements ReadOnlyProcessDefinition, ProcessDefinition, PersistentObject, HasRevision, Serializable {
+public class ProcessDefinitionEntity implements ProcessDefinition, PersistentObject, HasRevision, Serializable {
 
   private static final long serialVersionUID = 1L;
 

modules/activiti-engine/src/main/java/org/activiti/engine/impl/pvm/ReadOnlyProcessDefinition.java

-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.activiti.engine.impl.pvm;
-
-import org.activiti.engine.repository.ProcessDefinition;
-
-
-/**
- * @author Tom Baeyens
- * @author Joram Barrez
- */
-public interface ReadOnlyProcessDefinition extends ProcessDefinition {
-
-  String getId();
-  
-  String getName();
-
-  String getKey();
-
-  String getDescription();
-
-  String getDiagramResourceName();
-}

modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/deployment/BpmnDeploymentTest.java

@@ -26,7 +26,6 @@ import org.activiti.engine.impl.interceptor.Command;
 import org.activiti.engine.impl.interceptor.CommandContext;
 import org.activiti.engine.impl.interceptor.CommandExecutor;
 import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
-import org.activiti.engine.impl.pvm.ReadOnlyProcessDefinition;
 import org.activiti.engine.impl.test.PluggableActivitiTestCase;
 import org.activiti.engine.impl.util.IoUtil;
 import org.activiti.engine.impl.util.ReflectUtil;
@@ -53,7 +52,7 @@ public class BpmnDeploymentTest extends PluggableActivitiTestCase {
     assertNull(processDefinition.getDiagramResourceName());
     assertFalse(processDefinition.hasStartFormKey());
 
-    ReadOnlyProcessDefinition readOnlyProcessDefinition = ((RepositoryServiceImpl) repositoryService).getDeployedProcessDefinition(processDefinition.getId());
+    ProcessDefinition readOnlyProcessDefinition = ((RepositoryServiceImpl) repositoryService).getDeployedProcessDefinition(processDefinition.getId());
     assertNull(readOnlyProcessDefinition.getDiagramResourceName());
 
     // verify content
@@ -203,7 +202,7 @@ public class BpmnDeploymentTest extends PluggableActivitiTestCase {
   @Deployment
   public void testProcessDefinitionDescription() {
     String id = repositoryService.createProcessDefinitionQuery().singleResult().getId();
-    ReadOnlyProcessDefinition processDefinition = ((RepositoryServiceImpl) repositoryService).getDeployedProcessDefinition(id);
+    ProcessDefinition processDefinition = ((RepositoryServiceImpl) repositoryService).getDeployedProcessDefinition(id);
     assertEquals("This is really good process documentation!", processDefinition.getDescription());
   }
 

modules/activiti-engine/src/test/java/org/activiti/engine/test/db/ProcessDefinitionPersistenceTest.java

@@ -20,7 +20,6 @@ import org.activiti.bpmn.model.Process;
 import org.activiti.bpmn.model.SequenceFlow;
 import org.activiti.bpmn.model.StartEvent;
 import org.activiti.engine.impl.RepositoryServiceImpl;
-import org.activiti.engine.impl.pvm.ReadOnlyProcessDefinition;
 import org.activiti.engine.impl.test.PluggableActivitiTestCase;
 import org.activiti.engine.repository.ProcessDefinition;
 
@@ -45,7 +44,7 @@ public class ProcessDefinitionPersistenceTest extends PluggableActivitiTestCase
     String deploymentId = repositoryService.createDeployment().addClasspathResource("org/activiti/engine/test/db/processOne.bpmn20.xml").deploy().getId();
 
     String procDefId = repositoryService.createProcessDefinitionQuery().singleResult().getId();
-    ReadOnlyProcessDefinition processDefinition = ((RepositoryServiceImpl) repositoryService).getDeployedProcessDefinition(procDefId);
+    ProcessDefinition processDefinition = ((RepositoryServiceImpl) repositoryService).getDeployedProcessDefinition(procDefId);
 
     assertEquals(procDefId, processDefinition.getId());
     assertEquals("Process One", processDefinition.getName());