adjusted entity names and table names

Author: sterlp

core/src/main/java/org/sterl/spring/persistent_tasks/PersistentTaskService.java

@@ -15,16 +15,16 @@
 import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.sterl.spring.persistent_tasks.api.TriggerRequest;
 import org.sterl.spring.persistent_tasks.api.TriggerKey;
+import org.sterl.spring.persistent_tasks.api.TriggerRequest;
 import org.sterl.spring.persistent_tasks.api.TriggerSearch;
 import org.sterl.spring.persistent_tasks.api.event.TriggerTaskCommand;
 import org.sterl.spring.persistent_tasks.history.HistoryService;
-import org.sterl.spring.persistent_tasks.history.model.TriggerHistoryLastStateEntity;
+import org.sterl.spring.persistent_tasks.history.model.CompletedTriggerEntity;
 import org.sterl.spring.persistent_tasks.scheduler.SchedulerService;
-import org.sterl.spring.persistent_tasks.shared.model.TriggerData;
+import org.sterl.spring.persistent_tasks.shared.model.TriggerEntity;
 import org.sterl.spring.persistent_tasks.trigger.TriggerService;
-import org.sterl.spring.persistent_tasks.trigger.model.TriggerEntity;
+import org.sterl.spring.persistent_tasks.trigger.model.RunningTriggerEntity;
 
 import lombok.RequiredArgsConstructor;
 
