[BISERVER-14992] not showing the repeats with every day and setting t…

…he value to 0 in edit mode
pentaho · Nov 20, 2023 · 5175c8d · 5175c8d
1 parent a8af0e9
commit 5175c8d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/scheduler/src/main/java/org/pentaho/platform/scheduler2/quartz/QuartzScheduler.java b/scheduler/src/main/java/org/pentaho/platform/scheduler2/quartz/QuartzScheduler.java
@@ -816,6 +816,10 @@ private static List<ITimeRecurrence> parseRecurrence( String cronExpression, int
     String[] tokens = cronExpression.split( delims );
     if ( tokens.length > tokenIndex ) {
       String timeTokens = tokens[tokenIndex];
+      //Adding this block in case if it's for every 1 day case, where it's considering the token as * instead of */1
+      if( tokenIndex == 3 && timeTokens.equals( "*" ) ) {
+        timeTokens = timeTokens + "/1";
+      }
       tokens = timeTokens.split( "," ); //$NON-NLS-1$
       if ( ( tokens.length > 1 ) || !( tokens[0].equals( "*" ) || tokens[0].equals( "?" ) ) ) { //$NON-NLS-1$ //$NON-NLS-2$
         RecurrenceList timeList = null;

diff --git a/scheduler/src/test/java/org/pentaho/platform/scheduler2/quartz/test/ComplexTriggerTest.java b/scheduler/src/test/java/org/pentaho/platform/scheduler2/quartz/test/ComplexTriggerTest.java
@@ -126,7 +126,7 @@ public void timeSliceTest() {
     trigger = QuartzScheduler.createComplexTrigger( "* * * * * ? *" );
     Assert.assertEquals( trigger.getYearlyRecurrences().size(), 0 );
     Assert.assertEquals( trigger.getMonthlyRecurrences().size(), 0 );
-    Assert.assertEquals( trigger.getDayOfMonthRecurrences().size(), 0 );
+    Assert.assertEquals( trigger.getDayOfMonthRecurrences().size(), 1 );
     Assert.assertEquals( trigger.getDayOfWeekRecurrences().size(), 0 );
     Assert.assertEquals( trigger.getHourlyRecurrences().size(), 0 );
     Assert.assertEquals( trigger.getMinuteRecurrences().size(), 0 );