Merge pull request #1 from scriptom/f/java17

ARPBE-63: Facilitate cron trigger creation for subscriptions

src/main/java/com/client/config/ScheduledEventConfig.java

@@ -3,23 +3,26 @@
 import com.bullhornsdk.data.api.BullhornData;
 import com.client.ApplicationSettings;
 import com.client.core.scheduledtasks.ScheduledEventProcessing;
+import com.client.core.scheduledtasks.config.CustomSubscriptionSettings;
 import com.client.core.scheduledtasks.service.EventWorkflowFactory;
 import org.quartz.CronTrigger;
+import org.quartz.impl.triggers.CronTriggerImpl;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.quartz.CronTriggerFactoryBean;
 import org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean;
 import org.springframework.scheduling.quartz.SchedulerFactoryBean;
 
 import java.text.ParseException;
-import java.util.List;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
-/**
- * Configuration for creating scheduled event tasks.
- *
- * TODO: Maybe make scheduled tasks in multiple different folders
- */
+// TODO: Maybe make scheduled tasks in multiple different folders
 @Configuration
 public class ScheduledEventConfig {
 
@@ -29,21 +32,28 @@ public class ScheduledEventConfig {
 
     private final EventWorkflowFactory eventWorkflowFactory;
 
+    private final CustomSubscriptionSettings customSubscriptionSettings;
+
     ScheduledEventConfig(BullhornData bullhornData,
                          ApplicationSettings appSettings,
-                         EventWorkflowFactory eventWorkflowFactory) {
+                         EventWorkflowFactory eventWorkflowFactory,
+                         CustomSubscriptionSettings customSubscriptionSettings) {
         this.bullhornData = bullhornData;
         this.appSettings = appSettings;
         this.eventWorkflowFactory = eventWorkflowFactory;
+        this.customSubscriptionSettings = customSubscriptionSettings;
     }
 
     @Bean
-    SchedulerFactoryBean mainScheduler(List<CronTrigger> triggers) {
+    SchedulerFactoryBean mainScheduler(CronTrigger standardCronTriggerBean) {
         SchedulerFactoryBean mainScheduler = new SchedulerFactoryBean();
         mainScheduler.setOverwriteExistingJobs(true);
         mainScheduler.setAutoStartup(true);
 
-        mainScheduler.setTriggers(triggers.toArray(new CronTrigger[triggers.size()]));
+        CronTrigger[] customCronTriggers = getCustomCronTriggers();
+        CronTrigger[] cronTriggers = Arrays.copyOf(customCronTriggers, customCronTriggers.length + 1);
+        cronTriggers[customCronTriggers.length] = standardCronTriggerBean;
+        mainScheduler.setTriggers(cronTriggers);
 
         return mainScheduler;
     }
@@ -65,8 +75,6 @@ public CronTrigger standardCronTriggerBean(
     public MethodInvokingJobDetailFactoryBean standardFactoryBean() {
         MethodInvokingJobDetailFactoryBean factoryBean = new MethodInvokingJobDetailFactoryBean();
 
-        // this.applicationContext.getBean() TODO: Idea with easily creating scheduled task beans
-
         factoryBean.setTargetBeanName("standardSubscriptionScheduledEventProcessing");
         factoryBean.setTargetMethod("run");
         factoryBean.setConcurrent(true);
@@ -78,4 +86,34 @@ public MethodInvokingJobDetailFactoryBean standardFactoryBean() {
     ScheduledEventProcessing standardSubscriptionScheduledEventProcessing(@Value("${standardSubscriptionName}") String subName) {
         return new ScheduledEventProcessing(subName, bullhornData, appSettings, eventWorkflowFactory);
     }
+
+    private CronTrigger[] getCustomCronTriggers() {
+        Map<String, String> customSubscriptions = customSubscriptionSettings.customSubscriptions();
+        return customSubscriptions.entrySet().stream().map((subscription) -> {
+            String subscriptionName = subscription.getKey();
+            String cronExpression = subscription.getValue();
+            ScheduledEventProcessing eventProcessing = new ScheduledEventProcessing(subscriptionName, bullhornData, appSettings, eventWorkflowFactory);
+            MethodInvokingJobDetailFactoryBean factoryBean = new MethodInvokingJobDetailFactoryBean();
+
+            factoryBean.setTargetObject(eventProcessing);
+            factoryBean.setTargetMethod("run");
+            factoryBean.setConcurrent(true);
+            try {
+                factoryBean.afterPropertiesSet();
+            } catch (ClassNotFoundException | NoSuchMethodException e) {
+                throw new RuntimeException("Could not create Job for subscription " + subscriptionName, e);
+            }
+
+            CronTriggerFactoryBean cronTriggerFactoryBean = new CronTriggerFactoryBean();
+            cronTriggerFactoryBean.setCronExpression(cronExpression);
+            cronTriggerFactoryBean.setJobDetail(Objects.requireNonNull(factoryBean.getObject(), "JobDetail was null for subscription " + subscriptionName));
+            try {
+                cronTriggerFactoryBean.afterPropertiesSet();
+            } catch (ParseException e) {
+                throw new RuntimeException("Could not parse cron expression " + cronExpression + " (subscriptionName=" + subscriptionName + ")", e);
+            }
+
+            return cronTriggerFactoryBean.getObject();
+        }).collect(Collectors.toSet()).toArray(new CronTrigger[customSubscriptions.size()]);
+    }
 }

src/main/java/com/client/core/scheduledtasks/config/CustomSubscriptionSettings.java

@@ -0,0 +1,15 @@
+package com.client.core.scheduledtasks.config;
+
+import com.google.common.collect.Maps;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import java.util.Map;
+
+@ConfigurationProperties(prefix = "scheduledtasks")
+public record CustomSubscriptionSettings(Map<String, String> customSubscriptions) {
+    public CustomSubscriptionSettings {
+        if (customSubscriptions == null) {
+            customSubscriptions = Maps.newHashMap();
+        }
+    }
+}

src/main/resources/application.properties

@@ -61,3 +61,7 @@ orca.password=
 
 rest.prefix.core=/main/resttrigger
 rest.prefix.custom=/custom/resttrigger
+
+# Example custom subscriptions
+#scheduledtasks.customSubscriptions.myCustomSubscription=0 */5 * * * ?
+#scheduledtasks.customSubscriptions.mySecondCustomSubs=0 */10 * * * ?