Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scheduler - fix a regression in validation #18058

Merged
merged 1 commit into from
Jun 22, 2021
Merged

Scheduler - fix a regression in validation #18058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 29 additions & 33 deletions ...cheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,33 +331,30 @@ private Throwable validateScheduled(CronParser parser, AnnotationInstance schedu
AnnotationValue everyValue = schedule.value("every");
if (cronValue != null && !cronValue.asString().trim().isEmpty()) {
String cron = cronValue.asString().trim();
if (SchedulerUtils.isConfigValue(cron)) {
// Don't validate config property
return null;
}
try {
parser.parse(cron).validate();
} catch (IllegalArgumentException e) {
return new IllegalStateException("Invalid cron() expression on: " + schedule, e);
}
if (everyValue != null && !everyValue.asString().trim().isEmpty()) {
LOGGER.warnf(
"%s declared on %s#%s() defines both cron() and every() - the cron expression takes precedence",
schedule, method.declaringClass().name(), method.name());
if (!SchedulerUtils.isConfigValue(cron)) {
try {
parser.parse(cron).validate();
} catch (IllegalArgumentException e) {
return new IllegalStateException("Invalid cron() expression on: " + schedule, e);
}
if (everyValue != null && !everyValue.asString().trim().isEmpty()) {
LOGGER.warnf(
"%s declared on %s#%s() defines both cron() and every() - the cron expression takes precedence",
schedule, method.declaringClass().name(), method.name());
}
}
} else {
if (everyValue != null && !everyValue.asString().trim().isEmpty()) {
String every = everyValue.asString().trim();
if (SchedulerUtils.isConfigValue(every)) {
return null;
}
if (Character.isDigit(every.charAt(0))) {
every = "PT" + every;
}
try {
Duration.parse(every);
} catch (Exception e) {
return new IllegalStateException("Invalid every() expression on: " + schedule, e);
if (!SchedulerUtils.isConfigValue(every)) {
if (Character.isDigit(every.charAt(0))) {
every = "PT" + every;
}
try {
Duration.parse(every);
} catch (Exception e) {
return new IllegalStateException("Invalid every() expression on: " + schedule, e);
}
}
} else {
return new IllegalStateException("@Scheduled must declare either cron() or every(): " + schedule);
Expand All @@ -368,16 +365,15 @@ private Throwable validateScheduled(CronParser parser, AnnotationInstance schedu
if (delay == null || delay.asLong() <= 0) {
if (delayedValue != null && !delayedValue.asString().trim().isEmpty()) {
String delayed = delayedValue.asString().trim();
if (SchedulerUtils.isConfigValue(delayed)) {
return null;
}
if (Character.isDigit(delayed.charAt(0))) {
delayed = "PT" + delayed;
}
try {
Duration.parse(delayed);
} catch (Exception e) {
return new IllegalStateException("Invalid delayed() expression on: " + schedule, e);
if (!SchedulerUtils.isConfigValue(delayed)) {
if (Character.isDigit(delayed.charAt(0))) {
delayed = "PT" + delayed;
}
try {
Duration.parse(delayed);
} catch (Exception e) {
return new IllegalStateException("Invalid delayed() expression on: " + schedule, e);
}
}
}
} else {
Expand Down
4 changes: 2 additions & 2 deletions ...uler/deployment/src/test/java/io/quarkus/scheduler/test/InvalidDelayedExpressionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ public class InvalidDelayedExpressionTest {
static final QuarkusUnitTest test = new QuarkusUnitTest()
.setExpectedException(DeploymentException.class)
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
.addClasses(InvalidDelayedExpressionTest.InvalidBean.class));
.addClasses(InvalidBean.class));

@Test
public void test() throws InterruptedException {
}

static class InvalidBean {

@Scheduled(delayed = "for 10 seconds")
@Scheduled(every = "${my.every.expr:off}", delayed = "for 10 seconds")
void wrong() {
}

Expand Down