* Small reformatting

* Use serializable interface instead of Object in RqueueJob

rqueue-core/src/main/java/com/github/sonus21/rqueue/core/Job.java

@@ -19,6 +19,7 @@
 import com.github.sonus21.rqueue.listener.QueueDetail;
 import com.github.sonus21.rqueue.models.db.MessageMetadata;
 import com.github.sonus21.rqueue.models.enums.JobStatus;
+import java.io.Serializable;
 
 public interface Job {
 
@@ -43,7 +44,7 @@ public interface Job {
    * @param message a serializable message, it could be a simple string like PING or some context
    *     data that says about the current execution state.
    */
-  void checkIn(Object message);
+  void checkIn(Serializable message);
 
   /**
    * A message that was enqueued

rqueue-core/src/main/java/com/github/sonus21/rqueue/core/MessageScheduler.java

@@ -33,6 +33,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Future;
+import lombok.AllArgsConstructor;
 import lombok.ToString;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.DisposableBean;
@@ -282,19 +283,13 @@ public void onApplicationEvent(RqueueBootstrapEvent event) {
   }
 
   @ToString
+  @AllArgsConstructor
   private class MessageMoverTask implements Runnable {
     private final String name;
     private final String queueName;
     private final String zsetName;
     private final boolean processingQueue;
 
-    MessageMoverTask(String name, String queueName, String zsetName, boolean processingQueue) {
-      this.name = name;
-      this.queueName = queueName;
-      this.zsetName = zsetName;
-      this.processingQueue = processingQueue;
-    }
-
     @Override
     public void run() {
       getLogger().debug("Running {}", this);

rqueue-core/src/main/java/com/github/sonus21/rqueue/core/impl/BaseMessageSender.java

@@ -30,7 +30,7 @@
 import com.github.sonus21.rqueue.dao.RqueueStringDao;
 import com.github.sonus21.rqueue.listener.QueueDetail;
 import com.github.sonus21.rqueue.models.db.MessageMetadata;
-import com.github.sonus21.rqueue.models.db.MessageStatus;
+import com.github.sonus21.rqueue.models.enums.MessageStatus;
 import com.github.sonus21.rqueue.utils.PriorityUtils;
 import com.github.sonus21.rqueue.web.service.RqueueMessageMetadataService;
 import java.time.Duration;

rqueue-core/src/main/java/com/github/sonus21/rqueue/core/impl/JobImpl.java

@@ -23,11 +23,12 @@
 import com.github.sonus21.rqueue.listener.QueueDetail;
 import com.github.sonus21.rqueue.models.db.Execution;
 import com.github.sonus21.rqueue.models.db.MessageMetadata;
-import com.github.sonus21.rqueue.models.db.MessageStatus;
+import com.github.sonus21.rqueue.models.enums.MessageStatus;
 import com.github.sonus21.rqueue.models.db.RqueueJob;
 import com.github.sonus21.rqueue.models.enums.ExecutionStatus;
 import com.github.sonus21.rqueue.models.enums.JobStatus;
 import com.github.sonus21.rqueue.web.service.RqueueMessageMetadataService;
+import java.io.Serializable;
 import java.time.Duration;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.RedisSystemException;
@@ -93,7 +94,7 @@ public RqueueMessage getRqueueMessage() {
   }
 
   @Override
-  public void checkIn(Object message) {
+  public void checkIn(Serializable message) {
     if (isPeriodicJob) {
       throw new UnsupportedOperationException("CheckIn is not supported for periodic job");
     }

rqueue-core/src/main/java/com/github/sonus21/rqueue/listener/MessageProcessorHandler.java

@@ -18,7 +18,7 @@
 
 import com.github.sonus21.rqueue.core.RqueueMessage;
 import com.github.sonus21.rqueue.core.support.MessageProcessor;
-import com.github.sonus21.rqueue.models.db.MessageStatus;
+import com.github.sonus21.rqueue.models.enums.MessageStatus;
 import com.github.sonus21.rqueue.utils.PrefixLogger;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.event.Level;

rqueue-core/src/main/java/com/github/sonus21/rqueue/listener/PostProcessingHandler.java

@@ -23,7 +23,7 @@
 import com.github.sonus21.rqueue.core.impl.JobImpl;
 import com.github.sonus21.rqueue.dao.RqueueSystemConfigDao;
 import com.github.sonus21.rqueue.exception.UnknownSwitchCase;
-import com.github.sonus21.rqueue.models.db.MessageStatus;
+import com.github.sonus21.rqueue.models.enums.MessageStatus;
 import com.github.sonus21.rqueue.models.db.QueueConfig;
 import com.github.sonus21.rqueue.models.enums.ExecutionStatus;
 import com.github.sonus21.rqueue.models.event.RqueueExecutionEvent;

rqueue-core/src/main/java/com/github/sonus21/rqueue/listener/RqueueExecutor.java

@@ -27,7 +27,7 @@
 import com.github.sonus21.rqueue.metrics.RqueueMetricsCounter;
 import com.github.sonus21.rqueue.models.db.Execution;
 import com.github.sonus21.rqueue.models.db.MessageMetadata;
-import com.github.sonus21.rqueue.models.db.MessageStatus;
+import com.github.sonus21.rqueue.models.enums.MessageStatus;
 import com.github.sonus21.rqueue.models.enums.ExecutionStatus;
 import com.github.sonus21.rqueue.utils.Constants;
 import com.github.sonus21.rqueue.web.service.RqueueMessageMetadataService;

rqueue-core/src/main/java/com/github/sonus21/rqueue/models/db/CheckinMessage.java

@@ -17,6 +17,7 @@
 package com.github.sonus21.rqueue.models.db;
 
 import com.github.sonus21.rqueue.models.SerializableBase;
+import java.io.Serializable;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -31,6 +32,6 @@
 public class CheckinMessage extends SerializableBase {
 
   private static final long serialVersionUID = 4727068901984917510L;
-  private Object message;
+  private Serializable message;
   private long at;
 }

rqueue-core/src/main/java/com/github/sonus21/rqueue/models/db/MessageMetadata.java

@@ -19,6 +19,7 @@
 import com.github.sonus21.rqueue.core.RqueueMessage;
 import com.github.sonus21.rqueue.core.support.RqueueMessageUtils;
 import com.github.sonus21.rqueue.models.SerializableBase;
+import com.github.sonus21.rqueue.models.enums.MessageStatus;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

rqueue-core/src/main/java/com/github/sonus21/rqueue/models/db/RqueueJob.java

@@ -20,6 +20,7 @@
 import com.github.sonus21.rqueue.models.SerializableBase;
 import com.github.sonus21.rqueue.models.enums.ExecutionStatus;
 import com.github.sonus21.rqueue.models.enums.JobStatus;
+import java.io.Serializable;
 import java.util.LinkedList;
 import java.util.List;
 import lombok.AllArgsConstructor;
@@ -78,7 +79,7 @@ public RqueueJob(
     }
   }
 
-  public void checkIn(Object message) {
+  public void checkIn(Serializable message) {
     synchronized (this) {
       long checkInTime = System.currentTimeMillis();
       this.checkins.add(new CheckinMessage(message, checkInTime));

rqueue-core/src/main/java/com/github/sonus21/rqueue/models/db/MessageStatus.java → rqueue-core/src/main/java/com/github/sonus21/rqueue/models/enums/MessageStatus.java

@@ -14,10 +14,8 @@
  * limitations under the License.
  */
 
-package com.github.sonus21.rqueue.models.db;
+package com.github.sonus21.rqueue.models.enums;
 
-import com.github.sonus21.rqueue.models.enums.JobStatus;
-import com.github.sonus21.rqueue.models.enums.TaskStatus;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;

rqueue-core/src/main/java/com/github/sonus21/rqueue/web/service/impl/RqueueMessageMetadataServiceImpl.java

@@ -20,7 +20,7 @@
 import com.github.sonus21.rqueue.core.support.RqueueMessageUtils;
 import com.github.sonus21.rqueue.dao.RqueueMessageMetadataDao;
 import com.github.sonus21.rqueue.models.db.MessageMetadata;
-import com.github.sonus21.rqueue.models.db.MessageStatus;
+import com.github.sonus21.rqueue.models.enums.MessageStatus;
 import com.github.sonus21.rqueue.web.service.RqueueMessageMetadataService;
 import java.time.Duration;
 import java.util.Collection;

rqueue-core/src/test/java/com/github/sonus21/rqueue/core/impl/JobImplTest.java

@@ -36,7 +36,7 @@
 import com.github.sonus21.rqueue.listener.QueueDetail;
 import com.github.sonus21.rqueue.models.db.Execution;
 import com.github.sonus21.rqueue.models.db.MessageMetadata;
-import com.github.sonus21.rqueue.models.db.MessageStatus;
+import com.github.sonus21.rqueue.models.enums.MessageStatus;
 import com.github.sonus21.rqueue.models.enums.ExecutionStatus;
 import com.github.sonus21.rqueue.models.enums.JobStatus;
 import com.github.sonus21.rqueue.utils.TestUtils;

rqueue-core/src/test/java/com/github/sonus21/rqueue/listener/RqueueExecutorTest.java

@@ -41,7 +41,7 @@
 import com.github.sonus21.rqueue.dao.RqueueStringDao;
 import com.github.sonus21.rqueue.dao.RqueueSystemConfigDao;
 import com.github.sonus21.rqueue.models.db.MessageMetadata;
-import com.github.sonus21.rqueue.models.db.MessageStatus;
+import com.github.sonus21.rqueue.models.enums.MessageStatus;
 import com.github.sonus21.rqueue.utils.TestUtils;
 import com.github.sonus21.rqueue.utils.backoff.FixedTaskExecutionBackOff;
 import com.github.sonus21.rqueue.utils.backoff.TaskExecutionBackOff;

rqueue-core/src/test/java/com/github/sonus21/rqueue/listener/RqueueMessageListenerContainerTest.java

@@ -34,7 +34,7 @@
 import com.github.sonus21.rqueue.dao.RqueueJobDao;
 import com.github.sonus21.rqueue.dao.RqueueStringDao;
 import com.github.sonus21.rqueue.models.db.MessageMetadata;
-import com.github.sonus21.rqueue.models.db.MessageStatus;
+import com.github.sonus21.rqueue.models.enums.MessageStatus;
 import com.github.sonus21.rqueue.web.service.RqueueMessageMetadataService;
 import io.lettuce.core.RedisCommandExecutionException;
 import java.util.Map;

rqueue-core/src/test/java/com/github/sonus21/rqueue/web/service/RqueueMessageMetadataServiceTest.java

@@ -31,7 +31,7 @@
 import com.github.sonus21.rqueue.core.support.RqueueMessageUtils;
 import com.github.sonus21.rqueue.dao.RqueueMessageMetadataDao;
 import com.github.sonus21.rqueue.models.db.MessageMetadata;
-import com.github.sonus21.rqueue.models.db.MessageStatus;
+import com.github.sonus21.rqueue.models.enums.MessageStatus;
 import com.github.sonus21.rqueue.web.service.impl.RqueueMessageMetadataServiceImpl;
 import java.time.Duration;
 import java.util.Arrays;

rqueue-core/src/test/java/com/github/sonus21/rqueue/web/service/RqueueQDetailServiceTest.java

@@ -34,7 +34,7 @@
 import com.github.sonus21.rqueue.core.support.RqueueMessageUtils;
 import com.github.sonus21.rqueue.models.db.DeadLetterQueue;
 import com.github.sonus21.rqueue.models.db.MessageMetadata;
-import com.github.sonus21.rqueue.models.db.MessageStatus;
+import com.github.sonus21.rqueue.models.enums.MessageStatus;
 import com.github.sonus21.rqueue.models.db.QueueConfig;
 import com.github.sonus21.rqueue.models.enums.ActionType;
 import com.github.sonus21.rqueue.models.enums.DataType;

rqueue-core/src/test/java/com/github/sonus21/rqueue/web/service/RqueueTaskAggregatorServiceTest.java

@@ -37,7 +37,7 @@
 import com.github.sonus21.rqueue.listener.QueueDetail;
 import com.github.sonus21.rqueue.models.aggregator.TasksStat;
 import com.github.sonus21.rqueue.models.db.MessageMetadata;
-import com.github.sonus21.rqueue.models.db.MessageStatus;
+import com.github.sonus21.rqueue.models.enums.MessageStatus;
 import com.github.sonus21.rqueue.models.db.QueueStatistics;
 import com.github.sonus21.rqueue.models.db.QueueStatisticsTest;
 import com.github.sonus21.rqueue.models.event.RqueueExecutionEvent;