Skip to content

Commit fa37b5b

Browse files
committed
rename NEW to WAITING
1 parent 0e9183d commit fa37b5b

File tree

9 files changed

+12
-12
lines changed

9 files changed

+12
-12
lines changed

core/src/main/java/org/sterl/spring/persistent_tasks/api/Trigger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class Trigger {
3232
/** priority, the higher a more priority it will get */
3333
private int priority = 4;
3434

35-
private TriggerStatus status = TriggerStatus.NEW;
35+
private TriggerStatus status = TriggerStatus.WAITING;
3636

3737
private Long runningDurationInMs;
3838

core/src/main/java/org/sterl/spring/persistent_tasks/shared/model/TriggerData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void updateRunningDuration() {
7474
@Enumerated(EnumType.STRING)
7575
@Column(length = 20, nullable = false)
7676
@Default
77-
private TriggerStatus status = TriggerStatus.NEW;
77+
private TriggerStatus status = TriggerStatus.WAITING;
7878

7979
private Long runningDurationInMs;
8080

core/src/main/java/org/sterl/spring/persistent_tasks/shared/model/TriggerStatus.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
import java.util.Set;
55

66
public enum TriggerStatus {
7-
NEW,
7+
WAITING,
88
RUNNING,
99
SUCCESS,
1010
FAILED,
1111
CANCELED
1212
;
13-
public static final Set<TriggerStatus> ACTIVE_STATES = EnumSet.of(NEW, RUNNING);
13+
public static final Set<TriggerStatus> ACTIVE_STATES = EnumSet.of(WAITING, RUNNING);
1414
public static final Set<TriggerStatus> END_STATES = EnumSet.of(SUCCESS, FAILED, CANCELED);
1515
}

core/src/main/java/org/sterl/spring/persistent_tasks/trigger/TriggerService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public List<TriggerEntity> rescheduleAbandonedTasks(OffsetDateTime timeout) {
157157
timeout);
158158
result.forEach(t -> {
159159
t.setRunningOn(null);
160-
t.getData().setStatus(TriggerStatus.NEW);
160+
t.getData().setStatus(TriggerStatus.WAITING);
161161
t.getData().setExceptionName("Abandoned tasks");
162162
});
163163
log.debug("rescheduled {} triggers", result.size());

core/src/main/java/org/sterl/spring/persistent_tasks/trigger/component/LockNextTriggerComponent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class LockNextTriggerComponent {
2525

2626
public List<TriggerEntity> loadNext(String runningOn, int count, OffsetDateTime timeDueAt) {
2727
final var tasks = triggerRepository.loadNextTasks(
28-
timeDueAt, TriggerStatus.NEW, PageRequest.of(0, count));
28+
timeDueAt, TriggerStatus.WAITING, PageRequest.of(0, count));
2929

3030
tasks.forEach(t -> t.runOn(runningOn));
3131

core/src/main/java/org/sterl/spring/persistent_tasks/trigger/model/TriggerEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public TriggerEntity complete(Exception e) {
9999
}
100100

101101
public TriggerEntity runAt(OffsetDateTime runAt) {
102-
data.setStatus(TriggerStatus.NEW);
102+
data.setStatus(TriggerStatus.WAITING);
103103
data.setRunAt(runAt);
104104
return this;
105105
}

core/src/test/java/org/sterl/spring/persistent_tasks/scheduler/SchedulerServiceTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void testWillTriggerOnlyFreeThreadSize() throws Exception {
5555
// THEN
5656
Thread.sleep(15);
5757
assertThat(triggerService.countTriggers(TriggerStatus.RUNNING)).isEqualTo(10);
58-
assertThat(triggerService.countTriggers(TriggerStatus.NEW)).isEqualTo(5);
58+
assertThat(triggerService.countTriggers(TriggerStatus.WAITING)).isEqualTo(5);
5959
// AND
6060
final SchedulerEntity scheduler = subject.getScheduler();
6161
assertThat(scheduler.getRunnungTasks()).isEqualTo(10);
@@ -99,7 +99,7 @@ void testQueuedInFuture() {
9999

100100
// THEN
101101
asserts.assertMissing(Task3.NAME + "::Hallo");
102-
assertThat(triggerService.countTriggers(TriggerStatus.NEW)).isOne();
102+
assertThat(triggerService.countTriggers(TriggerStatus.WAITING)).isOne();
103103
}
104104

105105
@Test

core/src/test/java/org/sterl/spring/persistent_tasks/scheduler/TaskFailoverTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ void rescheduleAbandonedTasksTest() throws Exception {
5858
// AND
5959
assertThat(triggerService.countTriggers(TriggerStatus.RUNNING))
6060
.isEqualTo(1);
61-
assertThat(triggerService.countTriggers(TriggerStatus.NEW))
61+
assertThat(triggerService.countTriggers(TriggerStatus.WAITING))
6262
.isEqualTo(1);
6363
}
6464
}

core/src/test/java/org/sterl/spring/persistent_tasks/trigger/TriggerServiceTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ void testQueuedInFuture() {
288288

289289
// THEN
290290
asserts.assertMissing(Task3.NAME + "::Hallo");
291-
assertThat(triggerService.countTriggers(TriggerStatus.NEW)).isOne();
291+
assertThat(triggerService.countTriggers(TriggerStatus.WAITING)).isOne();
292292
}
293293

294294
@Test
@@ -306,7 +306,7 @@ void testUpdateRunAt() {
306306
// THEN
307307
runTriggersAndWait();
308308
asserts.assertValue(Task3.NAME + "::Hallo");
309-
assertThat(triggerService.countTriggers(TriggerStatus.NEW)).isZero();
309+
assertThat(triggerService.countTriggers(TriggerStatus.WAITING)).isZero();
310310
}
311311

312312
@Test

0 commit comments

Comments
 (0)