Fix underlying problem

ikasanEIP · Feb 20, 2022 · a2af39f · a2af39f
1 parent 2c0ba0a
commit a2af39f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/...hedule/src/main/java/org/ikasan/component/endpoint/quartz/consumer/ScheduledConsumer.java b/...hedule/src/main/java/org/ikasan/component/endpoint/quartz/consumer/ScheduledConsumer.java
@@ -454,10 +454,14 @@ public void scheduleAsEagerTrigger(Trigger oldTrigger, int eagerCallback) throws
     {
         try
         {
+            Date triggerStartTime = new Date(System.currentTimeMillis() + 1000);
+
             TriggerBuilder oldTriggerBuilder = oldTrigger.getTriggerBuilder();
-            Trigger newTrigger = oldTriggerBuilder.usingJobData(EAGER_CALLBACK_COUNT, eagerCallback).
-                    startNow().
-                    withSchedule(simpleSchedule().withMisfireHandlingInstructionFireNow()).build();
+            Trigger newTrigger = oldTriggerBuilder.usingJobData(EAGER_CALLBACK_COUNT, eagerCallback)
+                .startAt(triggerStartTime)
+                .withSchedule(simpleSchedule()
+                    .withMisfireHandlingInstructionFireNow())
+                .build();
 
             Date scheduledDate;
             if(this.scheduler.checkExists(oldTrigger.getKey()))

diff --git a/...est/java/org/ikasan/component/endpoint/quartz/consumer/CallbackScheduledConsumerTest.java b/...est/java/org/ikasan/component/endpoint/quartz/consumer/CallbackScheduledConsumerTest.java
@@ -410,9 +410,9 @@ public void test_execute_when_messageProvider_returns_true_and_not_in_recovery_a
                 exactly(1).of(trigger).getTriggerBuilder();
                 will(returnValue(triggerBuilder));
 
-                exactly(1).of(triggerBuilder).usingJobData("eagerCallbackCount", new Integer(1));
+                exactly(1).of(triggerBuilder).usingJobData("eagerCallbackCount", 1);
                 will(returnValue(triggerBuilder));
-                exactly(1).of(triggerBuilder).startNow();
+                exactly(1).of(triggerBuilder).startAt(with(any(Date.class)));
                 will(returnValue(triggerBuilder));
                 exactly(1).of(triggerBuilder).withSchedule(with(any(ScheduleBuilder.class)));
 
@@ -476,9 +476,9 @@ public void test_execute_when_messageProvider_returns_true_and_not_in_recovery_a
                 exactly(1).of(trigger).getTriggerBuilder();
                 will(returnValue(triggerBuilder));
 
-                exactly(1).of(triggerBuilder).usingJobData("eagerCallbackCount", new Integer(1));
+                exactly(1).of(triggerBuilder).usingJobData("eagerCallbackCount", 1);
                 will(returnValue(triggerBuilder));
-                exactly(1).of(triggerBuilder).startNow();
+                exactly(1).of(triggerBuilder).startAt(with(any(Date.class)));
                 will(returnValue(triggerBuilder));
                 exactly(1).of(triggerBuilder).withSchedule(with(any(ScheduleBuilder.class)));
 

diff --git a/...le/src/test/java/org/ikasan/component/endpoint/quartz/consumer/ScheduledConsumerTest.java b/...le/src/test/java/org/ikasan/component/endpoint/quartz/consumer/ScheduledConsumerTest.java
@@ -530,7 +530,6 @@ public void test_execute_when_messageProvider_message_is_not_null_and_consumer_i
     {
         final FlowEvent mockFlowEvent = mockery.mock( FlowEvent.class);
         final String identifier = "testId";
-        final JobKey jobKey = new JobKey("flowName", "moduleName");
         final JobDetail jobDetail = mockery.mock(JobDetail.class);
         final TriggerKey triggerKey = new TriggerKey("flowName","moduleName");
         final JobDataMap jobDataMap = new JobDataMap();
@@ -566,9 +565,9 @@ public void test_execute_when_messageProvider_message_is_not_null_and_consumer_i
                 exactly(1).of(trigger).getTriggerBuilder();
                 will(returnValue(triggerBuilder));
 
-                exactly(1).of(triggerBuilder).usingJobData("eagerCallbackCount", new Integer(1));
+                exactly(1).of(triggerBuilder).usingJobData("eagerCallbackCount", 1);
                 will(returnValue(triggerBuilder));
-                exactly(1).of(triggerBuilder).startNow();
+                exactly(1).of(triggerBuilder).startAt(with(any(Date.class)));
                 will(returnValue(triggerBuilder));
                 exactly(1).of(triggerBuilder).withSchedule(with(any(ScheduleBuilder.class)));
 
@@ -633,9 +632,9 @@ public void test_execute_when_messageProvider_message_is_not_null_and_consumer_i
                 exactly(1).of(trigger).getTriggerBuilder();
                 will(returnValue(triggerBuilder));
 
-                exactly(1).of(triggerBuilder).usingJobData("eagerCallbackCount", new Integer(1));
+                exactly(1).of(triggerBuilder).usingJobData("eagerCallbackCount", 1);
                 will(returnValue(triggerBuilder));
-                exactly(1).of(triggerBuilder).startNow();
+                exactly(1).of(triggerBuilder).startAt(with(any(Date.class)));
                 will(returnValue(triggerBuilder));
                 exactly(1).of(triggerBuilder).withSchedule(with(any(ScheduleBuilder.class)));
 

diff --git a/ikasaneip/test/src/main/java/org/ikasan/testharness/flow/rule/IkasanFlowTestRule.java b/ikasaneip/test/src/main/java/org/ikasan/testharness/flow/rule/IkasanFlowTestRule.java
@@ -397,11 +397,9 @@ public void fireScheduledConsumer()
         {
             JobDetail jobDetail = ((ScheduledComponent<JobDetail>)consumer).getJobDetail();
             Trigger trigger = newTrigger().withIdentity("name", "group").forJob(jobDetail).build();
-            // adding a sleep in test to give quartz a chance to see a new scheduled time in consumer.scheduleAsEagerTrigger
-            Thread.sleep(1000);
             consumer.scheduleAsEagerTrigger(trigger, 0);
         }
-        catch (SchedulerException | InterruptedException se)
+        catch (SchedulerException se)
         {
             throw new RuntimeException(se);
         }