Revert "Fix 4006"

looly · web-flow · commit 5dfbdbbd6cfd · 2025-08-20T17:48:47.000+08:00
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/BoolArrayMatcher.java b/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/BoolArrayMatcher.java
@@ -18,10 +18,6 @@ public class BoolArrayMatcher implements PartMatcher {
 	 * 用户定义此字段的最小值
 	 */
 	private final int minValue;
-	/**
-	 * 用户定义此字段的最大值
-	 */
-	private final int maxValue;
 	private final boolean[] bValues;
 
 	/**
@@ -33,15 +29,13 @@ public BoolArrayMatcher(List<Integer> intValueList) {
 		Assert.isTrue(CollUtil.isNotEmpty(intValueList), "Values must be not empty!");
 		bValues = new boolean[Collections.max(intValueList) + 1];
 		int min = Integer.MAX_VALUE;
-		int max = Integer.MIN_VALUE;
 		for (Integer value : intValueList) {
 			min = Math.min(min, value);
-			max = Math.max(max, value);
 			bValues[value] = true;
 		}
 		this.minValue = min;
-		this.maxValue = max;
 	}
+
 	@Override
 	public boolean match(Integer value) {
 		if (null == value || value >= bValues.length) {
@@ -75,14 +69,6 @@ public int nextAfter(int value) {
 	public int getMinValue() {
 		return this.minValue;
 	}
-	/**
-	 * 获取表达式定义的最大值
-	 *
-	 * @return 最大值
-	 */
-	public int getMaxValue() {
-		return this.maxValue;
-	}
 
 	@Override
 	public String toString() {
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/DayOfMonthMatcher.java b/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/DayOfMonthMatcher.java
@@ -50,19 +50,8 @@ private static boolean isLastDayOfMonth(int value, int month, boolean isLeapYear
 		return value == Month.getLastDay(month - 1, isLeapYear);
 	}
 
-	@Deprecated
 	public boolean isLast() {
 		return match(31);
 	}
 
-	/**
-	 * 检查value是否大于等于这个月的最大天
-	 * @param value 被检查的值
-	 * @return
-	 */
-	public boolean isLastDay(int value) {
-		if(value>=getMaxValue()) return  true;
-		return  false;
-	}
-
 }
diff --git a/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/PatternMatcher.java b/hutool-cron/src/main/java/cn/hutool/cron/pattern/matcher/PatternMatcher.java
@@ -192,7 +192,7 @@ private int[] nextMatchValuesAfter(int[] values) {
 			// pr#1189
 			if (i == Part.DAY_OF_MONTH.ordinal()
 				&& matchers[i] instanceof DayOfMonthMatcher
-				&& ((DayOfMonthMatcher) matchers[i]).isLastDay(values[i])) {
+				&& ((DayOfMonthMatcher) matchers[i]).isLast()) {
 				int newMonth = newValues[Part.MONTH.ordinal()];
 				int newYear = newValues[Part.YEAR.ordinal()];
 				nextValue = getLastDay(newMonth, newYear);
@@ -226,7 +226,7 @@ private int[] nextMatchValuesAfter(int[] values) {
 					continue;
 				} else if (i == Part.DAY_OF_MONTH.ordinal()
 					&& matchers[i] instanceof DayOfMonthMatcher
-					&& ((DayOfMonthMatcher) matchers[i]).isLastDay(values[i])) {
+					&& ((DayOfMonthMatcher) matchers[i]).isLast()) {
 					int newMonth = newValues[Part.MONTH.ordinal()];
 					int newYear = newValues[Part.YEAR.ordinal()];
 					nextValue = getLastDay(newMonth, newYear);
@@ -259,7 +259,7 @@ private void setToMin(int[] values, int toPart) {
 			part = Part.of(i);
 			if (part == Part.DAY_OF_MONTH
 				&& get(part) instanceof DayOfMonthMatcher
-				&& ((DayOfMonthMatcher) get(part)).isLastDay(values[i])) {
+				&& ((DayOfMonthMatcher) get(part)).isLast()) {
 				int newMonth = values[Part.MONTH.ordinal()];
 				int newYear = values[Part.YEAR.ordinal()];
 				values[i] = getLastDay(newMonth, newYear);
diff --git a/hutool-cron/src/test/java/cn/hutool/cron/pattern/Issue4006Test.java b/hutool-cron/src/test/java/cn/hutool/cron/pattern/Issue4006Test.java

Original file line number	Diff line number	Diff line change
`@@ -50,19 +50,8 @@ private static boolean isLastDayOfMonth(int value, int month, boolean isLeapYear`
`50`	`50`	`return value == Month.getLastDay(month - 1, isLeapYear);`
`51`	`51`	`}`
`52`	`52`
`53`		`- @Deprecated`
`54`	`53`	`public boolean isLast() {`
`55`	`54`	`return match(31);`
`56`	`55`	`}`
`57`	`56`
`58`		`- /**`
`59`		`- * 检查value是否大于等于这个月的最大天`
`60`		`- * @param value 被检查的值`
`61`		`- * @return`
`62`		`- */`
`63`		`- public boolean isLastDay(int value) {`
`64`		`- if(value>=getMaxValue()) return true;`
`65`		`- return false;`
`66`		`- }`
`67`		`-`
`68`	`57`	`}`