Skip to content

Commit a2551c1

Browse files
committed
better doc
1 parent 88551cd commit a2551c1

File tree

3 files changed

+20
-3
lines changed

3 files changed

+20
-3
lines changed

core/src/main/java/org/sterl/spring/persistent_tasks/history/HistoryService.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.springframework.data.domain.Pageable;
1010
import org.springframework.data.domain.Sort;
1111
import org.springframework.data.domain.Sort.Direction;
12+
import org.springframework.lang.Nullable;
1213
import org.sterl.spring.persistent_tasks.api.TriggerKey;
1314
import org.sterl.spring.persistent_tasks.history.model.TriggerHistoryDetailEntity;
1415
import org.sterl.spring.persistent_tasks.history.model.TriggerHistoryLastStateEntity;
@@ -86,8 +87,15 @@ public long countTriggers(TriggerKey key) {
8687
return triggerHistoryLastStateRepository.countByKey(key);
8788
}
8889

90+
/**
91+
* Checks for the last known state in the history.
92+
*
93+
* @param key the {@link TriggerKey}, can be partly <code>null</code>
94+
* @param page page informations
95+
* @return the found data, looking only the last states
96+
*/
8997
public Page<TriggerHistoryLastStateEntity> findTriggerState(
90-
TriggerKey key, Pageable page) {
98+
@Nullable TriggerKey key, Pageable page) {
9199

92100
page = sortByIdIfNeeded(page);
93101
if (key == null) return triggerHistoryLastStateRepository.findAll(page);
@@ -100,7 +108,7 @@ public Page<TriggerHistoryLastStateEntity> findTriggerState(
100108
key.getTaskName(),
101109
page);
102110
}
103-
111+
104112
private Pageable sortByIdIfNeeded(Pageable page) {
105113
if (page.getSort() == Sort.unsorted()) {
106114
return PageRequest.of(page.getPageNumber(), page.getPageSize(),

core/src/main/java/org/sterl/spring/persistent_tasks/history/component/TriggerHistoryComponent.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@
1313
import org.sterl.spring.persistent_tasks.trigger.model.TriggerEntity;
1414

1515
import lombok.RequiredArgsConstructor;
16+
import lombok.extern.slf4j.Slf4j;
1617

1718
@TransactionalCompontant
1819
@RequiredArgsConstructor
20+
@Slf4j
1921
public class TriggerHistoryComponent {
2022

2123
private final TriggerHistoryLastStateRepository triggerHistoryLastStateRepository;
@@ -36,9 +38,12 @@ public void write(TriggerEntity e) {
3638
triggerHistoryDetailRepository.save(detail);
3739
}
3840

39-
@Transactional
41+
@Transactional(timeout = 10)
4042
@EventListener
4143
public void onPersistentTaskEvent(TriggerLifeCycleEvent triggerLifeCycleEvent) {
44+
log.debug("Received event={} for {} new status={}",
45+
triggerLifeCycleEvent.getClass().getSimpleName(),
46+
triggerLifeCycleEvent.key(), triggerLifeCycleEvent.status());
4247
write(triggerLifeCycleEvent.trigger());
4348
}
4449
}

core/src/main/java/org/sterl/spring/persistent_tasks/trigger/event/TriggerLifeCycleEvent.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.springframework.lang.NonNull;
66
import org.springframework.lang.Nullable;
77
import org.sterl.spring.persistent_tasks.api.TriggerKey;
8+
import org.sterl.spring.persistent_tasks.shared.model.TriggerStatus;
89
import org.sterl.spring.persistent_tasks.trigger.model.TriggerEntity;
910

1011
/**
@@ -14,6 +15,9 @@ public interface TriggerLifeCycleEvent {
1415
default TriggerKey key() {
1516
return trigger().getKey();
1617
}
18+
default TriggerStatus status() {
19+
return trigger().getData().getStatus();
20+
}
1721
@NonNull
1822
TriggerEntity trigger();
1923
@Nullable

0 commit comments

Comments
 (0)