@@ -41,14 +41,14 @@ public class PersistentTaskService {
     private final HistoryService historyService;
 
     /**
-     * Returns the last known {@link TriggerData} to a given key. First running triggers are checked.
+     * Returns the last known {@link TriggerEntity} to a given key. First running triggers are checked.
      * Maybe out of the history event from a retry execution of the very same id.
      *
      * @param key the {@link TriggerKey} to look for
-     * @return the {@link TriggerData} to the {@link TriggerKey}
+     * @return the {@link TriggerEntity} to the {@link TriggerKey}
      */
-    public Optional<TriggerData> getLastTriggerData(TriggerKey key) {
-        final Optional<TriggerEntity> trigger = triggerService.get(key);
+    public Optional<TriggerEntity> getLastTriggerData(TriggerKey key) {
+        final Optional<RunningTriggerEntity> trigger = triggerService.get(key);
         if (trigger.isEmpty()) {
             var history = historyService.findLastKnownStatus(key);
             if (history.isPresent()) {
@@ -60,7 +60,7 @@ public Optional<TriggerData> getLastTriggerData(TriggerKey key) {
         }
     }
 
-    public Optional<TriggerData> getLastDetailData(TriggerKey key) {
+    public Optional<TriggerEntity> getLastDetailData(TriggerKey key) {
         var data = historyService.findAllDetailsForKey(key, Pageable.ofSize(1));
         if (data.isEmpty()) {
             return Optional.empty();
@@ -93,7 +93,7 @@ public <T extends Serializable> List<TriggerKey> queue(Collection<TriggerRequest
 
         return triggers.stream() //
             .map(t -> triggerService.queue(t)) //
-            .map(TriggerEntity::getKey) //
+            .map(RunningTriggerEntity::getKey) //
             .toList();
     }
     /**
@@ -129,40 +129,40 @@ public <T extends Serializable> TriggerKey runOrQueue(
      * Data is limited to overall 300 elements.
      * 
      * @param correlationId the id to search for
-     * @return the found {@link TriggerData} sorted by create time ASC
+     * @return the found {@link TriggerEntity} sorted by create time ASC
      */
     @Transactional(readOnly = true, timeout = 5)
-    public List<TriggerData> findAllTriggerByCorrelationId(String correlationId) {
+    public List<TriggerEntity> findAllTriggerByCorrelationId(String correlationId) {
         if (StringUtils.isAllBlank(correlationId)) return Collections.emptyList();
 
         final var search = TriggerSearch.byCorrelationId(correlationId);
 
         final var running = triggerService.searchTriggers(search, PageRequest.of(0, 100, TriggerSearch.DEFAULT_SORT))
-                .stream().map(TriggerEntity::getData)
+                .stream().map(RunningTriggerEntity::getData)
                 .toList();
 
         final var done = historyService.searchTriggers(search, PageRequest.of(0, 200, TriggerSearch.DEFAULT_SORT))
-            .stream().map(TriggerHistoryLastStateEntity::getData)
+            .stream().map(CompletedTriggerEntity::getData)
             .toList();
 
-        final var result = new ArrayList<TriggerData>(running.size() + done.size());
+        final var result = new ArrayList<TriggerEntity>(running.size() + done.size());
         result.addAll(done);
         result.addAll(running);
         return result;
     }
 
     @Transactional(readOnly = true, timeout = 5)
-    public Optional<TriggerData> findLastTriggerByCorrelationId(String correlationId) {
+    public Optional<TriggerEntity> findLastTriggerByCorrelationId(String correlationId) {
         final var page = PageRequest.of(0, 1, TriggerSearch.sortByCreatedTime(Direction.DESC));
         final var search = TriggerSearch.byCorrelationId(correlationId);
 
         var result = triggerService.searchTriggers(search, page)
-                                   .stream().map(TriggerEntity::getData)
+                                   .stream().map(RunningTriggerEntity::getData)
                                    .toList();
 
         if (result.isEmpty()) {
             result = historyService.searchTriggers(search, page)
-                                   .stream().map(TriggerHistoryLastStateEntity::getData)
+                                   .stream().map(CompletedTriggerEntity::getData)
                                    .toList();
         }
         return result.isEmpty() ? Optional.empty() : Optional.of(result.getFirst());

core/src/main/java/org/sterl/spring/persistent_tasks/api/event/TriggerTaskCommand.java

@@ -5,8 +5,8 @@
 import java.util.Collection;
 import java.util.Collections;
 
-import org.sterl.spring.persistent_tasks.api.TriggerRequest;
 import org.sterl.spring.persistent_tasks.api.TaskId.TriggerBuilder;
+import org.sterl.spring.persistent_tasks.api.TriggerRequest;
 
 /**
  * An event to trigger one or multiple persistentTask executions

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

@@ -16,39 +16,39 @@
 import org.sterl.spring.persistent_tasks.api.TriggerSearch;
 import org.sterl.spring.persistent_tasks.api.TriggerStatus;
 import org.sterl.spring.persistent_tasks.api.event.TriggerTaskCommand;
-import org.sterl.spring.persistent_tasks.history.model.QTriggerHistoryLastStateEntity;
-import org.sterl.spring.persistent_tasks.history.model.TriggerHistoryDetailEntity;
-import org.sterl.spring.persistent_tasks.history.model.TriggerHistoryLastStateEntity;
+import org.sterl.spring.persistent_tasks.history.model.CompletedTriggerEntity;
+import org.sterl.spring.persistent_tasks.history.model.HistoryTriggerEntity;
+import org.sterl.spring.persistent_tasks.history.model.QCompletedTriggerEntity;
 import org.sterl.spring.persistent_tasks.history.repository.TriggerHistoryDetailRepository;
-import org.sterl.spring.persistent_tasks.history.repository.TriggerHistoryLastStateRepository;
+import org.sterl.spring.persistent_tasks.history.repository.CompletedTriggerRepository;
 import org.sterl.spring.persistent_tasks.shared.stereotype.TransactionalService;
 
 import lombok.RequiredArgsConstructor;
 
 @TransactionalService
 @RequiredArgsConstructor
 public class HistoryService {
-    private final TriggerHistoryLastStateRepository triggerHistoryLastStateRepository;
+    private final CompletedTriggerRepository completedTriggerRepository;
     private final TriggerHistoryDetailRepository triggerHistoryDetailRepository;
     private final ApplicationEventPublisher applicationEventPublisher;
 
-    public Optional<TriggerHistoryLastStateEntity> findStatus(long triggerId) {
-        return triggerHistoryLastStateRepository.findById(triggerId);
+    public Optional<CompletedTriggerEntity> findStatus(long triggerId) {
+        return completedTriggerRepository.findById(triggerId);
     }
 
-    public Optional<TriggerHistoryLastStateEntity> findLastKnownStatus(TriggerKey triggerKey) {
+    public Optional<CompletedTriggerEntity> findLastKnownStatus(TriggerKey triggerKey) {
         final var page = PageRequest.of(0, 1).withSort(Direction.DESC, "data.createdTime", "id");
-        final var result = triggerHistoryLastStateRepository.listKnownStatusFor(triggerKey, page);
+        final var result = completedTriggerRepository.listKnownStatusFor(triggerKey, page);
         return result.isEmpty() ? Optional.empty() : Optional.of(result.getContent().get(0));
     }
 
     public void deleteAll() {
-        triggerHistoryLastStateRepository.deleteAllInBatch();
+        completedTriggerRepository.deleteAllInBatch();
         triggerHistoryDetailRepository.deleteAllInBatch();
     }
 
     public void deleteAllOlderThan(OffsetDateTime age) {
-        triggerHistoryLastStateRepository.deleteOlderThan(age);
+        completedTriggerRepository.deleteOlderThan(age);
         triggerHistoryDetailRepository.deleteOlderThan(age);
     }
 
@@ -59,20 +59,20 @@ public long countTriggers(TriggerStatus status) {
         return triggerHistoryDetailRepository.countByStatus(status);
     }
 
-    public List<TriggerHistoryDetailEntity> findAllDetailsForInstance(long instanceId) {
+    public List<HistoryTriggerEntity> findAllDetailsForInstance(long instanceId) {
         return triggerHistoryDetailRepository.findAllByInstanceId(instanceId);
     }
 
-    public Page<TriggerHistoryDetailEntity> findAllDetailsForKey(TriggerKey key) {
+    public Page<HistoryTriggerEntity> findAllDetailsForKey(TriggerKey key) {
         return findAllDetailsForKey(key, PageRequest.of(0, 100));
     }
-    public Page<TriggerHistoryDetailEntity> findAllDetailsForKey(TriggerKey key, Pageable page) {
+    public Page<HistoryTriggerEntity> findAllDetailsForKey(TriggerKey key, Pageable page) {
         page = applyDefaultSortIfNeeded(page);
         return triggerHistoryDetailRepository.listKnownStatusFor(key, page);
     }
 
     public Optional<TriggerKey> reQueue(Long id, OffsetDateTime runAt) {
-        final var lastState = triggerHistoryLastStateRepository.findById(id);
+        final var lastState = completedTriggerRepository.findById(id);
         if (lastState.isEmpty()) return Optional.empty();
 
         final var data = lastState.get().getData();
@@ -88,7 +88,7 @@ public Optional<TriggerKey> reQueue(Long id, OffsetDateTime runAt) {
     }
 
     public long countTriggers(TriggerKey key) {
-        return triggerHistoryLastStateRepository.countByKey(key);
+        return completedTriggerRepository.countByKey(key);
     }
 
     /**
@@ -98,19 +98,19 @@ public long countTriggers(TriggerKey key) {
      * @param page page informations
      * @return the found data, looking only the last states
      */
-    public Page<TriggerHistoryLastStateEntity> searchTriggers(
+    public Page<CompletedTriggerEntity> searchTriggers(
             @Nullable TriggerSearch search, Pageable page) {
 
         page = applyDefaultSortIfNeeded(page);
-        Page<TriggerHistoryLastStateEntity> result;
+        Page<CompletedTriggerEntity> result;
 
         if (search != null && search.hasValue()) {
-            var p = triggerHistoryLastStateRepository.buildSearch(
-                    QTriggerHistoryLastStateEntity.triggerHistoryLastStateEntity.data, 
+            var p = completedTriggerRepository.buildSearch(
+                    QCompletedTriggerEntity.completedTriggerEntity.data, 
                     search);
-            result = triggerHistoryLastStateRepository.findAll(p, page);
+            result = completedTriggerRepository.findAll(p, page);
         } else {
-            result = triggerHistoryLastStateRepository.findAll(page);
+            result = completedTriggerRepository.findAll(page);
         }
         return result;
     }
@@ -124,6 +124,6 @@ private Pageable applyDefaultSortIfNeeded(Pageable page) {
     }
 
     public List<TaskStatusHistoryOverview> taskStatusHistory() {
-        return triggerHistoryLastStateRepository.listTriggerStatus();
+        return completedTriggerRepository.listTriggerStatus();
     }
 }

core/src/main/java/org/sterl/spring/persistent_tasks/history/api/HistoryConverter.java

@@ -2,32 +2,32 @@
 
 import org.springframework.lang.NonNull;
 import org.sterl.spring.persistent_tasks.api.Trigger;
-import org.sterl.spring.persistent_tasks.history.model.TriggerHistoryDetailEntity;
-import org.sterl.spring.persistent_tasks.history.model.TriggerHistoryLastStateEntity;
+import org.sterl.spring.persistent_tasks.history.model.CompletedTriggerEntity;
+import org.sterl.spring.persistent_tasks.history.model.HistoryTriggerEntity;
 import org.sterl.spring.persistent_tasks.shared.ExtendetConvert;
 import org.sterl.spring.persistent_tasks.shared.converter.ToTrigger;
 
 interface HistoryConverter {
 
-    enum FromLastTriggerStateEntity implements ExtendetConvert<TriggerHistoryLastStateEntity, Trigger> {
+    enum FromLastTriggerStateEntity implements ExtendetConvert<CompletedTriggerEntity, Trigger> {
         INSTANCE;
 
         @NonNull
         @Override
-        public Trigger convert(@NonNull TriggerHistoryLastStateEntity source) {
+        public Trigger convert(@NonNull CompletedTriggerEntity source) {
             var result = ToTrigger.INSTANCE.convert(source);
             result.setId(source.getId());
             result.setInstanceId(source.getId());
             return result;
         }
     }
 
-    enum FromTriggerStateDetailEntity implements ExtendetConvert<TriggerHistoryDetailEntity, Trigger> {
+    enum FromTriggerStateDetailEntity implements ExtendetConvert<HistoryTriggerEntity, Trigger> {
         INSTANCE;
 
         @NonNull
         @Override
-        public Trigger convert(@NonNull TriggerHistoryDetailEntity source) {
+        public Trigger convert(@NonNull HistoryTriggerEntity source) {
             var result = ToTrigger.INSTANCE.convert(source);
             result.setId(source.getId());
             result.setInstanceId(source.getInstanceId());

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

@@ -7,11 +7,11 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.event.TransactionPhase;
 import org.springframework.transaction.event.TransactionalEventListener;
-import org.sterl.spring.persistent_tasks.history.model.TriggerHistoryDetailEntity;
-import org.sterl.spring.persistent_tasks.history.model.TriggerHistoryLastStateEntity;
+import org.sterl.spring.persistent_tasks.history.model.CompletedTriggerEntity;
+import org.sterl.spring.persistent_tasks.history.model.HistoryTriggerEntity;
 import org.sterl.spring.persistent_tasks.history.repository.TriggerHistoryDetailRepository;
-import org.sterl.spring.persistent_tasks.history.repository.TriggerHistoryLastStateRepository;
-import org.sterl.spring.persistent_tasks.shared.model.TriggerData;
+import org.sterl.spring.persistent_tasks.history.repository.CompletedTriggerRepository;
+import org.sterl.spring.persistent_tasks.shared.model.TriggerEntity;
 import org.sterl.spring.persistent_tasks.shared.stereotype.TransactionalCompontant;
 import org.sterl.spring.persistent_tasks.trigger.event.TriggerLifeCycleEvent;
 import org.sterl.spring.persistent_tasks.trigger.event.TriggerRunningEvent;
@@ -24,7 +24,7 @@
 @Slf4j
 public class TriggerHistoryComponent {
 
-    private final TriggerHistoryLastStateRepository triggerHistoryLastStateRepository;
+    private final CompletedTriggerRepository completedTriggerRepository;
     private final TriggerHistoryDetailRepository triggerHistoryDetailRepository;
 
     // we have to ensure to run in an own transaction
@@ -53,15 +53,15 @@ void onPersistentTaskEvent(TriggerLifeCycleEvent e) {
         execute(e.id(), e.data(), e.isDone());
     }
 
-    public void execute(final long triggerId, final TriggerData data, boolean isDone) {
+    public void execute(final long triggerId, final TriggerEntity data, boolean isDone) {
         if (isDone) {
-            final var state = new TriggerHistoryLastStateEntity();
+            final var state = new CompletedTriggerEntity();
             state.setId(triggerId);
             state.setData(data.copy());
-            triggerHistoryLastStateRepository.save(state);
+            completedTriggerRepository.save(state);
         }
 
-        var detail = new TriggerHistoryDetailEntity();
+        var detail = new HistoryTriggerEntity();
         detail.setInstanceId(triggerId);
         detail.setData(data.toBuilder()
                 .state(null)

core/src/main/java/org/sterl/spring/persistent_tasks/history/model/TriggerHistoryLastStateEntity.java renamed to core/src/main/java/org/sterl/spring/persistent_tasks/history/model/CompletedTriggerEntity.java

@@ -3,8 +3,8 @@
 import java.time.OffsetDateTime;
 
 import org.sterl.spring.persistent_tasks.api.TriggerKey;
-import org.sterl.spring.persistent_tasks.shared.model.HasTriggerData;
-import org.sterl.spring.persistent_tasks.shared.model.TriggerData;
+import org.sterl.spring.persistent_tasks.shared.model.HasTrigger;
+import org.sterl.spring.persistent_tasks.shared.model.TriggerEntity;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Embedded;
@@ -20,7 +20,7 @@
 import lombok.NoArgsConstructor;
 
 @Entity
-@Table(name = "pt_trigger_history_last_states", indexes = {
+@Table(name = "pt_completed_triggers", indexes = {
         @Index(name = "idx_pt_trigger_history_last_states_task_name", columnList = "task_name"),
         @Index(name = "idx_pt_trigger_history_last_states_trigger_id", columnList = "trigger_id"),
         @Index(name = "idx_pt_trigger_history_last_states_status", columnList = "status"),
@@ -33,15 +33,15 @@
 @Builder(toBuilder = true)
 @AllArgsConstructor
 @EqualsAndHashCode(of = "id")
-public class TriggerHistoryLastStateEntity implements HasTriggerData {
+public class CompletedTriggerEntity implements HasTrigger {
 
     @Column(updatable = false)
     @Id
     private Long id;
 
     @Embedded
     @NotNull
-    private TriggerData data;
+    private TriggerEntity data;
 
     public TriggerKey getKey() {
         return data.getKey();