This commit is contained in:
Looly 2021-10-07 23:13:09 +08:00
parent 2f2273c50b
commit 530ce9fab5
2 changed files with 62 additions and 49 deletions

View File

@ -19,6 +19,7 @@
* 【core 】 优化Base64.isBase64方法减少一次多余的判断pr#1860@Github * 【core 】 优化Base64.isBase64方法减少一次多余的判断pr#1860@Github
* 【cache 】 优化FIFOCache未设置过期策略时无需遍历判断过期对象pr#425@Gitee * 【cache 】 优化FIFOCache未设置过期策略时无需遍历判断过期对象pr#425@Gitee
* 【core 】 增加Opt类pr#426@Gitee * 【core 】 增加Opt类pr#426@Gitee
* 【core 】 Week增加of重载支持DayOfWekpr#1872@Github
### 🐞Bug修复 ### 🐞Bug修复
* 【http 】 修复HttpCookie设置cookies的方法不符合RFC6265规范问题pr#418@Gitee * 【http 】 修复HttpCookie设置cookies的方法不符合RFC6265规范问题pr#418@Gitee

View File

@ -7,6 +7,7 @@ import java.util.Calendar;
* 星期枚举<br> * 星期枚举<br>
* 与Calendar中的星期int值对应 * 与Calendar中的星期int值对应
* *
* @author Looly
* @see #SUNDAY * @see #SUNDAY
* @see #MONDAY * @see #MONDAY
* @see #TUESDAY * @see #TUESDAY
@ -14,29 +15,42 @@ import java.util.Calendar;
* @see #THURSDAY * @see #THURSDAY
* @see #FRIDAY * @see #FRIDAY
* @see #SATURDAY * @see #SATURDAY
*
* @author Looly
*
*/ */
public enum Week { public enum Week {
/** 周日 */ /**
* 周日
*/
SUNDAY(Calendar.SUNDAY), SUNDAY(Calendar.SUNDAY),
/** 周一 */ /**
* 周一
*/
MONDAY(Calendar.MONDAY), MONDAY(Calendar.MONDAY),
/** 周二 */ /**
* 周二
*/
TUESDAY(Calendar.TUESDAY), TUESDAY(Calendar.TUESDAY),
/** 周三 */ /**
* 周三
*/
WEDNESDAY(Calendar.WEDNESDAY), WEDNESDAY(Calendar.WEDNESDAY),
/** 周四 */ /**
* 周四
*/
THURSDAY(Calendar.THURSDAY), THURSDAY(Calendar.THURSDAY),
/** 周五 */ /**
* 周五
*/
FRIDAY(Calendar.FRIDAY), FRIDAY(Calendar.FRIDAY),
/** 周六 */ /**
* 周六
*/
SATURDAY(Calendar.SATURDAY); SATURDAY(Calendar.SATURDAY);
// --------------------------------------------------------------- // ---------------------------------------------------------------
/** 星期对应{@link Calendar} 中的Week值 */ /**
* 星期对应{@link Calendar} 中的Week值
*/
private final int value; private final int value;
/** /**
@ -76,28 +90,30 @@ public enum Week {
*/ */
public String toChinese(String weekNamePre) { public String toChinese(String weekNamePre) {
switch (this) { switch (this) {
case SUNDAY: case SUNDAY:
return weekNamePre + ""; return weekNamePre + "";
case MONDAY: case MONDAY:
return weekNamePre + ""; return weekNamePre + "";
case TUESDAY: case TUESDAY:
return weekNamePre + ""; return weekNamePre + "";
case WEDNESDAY: case WEDNESDAY:
return weekNamePre + ""; return weekNamePre + "";
case THURSDAY: case THURSDAY:
return weekNamePre + ""; return weekNamePre + "";
case FRIDAY: case FRIDAY:
return weekNamePre + ""; return weekNamePre + "";
case SATURDAY: case SATURDAY:
return weekNamePre + ""; return weekNamePre + "";
default: default:
return null; return null;
} }
} }
/** /**
* {@link Calendar}星期相关值转换为Week枚举对象<br> * {@link Calendar}星期相关值转换为Week枚举对象<br>
* *
* @param calendarWeekIntValue Calendar中关于Week的int值
* @return Week
* @see #SUNDAY * @see #SUNDAY
* @see #MONDAY * @see #MONDAY
* @see #TUESDAY * @see #TUESDAY
@ -105,34 +121,33 @@ public enum Week {
* @see #THURSDAY * @see #THURSDAY
* @see #FRIDAY * @see #FRIDAY
* @see #SATURDAY * @see #SATURDAY
*
* @param calendarWeekIntValue Calendar中关于Week的int值
* @return {@link Week}
*/ */
public static Week of(int calendarWeekIntValue) { public static Week of(int calendarWeekIntValue) {
switch (calendarWeekIntValue) { switch (calendarWeekIntValue) {
case Calendar.SUNDAY: case Calendar.SUNDAY:
return SUNDAY; return SUNDAY;
case Calendar.MONDAY: case Calendar.MONDAY:
return MONDAY; return MONDAY;
case Calendar.TUESDAY: case Calendar.TUESDAY:
return TUESDAY; return TUESDAY;
case Calendar.WEDNESDAY: case Calendar.WEDNESDAY:
return WEDNESDAY; return WEDNESDAY;
case Calendar.THURSDAY: case Calendar.THURSDAY:
return THURSDAY; return THURSDAY;
case Calendar.FRIDAY: case Calendar.FRIDAY:
return FRIDAY; return FRIDAY;
case Calendar.SATURDAY: case Calendar.SATURDAY:
return SATURDAY; return SATURDAY;
default: default:
return null; return null;
} }
} }
/** /**
* {@link DayOfWeek}星期相关值转换为Week枚举对象<br> * {@link DayOfWeek}星期相关值转换为Week枚举对象<br>
* *
* @param dayOfWeek DayOfWeek星期值
* @return Week
* @see #SUNDAY * @see #SUNDAY
* @see #MONDAY * @see #MONDAY
* @see #TUESDAY * @see #TUESDAY
@ -140,9 +155,6 @@ public enum Week {
* @see #THURSDAY * @see #THURSDAY
* @see #FRIDAY * @see #FRIDAY
* @see #SATURDAY * @see #SATURDAY
*
* @param dayOfWeek DayOfWeek星期值
* @return {@link Week}
* @since 5.7.14 * @since 5.7.14
*/ */
public static Week of(DayOfWeek dayOfWeek) { public static Week of(DayOfWeek dayOfWeek) {