Merge pull request #454 from IndeedSi/428-enforce-valid-range-in-execution-time

#428 Pass valid range constraints from cron definition to execution time

Author: jmrozanec

src/main/java/com/cronutils/model/time/SingleExecutionTime.java

@@ -85,14 +85,17 @@ public class SingleExecutionTime implements ExecutionTime {
             final CronField daysOfMonthCronField, final CronField daysOfYearCronField, final TimeNode months, final TimeNode hours,
             final TimeNode minutes, final TimeNode seconds) {
         this.cronDefinition = Preconditions.checkNotNull(cronDefinition);
-        FieldValueGenerator alwaysGenerator = FieldValueGeneratorFactory.forCronField(new CronField(CronFieldName.YEAR, Always.always(), FieldConstraintsBuilder.instance().createConstraintsInstance()));
         if(cronDefinition.containsFieldDefinition(CronFieldName.YEAR)){
             if(!cronDefinition.getFieldDefinition(CronFieldName.YEAR).isOptional()){
                 Preconditions.checkNotNull(yearsValueCronField);
             }
-            this.yearsValueGenerator = yearsValueCronField==null?alwaysGenerator:createYearValueGeneratorInstance(yearsValueCronField);
-        } else{
-            this.yearsValueGenerator = alwaysGenerator;
+            this.yearsValueGenerator = (yearsValueCronField == null)
+                    ? FieldValueGeneratorFactory.forCronField(new CronField(CronFieldName.YEAR, Always.always(),
+                    cronDefinition.getFieldDefinition(CronFieldName.YEAR).getConstraints()))
+                    : createYearValueGeneratorInstance(yearsValueCronField);
+        } else {
+            this.yearsValueGenerator = FieldValueGeneratorFactory.forCronField(new CronField(CronFieldName.YEAR, Always.always(),
+                    FieldConstraintsBuilder.instance().createConstraintsInstance()));
         }
         this.daysOfWeekCronField = Preconditions.checkNotNull(daysOfWeekCronField);
         this.daysOfMonthCronField = Preconditions.checkNotNull(daysOfMonthCronField);

src/test/java/com/cronutils/model/time/ExecutionTimeQuartzIntegrationTest.java

@@ -30,6 +30,9 @@
 import java.util.Optional;
 import java.util.TimeZone;
 
+import com.cronutils.model.CronType;
+import com.cronutils.model.definition.CronDefinition;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -904,6 +907,26 @@ public void testLastExecutionIssue424() {
         }
     }
 
+    /**
+     * Issue #428
+     * Enforce year constraints from Quartz cron definition
+     */
+    @Test
+    public void testBoundary() {
+        ExecutionTime execution = ExecutionTime.forCron(parser.parse("0 0 12 * * ?"));
+        // Before 1970
+        ZonedDateTime dateTimeBefore1970 = ZonedDateTime.of(1900, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC);
+        Optional<ZonedDateTime> next = execution.nextExecution(dateTimeBefore1970);
+        assertTrue(next.isPresent());
+        Assert.assertEquals(ZonedDateTime.of(1970, 1, 1, 12, 0, 0, 0, ZoneOffset.UTC), next.get());
+
+        // After 2099
+        ZonedDateTime dateTimeAfter2099 = ZonedDateTime.of(2150, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC);
+        Optional<ZonedDateTime> last = execution.lastExecution(dateTimeAfter2099);
+        assertTrue(last.isPresent());
+        Assert.assertEquals(ZonedDateTime.of(2099, 12, 31, 12, 0, 0, 0, ZoneOffset.UTC), last.get());
+    }
+
     private Duration getMinimumInterval(final String quartzPattern) {
         final ExecutionTime executionTime = ExecutionTime.forCron(parser.parse(quartzPattern));
         final ZonedDateTime coolDay = ZonedDateTime.of(2016, 1, 1, 0, 0, 0, 0, UTC);