JBPM-7783: Fix null caseRuntimeDataService in CaseKieServerExtension …

…for Springboot
kiegroup · Oct 17, 2018 · d438740 · d438740
1 parent 61c0425
commit d438740
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/...ices-case-mgmt/src/main/java/org/kie/server/services/casemgmt/CaseKieServerExtension.java b/...ices-case-mgmt/src/main/java/org/kie/server/services/casemgmt/CaseKieServerExtension.java
@@ -20,6 +20,7 @@
 import java.util.Map;
 import java.util.ServiceLoader;
 
+import org.jbpm.casemgmt.api.CaseRuntimeDataService;
 import org.jbpm.casemgmt.api.admin.CaseInstanceMigrationService;
 import org.jbpm.casemgmt.api.generator.CaseIdGenerator;
 import org.jbpm.casemgmt.impl.AuthorizationManagerImpl;
@@ -68,6 +69,7 @@ public class CaseKieServerExtension implements KieServerExtension {
     protected CaseManagementRuntimeDataServiceBase caseManagementRuntimeDataService;
     protected CaseAdminServiceBase caseAdminServiceBase;
 
+    protected CaseRuntimeDataService caseRuntimeDataService;
     protected KieContainerCommandService kieContainerCommandService;
 
     @Override
@@ -95,6 +97,7 @@ public void init(KieServerImpl kieServer, KieServerRegistry registry) {
 
         this.services.add(this.caseManagementServiceBase);
         this.services.add(this.caseManagementRuntimeDataService);
+        this.services.add(this.caseRuntimeDataService);
 
         this.kieContainerCommandService = new CaseKieContainerCommandServiceImpl(registry, caseManagementServiceBase, caseManagementRuntimeDataService, caseAdminServiceBase);
 
@@ -133,7 +136,7 @@ protected void configureServices(KieServerImpl kieServer, KieServerRegistry regi
         CaseIdGenerator caseIdGenerator = getCaseIdGenerator();
 
         // build case runtime data service
-        CaseRuntimeDataServiceImpl caseRuntimeDataService = new CaseRuntimeDataServiceImpl();
+        caseRuntimeDataService = new CaseRuntimeDataServiceImpl();
         ((CaseRuntimeDataServiceImpl) caseRuntimeDataService).setCaseIdGenerator(caseIdGenerator);
         ((CaseRuntimeDataServiceImpl) caseRuntimeDataService).setRuntimeDataService(runtimeDataService);
         ((CaseRuntimeDataServiceImpl) caseRuntimeDataService).setCommandService(new TransactionalCommandService(EntityManagerFactoryManager.get().getOrCreate(persistenceUnitName)));
@@ -167,9 +170,6 @@ protected void configureServices(KieServerImpl kieServer, KieServerRegistry regi
         this.caseManagementServiceBase = new CaseManagementServiceBase(caseService, caseRuntimeDataService, registry);
         this.caseManagementRuntimeDataService = new CaseManagementRuntimeDataServiceBase(caseRuntimeDataService, registry);
         this.caseAdminServiceBase = new CaseAdminServiceBase(caseInstanceMigrationService, registry);
-
-        this.services.add(caseRuntimeDataService);
-
     }
 
     protected CaseIdGenerator getCaseIdGenerator() {

diff --git a/...server/springboot/autoconfiguration/jbpm/extensions/SpringBootCaseKieServerExtension.java b/...server/springboot/autoconfiguration/jbpm/extensions/SpringBootCaseKieServerExtension.java
@@ -29,7 +29,6 @@
 public class SpringBootCaseKieServerExtension extends CaseKieServerExtension {
 
     private CaseService caseService;
-    private CaseRuntimeDataService caseRuntimeDataService;
     private CaseInstanceMigrationService caseInstanceMigrationService;
 
     public SpringBootCaseKieServerExtension(CaseService caseService,