cleanup server api

Author: sterlp

core/pom.xml

@@ -207,10 +207,11 @@
                     <classPatterns>
                         <pattern>org.sterl.spring.persistent_tasks.api.*</pattern>
                     </classPatterns>
-                    <excludeClassPatterns>
-                        <pattern>com.querydsl.core.types.dsl.**</pattern>
-                        <pattern>java.lang.reflect.**</pattern>
-                    </excludeClassPatterns>
+                    <excludeClasses>
+                        <class>java.lang.Class</class>
+                        <class>org.sterl.spring.persistent_tasks.api.QTriggerKey</class>
+                        <class>java.io.Serializable</class>
+                    </excludeClasses>
                     <outputFile>../ui/src/server-api.d.ts</outputFile>
                     <outputKind>module</outputKind>
                 </configuration>

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

@@ -25,6 +25,13 @@ public boolean hasValue() {
                 || status != null;
     }
 
+    
+    public static TriggerSearch byCorrelationId(String correlationId) {
+        var result = new TriggerSearch();
+        result.setCorrelationId(correlationId);
+        return result;
+    }
+    
     /** create time ASC */
     public static final Sort DEFAULT_SORT = sortByCreatedTime(Direction.ASC);
 
@@ -38,9 +45,4 @@ public static Pageable applyDefaultSortIfNeeded(Pageable page) {
         }
         return result;
     }
-    public static TriggerSearch byCorrelationId(String correlationId) {
-        var result = new TriggerSearch();
-        result.setCorrelationId(correlationId);
-        return result;
-    }
 }

ui/src/server-api.d.ts

@@ -22,27 +22,16 @@ export interface AddTriggerRequest<T> {
     runtAt: string;
     priority: number;
     correlationId: string;
+    tag: string;
 }
 
 export interface RetryStrategy {
 }
 
-export interface FixedIntervalRetryStrategy extends RetryStrategy {
-}
-
-export interface LinearRetryStrategy extends RetryStrategy {
-}
-
-export interface MultiplicativeRetryStrategy extends RetryStrategy {
-}
-
-export interface TaskId<T> extends Serializable {
+export interface TaskId<T> {
     name: string;
 }
 
-export interface TriggerBuilder<T> {
-}
-
 export interface TaskStatusHistoryOverview {
     taskName: string;
     status: TriggerStatus;
@@ -59,6 +48,7 @@ export interface Trigger {
     id: number;
     instanceId: number;
     key: TriggerKey;
+    tag: string;
     correlationId: string;
     runningOn: string;
     createdTime: string;
@@ -75,36 +65,18 @@ export interface Trigger {
     lastException: string;
 }
 
-export interface TriggerKey extends Serializable {
+export interface TriggerKey {
     id: string;
     taskName: string;
 }
 
-export interface TriggerKeyBuilder {
-}
-
-export interface PersistentTasksEvent {
-}
-
-export interface TriggerTaskCommand<T> extends PersistentTasksEvent {
-    triggers: AddTriggerRequest<T>[];
-}
-
-export interface PersistentTask<T> {
-    transactional: boolean;
-}
-
-export interface RunningTrigger<T> {
-    key: TriggerKey;
+export interface TriggerSearch {
+    search: string;
+    keyId: string;
+    taskName: string;
     correlationId: string;
-    executionCount: number;
-    data: T;
-}
-
-export interface RunningTriggerContextHolder {
-}
-
-export interface TransactionalTask<T> extends PersistentTask<T> {
+    status: TriggerStatus;
+    tag: string;
 }
 
 export interface PageMetadata {
@@ -114,7 +86,4 @@ export interface PageMetadata {
     totalPages: number;
 }
 
-export interface Serializable {
-}
-
 export type TriggerStatus = "WAITING" | "RUNNING" | "SUCCESS" | "FAILED" | "CANCELED";