Merge branch 'issue-30552-containers-tm-support' of https://github.com/dotCMS/core into issue-30552-containers-tm-support

Author: fabrizzio-dotCMS

dotCMS/src/main/java/com/dotcms/jobs/business/api/JobQueueConfig.java

@@ -10,18 +10,13 @@ public class JobQueueConfig {
      */
     private final int threadPoolSize;
 
-    // The interval in milliseconds to poll for job updates
-    private final int pollJobUpdatesIntervalMilliseconds;
-
     /**
      * Constructs a new JobQueueConfig
      *
      * @param threadPoolSize The number of threads to use for job processing.
-     * @param pollJobUpdatesIntervalMilliseconds The interval in milliseconds to poll for job updates.
      */
-    public JobQueueConfig(int threadPoolSize, int pollJobUpdatesIntervalMilliseconds) {
+    public JobQueueConfig(int threadPoolSize) {
         this.threadPoolSize = threadPoolSize;
-        this.pollJobUpdatesIntervalMilliseconds = pollJobUpdatesIntervalMilliseconds;
     }
 
     /**
@@ -33,13 +28,4 @@ public int getThreadPoolSize() {
         return threadPoolSize;
     }
 
-    /**
-     * Gets the interval in milliseconds to poll for job updates.
-     *
-     * @return The interval in milliseconds to poll for job updates.
-     */
-    public int getPollJobUpdatesIntervalMilliseconds() {
-        return pollJobUpdatesIntervalMilliseconds;
-    }
-
 }

dotCMS/src/main/java/com/dotcms/jobs/business/api/JobQueueConfigProducer.java

@@ -16,11 +16,6 @@ public class JobQueueConfigProducer {
             "JOB_QUEUE_THREAD_POOL_SIZE", 10
     );
 
-    // The interval in milliseconds to poll for job updates.
-    static final int DEFAULT_POLL_JOB_UPDATES_INTERVAL_MILLISECONDS = Config.getIntProperty(
-            "JOB_QUEUE_POLL_JOB_UPDATES_INTERVAL_MILLISECONDS", 3000
-    );
-
     /**
      * Produces a JobQueueConfig object. This method is called by the CDI container to create a
      * JobQueueConfig instance when it is necessary for dependency injection.
@@ -30,8 +25,7 @@ public class JobQueueConfigProducer {
     @Produces
     public JobQueueConfig produceJobQueueConfig() {
         return new JobQueueConfig(
-                DEFAULT_THREAD_POOL_SIZE,
-                DEFAULT_POLL_JOB_UPDATES_INTERVAL_MILLISECONDS
+                DEFAULT_THREAD_POOL_SIZE
         );
     }
 

dotCMS/src/main/java/com/dotcms/jobs/business/api/JobQueueManagerAPIImpl.java

@@ -0,0 +1,39 @@
+package com.dotcms.jobs.business.api.events;
+
+import com.dotcms.jobs.business.job.Job;
+import java.time.LocalDateTime;
+
+/**
+ * Event fired when an abandoned job is detected.
+ */
+public class JobAbandonedEvent implements JobEvent {
+
+    private final Job job;
+    private final LocalDateTime detectedAt;
+
+    /**
+     * Constructs a new JobAbandonedEvent.
+     *
+     * @param job        The job.
+     * @param detectedAt The timestamp when the abandoned job was detected.
+     */
+    public JobAbandonedEvent(Job job, LocalDateTime detectedAt) {
+        this.job = job;
+        this.detectedAt = detectedAt;
+    }
+
+    /**
+     * @return The abandoned job.
+     */
+    public Job getJob() {
+        return job;
+    }
+
+    /**
+     * @return The timestamp when the abandoned job was detected.
+     */
+    public LocalDateTime getDetectedAt() {
+        return detectedAt;
+    }
+
+}

dotCMS/src/main/java/com/dotcms/jobs/business/api/events/EventProducer.java

@@ -6,7 +6,7 @@
 /**
  * Event fired when there is a request to cancel a job.
  */
-public class JobCancelRequestEvent {
+public class JobCancelRequestEvent implements JobEvent {
 
     private final Job job;
     private final LocalDateTime canceledOn;

dotCMS/src/main/java/com/dotcms/jobs/business/api/events/JobAbandonedEvent.java

@@ -6,7 +6,7 @@
 /**
  * Event fired when a job is canceled.
  */
-public class JobCanceledEvent {
+public class JobCanceledEvent implements JobEvent {
 
     private final Job job;
     private final LocalDateTime canceledAt;

dotCMS/src/main/java/com/dotcms/jobs/business/api/events/JobCancelRequestEvent.java

@@ -6,7 +6,7 @@
 /**
  * Event fired when a job is being canceled.
  */
-public class JobCancellingEvent {
+public class JobCancellingEvent implements JobEvent {
 
     private final Job job;
     private final LocalDateTime canceledAt;

dotCMS/src/main/java/com/dotcms/jobs/business/api/events/JobCanceledEvent.java

@@ -6,7 +6,7 @@
 /**
  * Event fired when a job completes successfully.
  */
-public class JobCompletedEvent {
+public class JobCompletedEvent implements JobEvent {
 
     private final Job job;
     private final LocalDateTime completedAt;

dotCMS/src/main/java/com/dotcms/jobs/business/api/events/JobCancellingEvent.java

@@ -6,7 +6,7 @@
 /**
  * Event fired when a new job is created and added to the queue.
  */
-public class JobCreatedEvent {
+public class JobCreatedEvent implements JobEvent {
 
     private final String jobId;
     private final String queueName;