SPR-7384: switch to using 1-12 for month numbers

org.springframework.context/src/main/java/org/springframework/scheduling/support/CronSequenceGenerator.java

@@ -17,6 +17,7 @@
 package org.springframework.scheduling.support;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.BitSet;
 import java.util.Calendar;
 import java.util.Collections;
@@ -115,12 +116,12 @@ public class CronSequenceGenerator {
 		calendar.add(Calendar.SECOND, 1);
 		calendar.set(Calendar.MILLISECOND, 0);
 
-		doNext(calendar);
+		doNext(calendar, calendar.get(Calendar.YEAR));
 
 		return calendar.getTime();
 	}
 
-	private void doNext(Calendar calendar) {
+	private void doNext(Calendar calendar, int dot) {
 		List<Integer> resets = new ArrayList<Integer>();
 
 		int second = calendar.get(Calendar.SECOND);
@@ -134,42 +135,43 @@ public class CronSequenceGenerator {
 		int updateMinute = findNext(this.minutes, minute, calendar, Calendar.MINUTE, Calendar.HOUR_OF_DAY, resets);
 		if (minute == updateMinute) {
 			resets.add(Calendar.MINUTE);
-		}
+		} else {
-		else {
+			doNext(calendar, dot);
-			doNext(calendar);
 		}
 
 		int hour = calendar.get(Calendar.HOUR_OF_DAY);
 		int updateHour = findNext(this.hours, hour, calendar, Calendar.HOUR_OF_DAY, Calendar.DAY_OF_WEEK, resets);
 		if (hour == updateHour) {
 			resets.add(Calendar.HOUR_OF_DAY);
-		}
+		} else {
-		else {
+			doNext(calendar, dot);
-			doNext(calendar);
 		}
 
 		int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
 		int dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH);
-		int updateDayOfMonth = findNextDay(calendar, this.daysOfMonth, dayOfMonth, daysOfWeek, dayOfWeek, 366, resets);
+		int updateDayOfMonth = findNextDay(calendar, this.daysOfMonth, dayOfMonth, daysOfWeek, dayOfWeek, resets);
 		if (dayOfMonth == updateDayOfMonth) {
 			resets.add(Calendar.DAY_OF_MONTH);
-		}
+		} else {
-		else {
+			doNext(calendar, dot);
-			doNext(calendar);
 		}
 
 		int month = calendar.get(Calendar.MONTH);
 		int updateMonth = findNext(this.months, month, calendar, Calendar.MONTH, Calendar.YEAR, resets);
 		if (month != updateMonth) {
-			doNext(calendar);
+			if (calendar.get(Calendar.YEAR) - dot > 4) {
+				throw new IllegalStateException("Invalid cron expression led to runaway search for next trigger");
+			}
+			doNext(calendar, dot);
 		}
 
 	}
 
 	private int findNextDay(Calendar calendar, BitSet daysOfMonth, int dayOfMonth, BitSet daysOfWeek, int dayOfWeek,
-			int max, List<Integer> resets) {
+			List<Integer> resets) {
 
 		int count = 0;
+		int max = 366;
 		// the DAY_OF_WEEK values in java.util.Calendar start with 1 (Sunday),
 		// but in the cron pattern, they start with 0, so we subtract 1 here
 		while ((!daysOfMonth.get(dayOfMonth) || !daysOfWeek.get(dayOfWeek - 1)) && count++ < max) {
@@ -178,7 +180,7 @@ public class CronSequenceGenerator {
 			dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
 			reset(calendar, resets);
 		}
-		if (count > max) {
+		if (count >= max) {
 			throw new IllegalStateException("Overflow in day for expression=" + this.expression);
 		}
 		return dayOfMonth;
@@ -201,7 +203,7 @@ public class CronSequenceGenerator {
 		// roll over if needed
 		if (nextValue == -1) {
 			calendar.add(nextField, 1);
-			calendar.set(field, 0);
+			reset(calendar, Arrays.asList(field));
 			nextValue = bits.nextSetBit(0);
 		}
 		if (nextValue != value) {
@@ -216,7 +218,7 @@ public class CronSequenceGenerator {
 	 */
 	private void reset(Calendar calendar, List<Integer> fields) {
 		for (int field : fields) {
-			calendar.set(field, 0);
+			calendar.set(field, field == Calendar.DAY_OF_MONTH ? 1 : 0);
 		}
 	}
 
@@ -231,11 +233,11 @@ public class CronSequenceGenerator {
 			throw new IllegalArgumentException(String.format(""
 					+ "cron expression must consist of 6 fields (found %d in %s)", fields.length, expression));
 		}
-		setNumberHits(this.seconds, fields[0], 60);
+		setNumberHits(this.seconds, fields[0], 0, 60);
-		setNumberHits(this.minutes, fields[1], 60);
+		setNumberHits(this.minutes, fields[1], 0, 60);
-		setNumberHits(this.hours, fields[2], 24);
+		setNumberHits(this.hours, fields[2], 0, 24);
-		setDaysOfMonth(this.daysOfMonth, fields[3], 31);
+		setDaysOfMonth(this.daysOfMonth, fields[3]);
-		setNumberHits(this.months, replaceOrdinals(fields[4], "JAN,FEB,MAR,APR,MAY,JUN,JUL,AUG,SEP,OCT,NOV,DEC"), 12);
+		setMonths(this.months, fields[4]);
 		setDays(this.daysOfWeek, replaceOrdinals(fields[5], "SUN,MON,TUE,WED,THU,FRI,SAT"), 8);
 		if (this.daysOfWeek.get(7)) {
 			// Sunday can be represented as 0 or 7
@@ -258,7 +260,8 @@ public class CronSequenceGenerator {
 		return value;
 	}
 
-	private void setDaysOfMonth(BitSet bits, String field, int max) {
+	private void setDaysOfMonth(BitSet bits, String field) {
+		int max = 31;
 		// Days of month start with 1 (in Cron and Calendar) so add one
 		setDays(bits, field, max + 1);
 		// ... and remove it from the front
@@ -269,23 +272,36 @@ public class CronSequenceGenerator {
 		if (field.contains("?")) {
 			field = "*";
 		}
-		setNumberHits(bits, field, max);
+		setNumberHits(bits, field, 0, max);
 	}
 
-	private void setNumberHits(BitSet bits, String value, int max) {
+	private void setMonths(BitSet bits, String value) {
+		int max = 12;
+		value = replaceOrdinals(value, "FOO,JAN,FEB,MAR,APR,MAY,JUN,JUL,AUG,SEP,OCT,NOV,DEC");
+		BitSet months = new BitSet(13);
+		// Months start with 1 in Cron and 0 in Calendar, so push the values first into a longer bit set
+		setNumberHits(months, value, 1, max + 1);
+		// ... and then rotate it to the front of the months
+		for (int i = 1; i <= max; i++) {
+			if (months.get(i)) {
+				bits.set(i - 1);
+			}
+		}
+	}
+
+	private void setNumberHits(BitSet bits, String value, int min, int max) {
 		String[] fields = StringUtils.delimitedListToStringArray(value, ",");
 		for (String field : fields) {
 			if (!field.contains("/")) {
 				// Not an incrementer so it must be a range (possibly empty)
-				int[] range = getRange(field, max);
+				int[] range = getRange(field, min, max);
 				bits.set(range[0], range[1] + 1);
-			}
+			} else {
-			else {
 				String[] split = StringUtils.delimitedListToStringArray(field, "/");
 				if (split.length > 2) {
 					throw new IllegalArgumentException("Incrementer has more than two fields: " + field);
 				}
-				int[] range = getRange(split[0], max);
+				int[] range = getRange(split[0], min, max);
 				if (!split[0].contains("-")) {
 					range[1] = max - 1;
 				}
@@ -297,17 +313,16 @@ public class CronSequenceGenerator {
 		}
 	}
 
-	private int[] getRange(String field, int max) {
+	private int[] getRange(String field, int min, int max) {
 		int[] result = new int[2];
 		if (field.contains("*")) {
-			result[0] = 0;
+			result[0] = min;
 			result[1] = max - 1;
 			return result;
 		}
 		if (!field.contains("-")) {
 			result[0] = result[1] = Integer.valueOf(field);
-		}
+		} else {
-		else {
 			String[] split = StringUtils.delimitedListToStringArray(field, "-");
 			if (split.length > 2) {
 				throw new IllegalArgumentException("Range has more than two fields: " + field);
@@ -318,6 +333,9 @@ public class CronSequenceGenerator {
 		if (result[0] >= max || result[1] >= max) {
 			throw new IllegalArgumentException("Range exceeds maximum (" + max + "): " + field);
 		}
+		if (result[0] < min || result[1] < min) {
+			throw new IllegalArgumentException("Range less than minimum (" + min + "): " + field);
+		}
 		return result;
 	}
 
@@ -327,16 +345,15 @@ public class CronSequenceGenerator {
 			return false;
 		}
 		CronSequenceGenerator cron = (CronSequenceGenerator) obj;
-		return cron.months.equals(this.months) && cron.daysOfMonth.equals(this.daysOfMonth) &&
+		return cron.months.equals(this.months) && cron.daysOfMonth.equals(this.daysOfMonth)
-				cron.daysOfWeek.equals(this.daysOfWeek) && cron.hours.equals(this.hours) &&
+				&& cron.daysOfWeek.equals(this.daysOfWeek) && cron.hours.equals(this.hours)
-				cron.minutes.equals(this.minutes) && cron.seconds.equals(this.seconds);
+				&& cron.minutes.equals(this.minutes) && cron.seconds.equals(this.seconds);
 	}
 
 	@Override
 	public int hashCode() {
-		return 37 + 17 * this.months.hashCode() + 29 * this.daysOfMonth.hashCode() +
+		return 37 + 17 * this.months.hashCode() + 29 * this.daysOfMonth.hashCode() + 37 * this.daysOfWeek.hashCode()
-				37 * this.daysOfWeek.hashCode() + 41 * this.hours.hashCode() +
+				+ 41 * this.hours.hashCode() + 53 * this.minutes.hashCode() + 61 * this.seconds.hashCode();
-				53 * this.minutes.hashCode() + 61 * this.seconds.hashCode();
 	}
 
 	@Override

org.springframework.context/src/test/java/org/springframework/scheduling/support/CronTriggerTests.java

@@ -16,6 +16,8 @@
 
 package org.springframework.scheduling.support;
 
+import static org.junit.Assert.assertEquals;
+
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -23,13 +25,11 @@ import java.util.GregorianCalendar;
 import java.util.List;
 import java.util.TimeZone;
 
-import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
-
 import org.springframework.scheduling.TriggerContext;
 
 /**
@@ -470,13 +470,14 @@ public class CronTriggerTests {
 
 	@Test
 	public void testSpecificDate() throws Exception {
-		CronTrigger trigger = new CronTrigger("* * * 3 10 *", timeZone);
+		CronTrigger trigger = new CronTrigger("* * * 3 11 *", timeZone);
 		calendar.set(Calendar.DAY_OF_MONTH, 2);
-		calendar.set(Calendar.MONTH, 10);
+		calendar.set(Calendar.MONTH, 9);
 		Date date = calendar.getTime();
 		TriggerContext context1 = getTriggerContext(date);
 		calendar.add(Calendar.DAY_OF_MONTH, 1);
 		calendar.set(Calendar.HOUR_OF_DAY, 0);
+		calendar.set(Calendar.MONTH, 10); // 10=November
 		calendar.set(Calendar.MINUTE, 0);
 		calendar.set(Calendar.SECOND, 0);
 		assertEquals(calendar.getTime(), date = trigger.nextExecutionTime(context1));
@@ -485,6 +486,37 @@ public class CronTriggerTests {
 		assertEquals(calendar.getTime(), date = trigger.nextExecutionTime(context2));
 	}
 
+	@Test(expected=IllegalStateException.class)
+	public void testNonExistentSpecificDate() throws Exception {
+		// TODO: maybe try and detect this as a special case in parser?
+		CronTrigger trigger = new CronTrigger("0 0 0 31 6 *", timeZone);
+		calendar.set(Calendar.DAY_OF_MONTH, 10);
+		calendar.set(Calendar.MONTH, 2);
+		Date date = calendar.getTime();
+		TriggerContext context1 = getTriggerContext(date);
+		trigger.nextExecutionTime(context1);
+		// new CronTrigger("0 0 0 30 1 ?", timeZone);
+	}
+
+	@Test
+	public void testLeapYearSpecificDate() throws Exception {
+		CronTrigger trigger = new CronTrigger("0 0 0 29 2 *", timeZone);
+		calendar.set(Calendar.YEAR, 2007);
+		calendar.set(Calendar.DAY_OF_MONTH, 10);
+		calendar.set(Calendar.MONTH, 1); // 2=February
+		Date date = calendar.getTime();
+		TriggerContext context1 = getTriggerContext(date);
+		calendar.set(Calendar.YEAR, 2008);
+		calendar.set(Calendar.DAY_OF_MONTH, 29);
+		calendar.set(Calendar.HOUR_OF_DAY, 0);
+		calendar.set(Calendar.MINUTE, 0);
+		calendar.set(Calendar.SECOND, 0);
+		assertEquals(calendar.getTime(), date = trigger.nextExecutionTime(context1));
+		calendar.add(Calendar.YEAR, 4);
+		TriggerContext context2 = getTriggerContext(date);
+		assertEquals(calendar.getTime(), date = trigger.nextExecutionTime(context2));
+	}
+
 	@Test
 	public void testWeekDaySequence() throws Exception {
 		CronTrigger trigger = new CronTrigger("0 0 7 ? * MON-FRI", timeZone);
@@ -559,14 +591,14 @@ public class CronTriggerTests {
 
 	@Test
 	public void testMonthNames() throws Exception {
-		CronTrigger trigger1 = new CronTrigger("* * * * 0-11 *", timeZone);
+		CronTrigger trigger1 = new CronTrigger("* * * * 1-12 *", timeZone);
 		CronTrigger trigger2 = new CronTrigger("* * * * FEB,JAN,MAR,APR,MAY,JUN,JUL,AUG,SEP,OCT,NOV,DEC *", timeZone);
 		assertEquals(trigger1, trigger2);
 	}
 
 	@Test
 	public void testMonthNamesMixedCase() throws Exception {
-		CronTrigger trigger1 = new CronTrigger("* * * * 1 *", timeZone);
+		CronTrigger trigger1 = new CronTrigger("* * * * 2 *", timeZone);
 		CronTrigger trigger2 = new CronTrigger("* * * * Feb *", timeZone);
 		assertEquals(trigger1, trigger2);
 	}
@@ -613,6 +645,21 @@ public class CronTriggerTests {
 
 	@Test(expected = IllegalArgumentException.class)
 	public void testMonthInvalid() throws Exception {
+		new CronTrigger("0 0 0 25 13 ?", timeZone);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testMonthInvalidTooSmall() throws Exception {
+		new CronTrigger("0 0 0 25 0 ?", timeZone);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testDayOfMonthInvalid() throws Exception {
+		new CronTrigger("0 0 0 32 12 ?", timeZone);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testMonthRangeInvalid() throws Exception {
 		new CronTrigger("* * * * 11-13 *", timeZone);
 	}