1 files changed, 32 insertions, 26 deletions

diff --git a/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/MSOInfrastructureApplication.java b/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/MSOInfrastructureApplication.java
index c61808ebb1..8168d2a4b8 100644
--- a/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/MSOInfrastructureApplication.java
+++ b/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/MSOInfrastructureApplication.java
@@ -24,14 +24,14 @@ package org.onap.so.bpmn.infrastructure;
 
 import java.util.List;
 import java.util.concurrent.Executor;
-import org.camunda.bpm.application.PostDeploy;
+import javax.annotation.PostConstruct;
 import org.camunda.bpm.application.PreUndeploy;
 import org.camunda.bpm.application.ProcessApplicationInfo;
 import org.camunda.bpm.engine.ProcessEngine;
 import org.camunda.bpm.engine.repository.DeploymentBuilder;
 import org.onap.so.bpmn.common.DefaultToShortClassNameBeanNameGenerator;
 import org.onap.so.db.catalog.beans.Workflow;
-import org.onap.so.db.catalog.data.repository.WorkflowRepository;
+import org.onap.so.db.catalog.client.CatalogDbClient;
 import org.onap.so.logging.jaxrs.filter.MDCTaskDecorator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,13 +39,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.FilterType;
 import org.springframework.context.annotation.Primary;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
@@ -56,17 +54,17 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
 @SpringBootApplication
 @EnableAsync
-@EnableJpaRepositories("org.onap.so.db.catalog.data.repository")
-@EntityScan({"org.onap.so.db.catalog.beans"})
 @ComponentScan(basePackages = {"org.onap"}, nameGenerator = DefaultToShortClassNameBeanNameGenerator.class,
         excludeFilters = {@Filter(type = FilterType.ANNOTATION, classes = SpringBootApplication.class)})
 
 public class MSOInfrastructureApplication {
 
     private static final Logger logger = LoggerFactory.getLogger(MSOInfrastructureApplication.class);
+    @Autowired
+    private ProcessEngine processEngine;
 
     @Autowired
-    private WorkflowRepository workflowRepository;
+    private CatalogDbClient catalogDbClient;
 
     @Value("${mso.async.core-pool-size}")
     private int corePoolSize;
@@ -79,6 +77,7 @@ public class MSOInfrastructureApplication {
 
     private static final String LOGS_DIR = "logs_dir";
     private static final String BPMN_SUFFIX = ".bpmn";
+    private static final String SDC_SOURCE = "sdc";
 
 
     private static void setLogsDir() {
@@ -93,10 +92,14 @@ public class MSOInfrastructureApplication {
         setLogsDir();
     }
 
-    @PostDeploy
-    public void postDeploy(ProcessEngine processEngineInstance) {
-        DeploymentBuilder deploymentBuilder = processEngineInstance.getRepositoryService().createDeployment();
-        deployCustomWorkflows(deploymentBuilder);
+    @PostConstruct
+    public void postConstruct() {
+        try {
+            DeploymentBuilder deploymentBuilder = processEngine.getRepositoryService().createDeployment();
+            deployCustomWorkflows(deploymentBuilder);
+        } catch (Exception e) {
+            logger.warn("Unable to invoke deploymentBuilder: " + e.getMessage());
+        }
     }
 
     @PreUndeploy
@@ -117,23 +120,26 @@ public class MSOInfrastructureApplication {
     }
 
     public void deployCustomWorkflows(DeploymentBuilder deploymentBuilder) {
-        if (workflowRepository == null) {
-            return;
-        }
-        List<Workflow> workflows = workflowRepository.findAll();
-        if (workflows != null && workflows.size() != 0) {
-            for (Workflow workflow : workflows) {
-                String workflowName = workflow.getName();
-                String workflowBody = workflow.getBody();
-                if (!workflowName.endsWith(BPMN_SUFFIX)) {
-                    workflowName += BPMN_SUFFIX;
-                }
-                if (workflowBody != null) {
-                    logger.info("{} {}", "Deploying custom workflow", workflowName);
-                    deploymentBuilder.addString(workflowName, workflowBody);
+        logger.debug("Attempting to deploy custom workflows");
+        try {
+            List<Workflow> workflows = catalogDbClient.findWorkflowBySource(SDC_SOURCE);
+            if (workflows != null && workflows.size() != 0) {
+                for (Workflow workflow : workflows) {
+                    String workflowName = workflow.getName();
+                    String workflowBody = workflow.getBody();
+                    if (!workflowName.endsWith(BPMN_SUFFIX)) {
+                        workflowName += BPMN_SUFFIX;
+                    }
+                    if (workflowBody != null) {
+                        logger.info("{} {}", "Deploying custom workflow", workflowName);
+                        deploymentBuilder.addString(workflowName, workflowBody);
+                    }
                 }
+                deploymentBuilder.enableDuplicateFiltering(true);
+                deploymentBuilder.deploy();
             }
-            deploymentBuilder.deploy();
+        } catch (Exception e) {
+            logger.warn("Unable to deploy custom workflows, " + e.getMessage());
         }
     }
 }