From 6beb446925c967aca92f5513adf36c5db77c00d6 Mon Sep 17 00:00:00 2001 From: TATTAVARADA Date: Thu, 27 Apr 2017 07:53:18 -0400 Subject: [PORTAL-7] Rebase This rebasing includes common libraries and common overlays projects abstraction of components Change-Id: Ia1efa4deacdc5701e6205104ac021a6c80ed60ba Signed-off-by: st782s --- .../workflow/scheduler/WorkFlowScheduleJob.java | 45 --------- .../scheduler/WorkFlowScheduleRegistry.java | 107 --------------------- 2 files changed, 152 deletions(-) delete mode 100644 ecomp-sdk/sdk-workflow/src/main/java/org/openecomp/portalsdk/workflow/scheduler/WorkFlowScheduleJob.java delete mode 100644 ecomp-sdk/sdk-workflow/src/main/java/org/openecomp/portalsdk/workflow/scheduler/WorkFlowScheduleRegistry.java (limited to 'ecomp-sdk/sdk-workflow/src/main/java/org/openecomp/portalsdk/workflow/scheduler') diff --git a/ecomp-sdk/sdk-workflow/src/main/java/org/openecomp/portalsdk/workflow/scheduler/WorkFlowScheduleJob.java b/ecomp-sdk/sdk-workflow/src/main/java/org/openecomp/portalsdk/workflow/scheduler/WorkFlowScheduleJob.java deleted file mode 100644 index d90ee05b..00000000 --- a/ecomp-sdk/sdk-workflow/src/main/java/org/openecomp/portalsdk/workflow/scheduler/WorkFlowScheduleJob.java +++ /dev/null @@ -1,45 +0,0 @@ -/*- - * ================================================================================ - * eCOMP Portal SDK - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * 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.openecomp.portalsdk.workflow.scheduler; - -import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; -import org.openecomp.portalsdk.workflow.services.WorkflowScheduleExecutor; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; -import org.springframework.scheduling.quartz.QuartzJobBean; - -public class WorkFlowScheduleJob extends QuartzJobBean{ - - EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(WorkFlowScheduleJob.class); - - - @Override - protected void executeInternal(JobExecutionContext context) - throws JobExecutionException { - - String serverUrl = (String)context.getMergedJobDataMap().get("serverUrl"); - String workflowKey = (String)context.getMergedJobDataMap().get("workflowKey"); - //String arguments = (String)context.getMergedJobDataMap().get("arguments"); - logger.info(EELFLoggerDelegate.debugLogger, ("Executing the job for the workflow " + workflowKey)); - WorkflowScheduleExecutor executor = new WorkflowScheduleExecutor(serverUrl, workflowKey); - executor.execute(); - } - -} diff --git a/ecomp-sdk/sdk-workflow/src/main/java/org/openecomp/portalsdk/workflow/scheduler/WorkFlowScheduleRegistry.java b/ecomp-sdk/sdk-workflow/src/main/java/org/openecomp/portalsdk/workflow/scheduler/WorkFlowScheduleRegistry.java deleted file mode 100644 index bf29f59a..00000000 --- a/ecomp-sdk/sdk-workflow/src/main/java/org/openecomp/portalsdk/workflow/scheduler/WorkFlowScheduleRegistry.java +++ /dev/null @@ -1,107 +0,0 @@ -/*- - * ================================================================================ - * eCOMP Portal SDK - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property - * ================================================================================ - * 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.openecomp.portalsdk.workflow.scheduler; - -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - -import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate; -import org.quartz.impl.triggers.CronTriggerImpl; -import org.springframework.context.annotation.DependsOn; -import org.springframework.scheduling.quartz.CronTriggerFactoryBean; -import org.springframework.scheduling.quartz.JobDetailFactoryBean; -import org.springframework.stereotype.Component; - -@Component -@DependsOn({"systemProperties"}) -public class WorkFlowScheduleRegistry{ - - - EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(WorkFlowScheduleRegistry.class); - - - public WorkFlowScheduleRegistry() { - - } - - private static final String groupName = "AppGroup"; - private static final String jobName = "WorkflowScheduleJob"; - private static final String triggerName = "WorkflowScheduleTrigger"; - - // @Autowired - // private SystemProperties systemProperties; - - // @Bean - public JobDetailFactoryBean jobDetailFactoryBean(Map contextInfoMap) { - - JobDetailFactoryBean jobDetailFactory = new JobDetailFactoryBean(); - jobDetailFactory.setJobClass(WorkFlowScheduleJob.class); - jobDetailFactory.setJobDataAsMap(contextInfoMap); - jobDetailFactory.setGroup(groupName); - jobDetailFactory.setName(jobName + "_" + UUID.randomUUID()); - jobDetailFactory.afterPropertiesSet(); - return jobDetailFactory; - } - - // @Bean - public CronTriggerFactoryBean cronTriggerFactoryBean(JobDetailFactoryBean jobDetailFactory, Long id, - String cronExpression, Date startDateTime, Date enddatetime) throws Exception { - CronTriggerFactoryBean cronTriggerFactory = new CronTriggerFactoryBean(); - cronTriggerFactory.setJobDetail(jobDetailFactory.getObject()); - cronTriggerFactory.setStartDelay(3000); - cronTriggerFactory.setName(triggerName + "_" + id); - cronTriggerFactory.setGroup(groupName); - logger.debug(EELFLoggerDelegate.debugLogger, (triggerName + " Scheduled: " + cronExpression)); - cronTriggerFactory.setCronExpression( cronExpression); //"0 * * * * ? *" - cronTriggerFactory.afterPropertiesSet(); - - final CronTriggerImpl cronTrigger = (CronTriggerImpl) cronTriggerFactory.getObject(); - cronTrigger.setStartTime(startDateTime == null ? Calendar.getInstance().getTime() : startDateTime); - cronTrigger.setEndTime(enddatetime); - Date fireAgainTime = cronTrigger.getFireTimeAfter(cronTrigger.getStartTime()); - if (fireAgainTime == null) - throw new Exception("Cron not added as it may not fire again " + " Expr: " + cronExpression + " End Time: " - + cronTrigger.getEndTime()); - return cronTriggerFactory; - - } - - public CronTriggerFactoryBean setUpTrigger(Long wfId, String serverUrl, String workflowKey, String arguments, - String startdatetimecron, Date startDateTime, Date enddatetime) throws Exception { - - Map contextInfo = new HashMap(); - contextInfo.put("serverUrl", serverUrl); - contextInfo.put("workflowKey", workflowKey); - contextInfo.put("arguments", arguments); - JobDetailFactoryBean jobDetailFactory = jobDetailFactoryBean(contextInfo); - - CronTriggerFactoryBean cronTriggerFactory = cronTriggerFactoryBean(jobDetailFactory, wfId, startdatetimecron, startDateTime, enddatetime); - - logger.debug(EELFLoggerDelegate.debugLogger, (" Job to be Scheduled: " + contextInfo.get("workflowKey"))); - - //cronTriggerFactory. - - return cronTriggerFactory; - } - -} -- cgit 1.2.3-korg