From d9b957cfcc6e88930210d005f72214c33cfadff0 Mon Sep 17 00:00:00 2001 From: Joze Rozanec Date: Sat, 21 Nov 2020 11:43:55 +0100 Subject: [PATCH] Update Spring definition. --- pom.xml | 7 ++++++ .../definition/CronDefinitionBuilder.java | 3 ++- .../CronParserSpringIntegrationTest.java | 22 +++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 src/test/java/com/cronutils/parser/CronParserSpringIntegrationTest.java diff --git a/pom.xml b/pom.xml index f8972d86..27dd2b57 100644 --- a/pom.xml +++ b/pom.xml @@ -129,6 +129,13 @@ test + + org.springframework + spring-context + 5.3.1 + test + + javax.el javax.el-api diff --git a/src/main/java/com/cronutils/model/definition/CronDefinitionBuilder.java b/src/main/java/com/cronutils/model/definition/CronDefinitionBuilder.java index d5ac5166..18c25e33 100755 --- a/src/main/java/com/cronutils/model/definition/CronDefinitionBuilder.java +++ b/src/main/java/com/cronutils/model/definition/CronDefinitionBuilder.java @@ -326,7 +326,8 @@ private static CronDefinition spring() { .withHours().withValidRange(0, 23).withStrictRange().and() .withDayOfMonth().withValidRange(1, 31).supportsQuestionMark().and() .withMonth().withValidRange(1, 12).and() - .withDayOfWeek().withValidRange(0, 7).withMondayDoWValue(1).withIntMapping(7,0).supportsQuestionMark().and() + .withDayOfWeek().withValidRange(0, 7).withMondayDoWValue(1).withIntMapping(7,0) + .supportsHash().supportsQuestionMark().and() .instance(); } diff --git a/src/test/java/com/cronutils/parser/CronParserSpringIntegrationTest.java b/src/test/java/com/cronutils/parser/CronParserSpringIntegrationTest.java new file mode 100644 index 00000000..73bcf30a --- /dev/null +++ b/src/test/java/com/cronutils/parser/CronParserSpringIntegrationTest.java @@ -0,0 +1,22 @@ +package com.cronutils.parser; + +import com.cronutils.model.CronType; +import com.cronutils.model.definition.CronDefinitionBuilder; +import org.junit.Before; +import org.junit.Test; +import org.springframework.scheduling.support.CronExpression; + +public class CronParserSpringIntegrationTest { + private CronParser parser; + @Before + public void setUp() { + parser = new CronParser(CronDefinitionBuilder.instanceDefinitionFor(CronType.SPRING)); + } + + @Test + public void testSpringCronSupportNthDayOfWeek(){ + CronExpression.parse("0 0 0 ? * WED#2"); + parser.parse("0 0 0 ? * WED#2"); + } + +}