diff options
author | waqas.ikram <waqas.ikram@est.tech> | 2021-12-10 10:20:19 +0000 |
---|---|---|
committer | waqas.ikram <waqas.ikram@est.tech> | 2021-12-10 10:20:32 +0000 |
commit | 53688429bc4fd48f2965d4004925cee258e4efb3 (patch) | |
tree | 6d11b522505295ae81102050ce8714e5d6ef0b31 /bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/MSOInfrastructureApplication.java | |
parent | 88e933d5441c48daaf354e935803b51aaaf5700d (diff) |
Fix for livenessProbe failing OOMCustom_Workflow
Change-Id: I9c5bbaaff6c141f88e55f6bb727e3f1b9d5eca39
Issue-ID: SO-3674
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>
Diffstat (limited to 'bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/MSOInfrastructureApplication.java')
-rw-r--r-- | bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/MSOInfrastructureApplication.java | 40 |
1 files changed, 17 insertions, 23 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 6900f3099d..c0214a976a 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 @@ -25,8 +25,6 @@ package org.onap.so.bpmn.infrastructure; import java.util.List; import java.util.concurrent.Executor; 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.logging.filter.spring.MDCTaskDecorator; @@ -34,6 +32,7 @@ import org.onap.so.bpmn.common.DefaultToShortClassNameBeanNameGenerator; import org.onap.so.db.catalog.beans.Workflow; import org.onap.so.db.catalog.client.CatalogDbClient; import org.onap.so.logger.LoggingAnchor; +import org.onap.so.security.SoBasicHttpSecurityConfigurer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -52,12 +51,6 @@ import org.springframework.context.annotation.Primary; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; -import javax.annotation.PostConstruct; -import java.util.List; -import java.util.concurrent.Executor; - -import static java.util.Collections.singletonMap; -import static org.springframework.boot.context.config.ConfigFileApplicationListener.*; /** * @since Version 1.0 * @@ -66,17 +59,18 @@ import static org.springframework.boot.context.config.ConfigFileApplicationListe @SpringBootApplication @EnableAsync @ComponentScan(basePackages = {"org.onap"}, nameGenerator = DefaultToShortClassNameBeanNameGenerator.class, - excludeFilters = {@Filter(type = FilterType.ANNOTATION, classes = SpringBootApplication.class)}) -@EnableAutoConfiguration(exclude= FreeMarkerAutoConfiguration.class) + excludeFilters = {@Filter(type = FilterType.ANNOTATION, classes = SpringBootApplication.class), + @Filter(type = FilterType.ASSIGNABLE_TYPE, value = SoBasicHttpSecurityConfigurer.class)}) +@EnableAutoConfiguration(exclude = FreeMarkerAutoConfiguration.class) public class MSOInfrastructureApplication extends SpringBootServletInitializer { private static final Logger logger = LoggerFactory.getLogger(MSOInfrastructureApplication.class); - + @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application - .sources(MSOInfrastructureApplication.class); + return application.sources(MSOInfrastructureApplication.class); } + @Autowired private ProcessEngine processEngine; @@ -118,17 +112,17 @@ public class MSOInfrastructureApplication extends SpringBootServletInitializer { @PostConstruct public void postConstruct() { DeploymentBuilder deploymentBuilder = processEngine.getRepositoryService().createDeployment(); -// try { -// DeploymentBuilder deploymentBuilder = processEngine.getRepositoryService().createDeployment(); -// deployCustomWorkflows(deploymentBuilder); -// } catch (Exception e) { -// logger.warn("Unable to invoke deploymentBuilder: " + e.getMessage()); -// } + // try { + // DeploymentBuilder deploymentBuilder = processEngine.getRepositoryService().createDeployment(); + // deployCustomWorkflows(deploymentBuilder); + // } catch (Exception e) { + // logger.warn("Unable to invoke deploymentBuilder: " + e.getMessage()); + // } } -// @PreUndeploy -// public void cleanup(ProcessEngine processEngine, ProcessApplicationInfo processApplicationInfo, -// List<ProcessEngine> processEngines) {} + // @PreUndeploy + // public void cleanup(ProcessEngine processEngine, ProcessApplicationInfo processApplicationInfo, + // List<ProcessEngine> processEngines) {} @Bean @Primary @@ -147,7 +141,7 @@ public class MSOInfrastructureApplication extends SpringBootServletInitializer { logger.info("Attempting to deploy custom workflows"); try { List<Workflow> workflows = catalogDbClient.findWorkflowBySource(SDC_SOURCE); - logger.info("SDC workflows: {}", workflows ); + logger.info("SDC workflows: {}", workflows); if (workflows != null && !workflows.isEmpty()) { for (Workflow workflow : workflows) { String workflowName = workflow.getName(); |