Multiple Fixes (#159)

Author: sonus21

.circleci/config.yml

@@ -117,7 +117,7 @@ aliases:
 executors:
   rqueue-executor:
     machine:
-      image: ubuntu-1604:202007-01
+      image: ubuntu-2004:202201-02
 
     working_directory: ~/repo
 
@@ -139,7 +139,7 @@ build_steps: &build_steps
           # fallback to using the latest cache if no exact match is found
           - v1-dependencies-
 
-    - run: gradle dependencies
+    - run: ./gradlew dependencies
     - save_cache:
         paths:
           - ~/.gradle

CHANGELOG.md

@@ -1,5 +1,17 @@
 # [Rqueue] New and Notable Changes
 
+### [2.10.2] - 15-Jul-2022
+
+### Fixes
+
+* Message status is not enqueued only, but it should be successful, failed etc
+* Weighted queue with size 1 was not working
+* Deleted message reappears
+
+### Features
+
+* Disable Rqueue using `rqueue.enabled` flag
+
 ### [2.10.1] - 18-Oct-2021
 
 * Fixes for concurrency when task executor is provided see issue #[122]
@@ -281,4 +293,6 @@ Fixes:
 
 [2.10.1]: https://repo1.maven.org/maven2/com/github/sonus21/rqueue-core/2.10.1-RELEASE
 
+[2.10.2]: https://repo1.maven.org/maven2/com/github/sonus21/rqueue-core/2.10.2-RELEASE
+
 [122]: https://github.com/sonus21/rqueue/issues/122

README.md

@@ -19,7 +19,7 @@ well, where all services code is in Spring.
 
 ## Features
 
-* **Instant delivery** : Instant execute this message
+* **Instant delivery** : Instant execute this message in the background
 * **Message scheduling** : A message can be scheduled for any arbitrary period
 * **Unique message** : Unique message processing for a queue based on the message id
 * **Periodic message** : Process same message at certain interval
@@ -71,14 +71,14 @@ Release Version: [Maven central](https://search.maven.org/search?q=g:com.github.
 * Add dependency
   * Gradle
     ```groovy
-        implementation 'com.github.sonus21:rqueue-spring-boot-starter:2.10.1-RELEASE'
+        implementation 'com.github.sonus21:rqueue-spring-boot-starter:2.10.2-RELEASE'
     ```
   * Maven
     ```xml
      <dependency>
         <groupId>com.github.sonus21</groupId>
         <artifactId>rqueue-spring-boot-starter</artifactId>
-        <version>2.10.1-RELEASE</version>
+        <version>2.10.2-RELEASE</version>
     </dependency>
     ```
 
@@ -91,14 +91,14 @@ Release Version: [Maven central](https://search.maven.org/search?q=g:com.github.
 * Add Dependency
   * Gradle
     ```groovy
-        implementation 'com.github.sonus21:rqueue-spring:2.10.1-RELEASE'
+        implementation 'com.github.sonus21:rqueue-spring:2.10.2-RELEASE'
     ```
   * Maven
     ```xml
      <dependency>
        <groupId>com.github.sonus21</groupId>
        <artifactId>rqueue-spring</artifactId>
-       <version>2.10.1-RELEASE</version>
+       <version>2.10.2-RELEASE</version>
      </dependency>
     ```
 
@@ -255,12 +255,32 @@ a
 PR/[issue](https://github.com/sonus21/rqueue/issues/new?template=i-m-using-rqueue.md&title=Add+my+organisation+in+Rqueue+Users)
 .**
 
-<a href="https://tuneyou.com/"><img alt="TuneYou" src="https://raw.githubusercontent.com/sonus21/rqueue/master/docs/static/users/tuneyou.png" width="150" align="middle"/></a>
+<a href="https://tuneyou.com"><img alt="TuneYou" src="https://raw.githubusercontent.com/sonus21/rqueue/master/docs/static/users/tuneyou.png" width="150" align="middle"/></a>
 &nbsp;&nbsp;
 <a href="https://www.pokerstarssports.eu"><img  alt="PokerStars" src="https://raw.githubusercontent.com/sonus21/rqueue/master/docs/static/users/pokerstars.png" width="250" align="middle"/></a>
 &nbsp;&nbsp;
-<a href="https://bitbot.plus/"><img src="https://raw.githubusercontent.com/sonus21/rqueue/master/docs/static/users/bitbot.png" alt="Bitbot" height="60" align="middle"/></a>
+<a href="https://bitbot.plus"><img src="https://raw.githubusercontent.com/sonus21/rqueue/master/docs/static/users/bitbot.png" alt="Bitbot" height="60" align="middle"/></a>
 &nbsp;&nbsp;
+<a href="https://www.chaotiinfo.cn"><img src="https://raw.githubusercontent.com/sonus21/rqueue/master/docs/static/users/chaoti-info.png" alt="CHAOTI INFO TECH(SHENZHEN)" height="60" align="middle"/></a>
+&nbsp;&nbsp;
+
+<!---- Signing Key
+~/.gradle/gradle.properties file
+
+sonatypeUsername=xyz
+sonatypePassword=xyz
+signing.keyId=371EDCC6
+signing.password=xyz
+signing.secretKeyRingFile=/Users/sonu/.gnupg/secring.gpg
+
+
+For signing generate gpg key using gpg tool using `gpg --gen-key`
+
+signing.password is gpg key password
+signing.keyId is last 8 character of gpg key, find using `gpg -K`
+signing.secretKeyRingFile=/Users/sonu/.gnupg/secring.gpg generate this as `gpg --keyring secring.gpg --export-secret-keys > ~/.gnupg/secring.gpg`
+
+--->
 
 ## Support
 

build.gradle

@@ -70,7 +70,7 @@ ext {
 
 subprojects {
     group = 'com.github.sonus21'
-    version = '2.10.1-RELEASE'
+    version = '2.10.2-RELEASE'
 
     dependencies {
         // https://mvnrepository.com/artifact/org.springframework/spring-messaging

docs/static/users/chaoti-info.png

@@ -14,7 +14,7 @@ artifacts {
     archives javadocJar
 }
 
-ext.isNotCi = !"true".equals(System.getenv("CI"))
+ext.isNotCi = "true" != System.getenv("CI")
 signing {
     required { isNotCi && gradle.taskGraph.hasTask("uploadArchives") }
     sign configurations.archives

gradle/code-signing.gradle

@@ -23,6 +23,7 @@
 import java.lang.annotation.Target;
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.stereotype.Component;
+
 /**
  * Indicates that an annotated class is a message listener
  *

rqueue-core/src/main/java/com/github/sonus21/rqueue/annotation/MessageListener.java

@@ -53,6 +53,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 public @interface RqueueListener {
+
   /**
    * List of unique queues. Queues can be defined by their name, placeholder that would be resolved
    * to properties file or could be list of comma separated queue names.

rqueue-core/src/main/java/com/github/sonus21/rqueue/annotation/RqueueListener.java

@@ -19,6 +19,7 @@
 import java.time.Duration;
 
 public interface RqueueLockManager {
+
   boolean acquireLock(String lockKey, String lockValue, Duration duration);
 
   boolean releaseLock(String lockKey, String lockValue);

rqueue-core/src/main/java/com/github/sonus21/rqueue/common/RqueueLockManager.java

@@ -34,6 +34,7 @@
 
 @Slf4j
 public class RqueueRedisTemplate<V extends Serializable> {
+
   protected RedisTemplate<String, V> redisTemplate;
 
   public RqueueRedisTemplate(RedisConnectionFactory redisConnectionFactory) {

rqueue-core/src/main/java/com/github/sonus21/rqueue/common/RqueueRedisTemplate.java

@@ -22,6 +22,7 @@
 import org.springframework.util.Assert;
 
 public class RqueueLockManagerImpl implements RqueueLockManager {
+
   private final RqueueStringDao rqueueStringDao;
 
   public RqueueLockManagerImpl(RqueueStringDao rqueueStringDao) {

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

@@ -33,8 +33,8 @@
 import com.github.sonus21.rqueue.dao.impl.RqueueStringDaoImpl;
 import com.github.sonus21.rqueue.listener.RqueueMessageListenerContainer;
 import com.github.sonus21.rqueue.metrics.RqueueQueueMetrics;
-import com.github.sonus21.rqueue.utils.ReactiveEnabled;
 import com.github.sonus21.rqueue.utils.RedisUtils;
+import com.github.sonus21.rqueue.utils.condition.ReactiveEnabled;
 import com.github.sonus21.rqueue.utils.pebble.ResourceLoader;
 import com.github.sonus21.rqueue.utils.pebble.RqueuePebbleExtension;
 import com.mitchellbosecke.pebble.PebbleEngine;

rqueue-core/src/main/java/com/github/sonus21/rqueue/config/RqueueListenerBaseConfig.java

@@ -27,6 +27,7 @@
 @Getter
 @Setter
 public class RqueueWebConfig {
+
   /**
    * Control whether web app is enabled or not. If it's marked false then it will throw HTTP 503
    * (Service unavailable) error.

rqueue-core/src/main/java/com/github/sonus21/rqueue/config/RqueueWebConfig.java

@@ -236,8 +236,8 @@ public void setMaxNumWorkers(int maxNumWorkers) {
   /**
    * Message converter must be configured before calling this method.
    *
-   * @throws IllegalAccessException when messageConverterProvider is null
    * @return the message converter object
+   * @throws IllegalAccessException when messageConverterProvider is null
    */
   public MessageConverter getMessageConverter() throws IllegalAccessException {
     if (messageConverterProvider == null) {
@@ -249,15 +249,17 @@ public MessageConverter getMessageConverter() throws IllegalAccessException {
   /**
    * Rqueue configures a default message converter that can convert message to/from for any object.
    *
-   * @see DefaultMessageConverterProvider
    * @param messageConverterProvider the message converter provider
+   * @see DefaultMessageConverterProvider
    */
   public void setMessageConverterProvider(MessageConverterProvider messageConverterProvider) {
     notNull(messageConverterProvider, "messageConverterProvider must not be null");
     this.messageConverterProvider = messageConverterProvider;
   }
 
-  /** @return get Redis connection factor */
+  /**
+   * @return get Redis connection factor
+   */
   public RedisConnectionFactory getRedisConnectionFactory() {
     return redisConnectionFactory;
   }
@@ -273,7 +275,9 @@ public void setRedisConnectionFactory(RedisConnectionFactory redisConnectionFact
     this.redisConnectionFactory = redisConnectionFactory;
   }
 
-  /** @return message template */
+  /**
+   * @return message template
+   */
   public RqueueMessageTemplate getRqueueMessageTemplate() {
     return rqueueMessageTemplate;
   }

rqueue-core/src/main/java/com/github/sonus21/rqueue/config/SimpleRqueueListenerContainerFactory.java

@@ -42,6 +42,7 @@
  */
 @Slf4j
 public class GenericMessageConverter implements SmartMessageConverter {
+
   private final SmartMessageSerDes smartMessageSerDes;
 
   public GenericMessageConverter() {
@@ -85,6 +86,7 @@ public Message<?> toMessage(Object payload, MessageHeaders headers, Object conve
     log.trace("Payload: {} headers: {} hint: {}", payload, headers, conversionHint);
     return toMessage(payload, headers);
   }
+
   /**
    * Convert the payload of a {@link Message} from a serialized form to a typed Object of type
    * stored in message it self.
@@ -113,11 +115,13 @@ public Object fromMessage(Message<?> message, Class<?> targetClass) {
   @NoArgsConstructor
   @AllArgsConstructor
   private static class Msg {
+
     private String msg;
     private String name;
   }
 
   public static class SmartMessageSerDes {
+
     private final ObjectMapper objectMapper;
 
     public SmartMessageSerDes(ObjectMapper objectMapper) {

rqueue-core/src/main/java/com/github/sonus21/rqueue/converter/GenericMessageConverter.java

@@ -41,6 +41,7 @@
  */
 @Slf4j
 public class JsonMessageConverter implements MessageConverter {
+
   private final ObjectMapper objectMapper;
 
   public JsonMessageConverter() {

rqueue-core/src/main/java/com/github/sonus21/rqueue/converter/JsonMessageConverter.java

@@ -33,6 +33,7 @@
 
 @Slf4j
 public class RqueueRedisSerializer implements RedisSerializer<Object> {
+
   private final RedisSerializer<Object> serializer;
 
   public RqueueRedisSerializer(RedisSerializer<Object> redisSerializer) {

rqueue-core/src/main/java/com/github/sonus21/rqueue/converter/RqueueRedisSerializer.java

@@ -35,6 +35,7 @@
  * com.github.sonus21.rqueue.annotation.RqueueListener}.
  */
 public final class EndpointRegistry {
+
   private static final Object lock = new Object();
   private static final Map<String, QueueDetail> queueNameToDetail = new HashMap<>();
 

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

@@ -130,8 +130,8 @@ public interface Job {
   /**
    * The current status of this job, the message can have different status.
    *
-   * @see MessageMetadata
    * @return job status
+   * @see MessageMetadata
    */
   JobStatus getStatus();
 

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

@@ -54,6 +54,7 @@
 
 public abstract class MessageScheduler
     implements DisposableBean, ApplicationListener<RqueueBootstrapEvent> {
+
   private final Object monitor = new Object();
   @Autowired protected RqueueSchedulerConfig rqueueSchedulerConfig;
   @Autowired protected RqueueConfig rqueueConfig;
@@ -255,6 +256,7 @@ protected long getMinDelay() {
   }
 
   private class QueueScheduler {
+
     private void updateLastScheduleTime(String queueName, long time) {
       queueNameToLastMessageScheduleTime.put(queueName, time);
     }
@@ -354,6 +356,7 @@ private void checkExistingTask(
   @ToString
   @AllArgsConstructor
   private class MessageMoverTask implements Runnable {
+
     private final String name;
     private final String queueName;
     private final String zsetName;
@@ -388,6 +391,7 @@ public String getName() {
   }
 
   private class MessageSchedulerListener implements MessageListener {
+
     private void handleMessage(String queueName, Long startTime) {
       long lastSeenTime = getLastScheduleTime(queueName);
       long currentTime = System.currentTimeMillis();

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

@@ -27,6 +27,7 @@
 
 @Slf4j
 public class ProcessingQueueMessageScheduler extends MessageScheduler {
+
   private Map<String, Long> queueNameToDelay;
 
   @Override

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

@@ -25,6 +25,7 @@
 import reactor.core.publisher.Mono;
 
 public interface ReactiveRqueueMessageEnqueuer {
+
   /**
    * Enqueue a message on given queue, consume as soon as possible.
    *

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

@@ -27,6 +27,7 @@
 @SuppressWarnings("unchecked")
 @ToString
 public class RedisScriptFactory {
+
   public static <T> RedisScript<T> getScript(ScriptType type) {
     Resource resource = new ClassPathResource(type.getPath());
     DefaultRedisScript<T> script = new DefaultRedisScript<>();

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

@@ -33,6 +33,7 @@
 @Getter
 @Setter
 public class RqueueBeanProvider {
+
   @Autowired private RqueueMessageMetadataService rqueueMessageMetadataService;
   @Autowired private RqueueSystemConfigDao rqueueSystemConfigDao;
   @Autowired private RqueueJobDao rqueueJobDao;