[JBPM-5215] Reuse deployment descriptor classes from common jBPM modu…

…le (#1636) reimport the kie-internal api
kiegroup · Dec 19, 2018 · ce95d7f · ce95d7f
1 parent d34019a
commit ce95d7f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/...rver-services-jbpm/src/main/java/org/kie/server/services/jbpm/JbpmKieServerExtension.java b/...rver-services-jbpm/src/main/java/org/kie/server/services/jbpm/JbpmKieServerExtension.java
@@ -63,7 +63,7 @@
 import org.jbpm.kie.services.impl.bpmn2.BPMN2DataServiceImpl;
 import org.jbpm.kie.services.impl.query.QueryServiceImpl;
 import org.jbpm.runtime.manager.impl.RuntimeManagerFactoryImpl;
-import org.jbpm.runtime.manager.impl.deploy.DeploymentDescriptorManager;
+import org.jbpm.runtime.manager.impl.deploy.DeploymentDescriptorManagerUtil;
 import org.jbpm.runtime.manager.impl.deploy.DeploymentDescriptorMerger;
 import org.jbpm.runtime.manager.impl.identity.UserDataServiceProvider;
 import org.jbpm.runtime.manager.impl.jpa.EntityManagerFactoryManager;
@@ -97,6 +97,7 @@
 import org.kie.internal.runtime.conf.NamedObjectModel;
 import org.kie.internal.runtime.conf.ObjectModel;
 import org.kie.internal.runtime.conf.RuntimeStrategy;
+import org.kie.internal.runtime.manager.deploy.DeploymentDescriptorManager;
 import org.kie.internal.task.api.UserInfo;
 import org.kie.scanner.KieModuleMetaData;
 import org.kie.server.api.KieServerConstants;
@@ -689,7 +690,7 @@ protected void addProcessIdentityProcessListener(final KModuleDeploymentUnit uni
     protected DeploymentDescriptor getDeploymentDescriptor(KModuleDeploymentUnit unit, InternalKieContainer kieContainer) {
         DeploymentDescriptor descriptor = unit.getDeploymentDescriptor();
         if (descriptor == null) {
-            List<DeploymentDescriptor> descriptorHierarchy = deploymentDescriptorManager.getDeploymentDescriptorHierarchy(kieContainer);
+            List<DeploymentDescriptor> descriptorHierarchy = DeploymentDescriptorManagerUtil.getDeploymentDescriptorHierarchy(deploymentDescriptorManager, kieContainer);
             descriptor = merger.merge(descriptorHierarchy, MergeMode.MERGE_COLLECTIONS);
         }
         return descriptor;

diff --git a/...st/java/org/kie/server/integrationtests/jbpm/ContainerFailureRecoveryIntegrationTest.java b/...st/java/org/kie/server/integrationtests/jbpm/ContainerFailureRecoveryIntegrationTest.java
@@ -15,22 +15,19 @@
 
 package org.kie.server.integrationtests.jbpm;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-
 import java.io.IOException;
 import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jbpm.runtime.manager.impl.deploy.DeploymentDescriptorImpl;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.kie.internal.runtime.conf.DeploymentDescriptor;
 import org.kie.internal.runtime.conf.ObjectModel;
+import org.kie.internal.runtime.manager.deploy.DeploymentDescriptorImpl;
 import org.kie.server.api.model.KieContainerResource;
 import org.kie.server.api.model.Message;
 import org.kie.server.api.model.ReleaseId;
@@ -39,6 +36,9 @@
 import org.kie.server.integrationtests.shared.KieServerAssert;
 import org.kie.server.integrationtests.shared.KieServerDeployer;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
+
 public class ContainerFailureRecoveryIntegrationTest extends JbpmKieServerBaseIntegrationTest {
 
     private static final ReleaseId releaseId = new ReleaseId("org.kie.server.testing", "definition-project",

diff --git a/...g/src/test/java/org/kie/spring/jbpm/KieSpringProcessInstanceMigrationServiceImplTest.java b/...g/src/test/java/org/kie/spring/jbpm/KieSpringProcessInstanceMigrationServiceImplTest.java
@@ -17,10 +17,10 @@
 
 import java.util.Arrays;
 import java.util.Collection;
+
 import javax.persistence.EntityManagerFactory;
 
 import org.drools.persistence.api.TransactionManagerFactory;
-import org.jbpm.runtime.manager.impl.deploy.DeploymentDescriptorImpl;
 import org.jbpm.runtime.manager.impl.jpa.EntityManagerFactoryManager;
 import org.jbpm.runtime.manager.impl.migration.MigrationException;
 import org.jbpm.runtime.manager.impl.migration.MigrationManager;
@@ -35,8 +35,11 @@
 import org.kie.api.runtime.process.ProcessInstance;
 import org.kie.internal.runtime.manager.InternalRuntimeManager;
 import org.kie.internal.runtime.manager.context.ProcessInstanceIdContext;
+import org.kie.internal.runtime.manager.deploy.DeploymentDescriptorImpl;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 @RunWith(Parameterized.class)
 public class KieSpringProcessInstanceMigrationServiceImplTest extends AbstractJbpmSpringParameterizedTest {