update code to use java 21

Author: sonus21

.github/workflows/pages.yaml

@@ -46,7 +46,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1 # Update to latest version as needed
         with:
-          ruby-version: '3.1' # Not needed with a .ruby-version file
+          ruby-version: '3.2' # Keep this aligned with docs/.ruby-version and nokogiri's Ruby requirement
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
           cache-version: 0 # Increment this number if you need to re-download cached gems
           working-directory: '${{ github.workspace }}/docs'
@@ -65,4 +65,4 @@ jobs:
           path: 'docs/_site/'
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v3
+        uses: actions/deploy-pages@v3

README.md

@@ -53,8 +53,8 @@ well, where all services code is in Spring.
 ### Requirements
 
 * Spring 5+, 6+, 7+
-* Java 1.8+,17
-* Spring boot 2+,3+,4+
+* Java 1.8+,17, 21
+* Spring boot 2+,3+
 * Lettuce client for Redis cluster
 * Read master preference for Redis cluster
 
@@ -68,23 +68,22 @@ Release Version: [Maven central](https://search.maven.org/search?q=g:com.github.
 
 **NOTE:**
 
-* For spring boot 2.x use Rqueue 2.x
-* For spring boot 3.x use Rqueue 3.x
+* For Spring Boot 3.x use Rqueue 3.x
 
 Get the latest one
 from [Maven central](https://search.maven.org/search?q=g:com.github.sonus21%20AND%20a:rqueue-spring-boot-starter)
 
 * Add dependency
   * Gradle
     ```groovy
-        implementation 'com.github.sonus21:rqueue-spring-boot-starter:2.13.1-RELEASE'
+        implementation 'com.github.sonus21:rqueue-spring-boot-starter:3.0.0-RELEASE'
     ```
   * Maven
     ```xml
      <dependency>
         <groupId>com.github.sonus21</groupId>
         <artifactId>rqueue-spring-boot-starter</artifactId>
-        <version>2.13.1-RELEASE</version>
+        <version>3.0.0-RELEASE</version>
     </dependency>
     ```
 
@@ -96,24 +95,22 @@ from [Maven central](https://search.maven.org/search?q=g:com.github.sonus21%20AN
 
 **NOTE**
 
-* For spring framework 5.x use rqueue-spring 2.x
-* For spring framework 6.x use rqueue-spring 3.x
-* For spring framework 7.x use rqueue-spring 4.x
+* For Spring Framework 6.x use Rqueue 3.x
 
 Get the latest one
 from [Maven central](https://search.maven.org/search?q=g:com.github.sonus21%20AND%20a:rqueue-spring)
 
 * Add Dependency
   * Gradle
     ```groovy
-        implementation 'com.github.sonus21:rqueue-spring:2.13.1-RELEASE'
+        implementation 'com.github.sonus21:rqueue-spring:3.0.0-RELEASE'
     ```
   * Maven
     ```xml
      <dependency>
        <groupId>com.github.sonus21</groupId>
        <artifactId>rqueue-spring</artifactId>
-       <version>2.13.1-RELEASE</version>
+       <version>3.0.0-RELEASE</version>
      </dependency>
     ```
 * Add annotation `EnableRqueue` on application config class

build.gradle

@@ -13,8 +13,11 @@ allprojects {
     apply plugin: "org.gradle.test-retry"
 
     java {
-        sourceCompatibility = "17"
-        targetCompatibility = "17"
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(21)
+        }
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     repositories {
@@ -24,10 +27,10 @@ allprojects {
 }
 
 ext {
-    springBootVersion = "4.0.1"
-    springVersion = "7.0.3"
-    springDataVersion = "4.0.2"
-    microMeterVersion = "1.16.2"
+    springBootVersion = "3.5.0"
+    springVersion = "6.2.0"
+    springDataVersion = "3.5.0"
+    microMeterVersion = "1.15.0"
 
     // logging dependencies
     lombokVersion = "1.18.42"
@@ -72,7 +75,7 @@ ext {
 
 subprojects {
     group = "com.github.sonus21"
-    version = "4.0.0-RELEASE"
+    version = "3.0.0-RELEASE"
 
     dependencies {
         // https://mvnrepository.com/artifact/org.springframework/spring-messaging

docs/.ruby-version

@@ -1 +1 @@
-3.1.0
+3.2.0

docs/CHANGELOG.md

@@ -46,10 +46,10 @@ This release fixes a critical bug where task multiplication caused excessive Red
 resource usage. For details, see issue #[193].
 
 
-## Release [3.0.1] 17-Jan-2022
+## Release [3.0.0] 17-Jan-2022
 
-We're so excited to release Rqueue `3.0.1`. This release supports the Java 17, Spring Boot 3.x and
-Spring Framework 6.x
+We're so excited to release Rqueue `3.0.0`. This release supports Java 21,
+Spring Boot 3.x and Spring Framework 6.x.
 
 ### [2.13.0] - 25-Dec-2022
 ### Fixes
@@ -382,9 +382,7 @@ Breaking change, for migration [see](./migration#1x-to-2x)
 
 [2.13.1]: https://repo1.maven.org/maven2/com/github/sonus21/rqueue-core/2.13.1-RELEASE
 
-[3.0.1]: https://repo1.maven.org/maven2/com/github/sonus21/rqueue-core/3.0.0-RELEASE
-
-[3.1.0]: https://repo1.maven.org/maven2/com/github/sonus21/rqueue-core/3.1.0-RELEASE
+[3.0.0]: https://repo1.maven.org/maven2/com/github/sonus21/rqueue-core/3.0.0-RELEASE
 
 [122]: https://github.com/sonus21/rqueue/issues/122
 [193]: https://github.com/sonus21/rqueue/issues/193

docs/Gemfile

@@ -1,4 +1,5 @@
 source "https://rubygems.org"
+ruby ">= 3.2.0"
 # Hello! This is where you manage which Jekyll version is used to run.
 # When you want to use a different version, change it below, save the
 # file and run `bundle install`. Run Jekyll with `bundle exec`, like so:

docs/index.md

@@ -50,8 +50,9 @@ frameworks.
 
 ### Requirements
 
-* Spring 5+, 6+, 7+
-* Spring Boot 2+, 3+, 4+
+* Spring 6+
+* Spring Boot 3+
+* Java 21+
 * Spring Reactive
 * Lettuce client for Redis cluster
 * Read master preference for Redis cluster
@@ -80,41 +81,24 @@ Redis Cluster compatibility. Failure to do so may prevent the application from s
 ### Spring Boot
 
 {: .warning }
-Use Rqueue Spring Boot Starter 4.x for Spring Boot 4.x, 3.x for Spring Boot 3.x, 
-and 2.x for Spring Boot 2.x.
+Use Rqueue Spring Boot Starter 3.x for Spring Boot 3.x.
 
 Download the latest version from [Maven Central][Boot Maven Central] and add the 
 dependency to your project:
 
-#### Spring Boot 2.x Setup
-
-* Gradle
-  ```groovy
-  implementation 'com.github.sonus21:rqueue-spring-boot-starter:2.13.1-RELEASE'
-  ```
-
-* Maven
-  ```xml
-  <dependency>
-      <groupId>com.github.sonus21</groupId>
-      <artifactId>rqueue-spring-boot-starter</artifactId>
-      <version>2.13.1-RELEASE</version>
-  </dependency>
-  ```
-
 #### Spring Boot 3.x Setup
 
 * Gradle
   ```groovy
-  implementation 'com.github.sonus21:rqueue-spring-boot-starter:3.1.0-RELEASE'
+  implementation 'com.github.sonus21:rqueue-spring-boot-starter:3.0.0-RELEASE'
   ```
 
 * Maven
   ```xml
   <dependency>
       <groupId>com.github.sonus21</groupId>
       <artifactId>rqueue-spring-boot-starter</artifactId>
-      <version>3.1.0-RELEASE</version>
+      <version>3.0.0-RELEASE</version>
   </dependency>
   ```
 
@@ -123,41 +107,24 @@ dependency to your project:
 ### Spring Framework
 
 {: .warning }
-Use Rqueue Spring 4.x for Spring Framework 7.x, 3.x for Spring Framework 6.x, 
-and 2.x for Spring Framework 5.x.
+Use Rqueue Spring 3.x for Spring Framework 6.x.
 
 Download the latest version from [Maven Central][Maven Central] and add the 
 dependency to your project:
 
-#### Spring Framework 5.x Setup
-
-* Gradle
-  ```groovy
-  implementation 'com.github.sonus21:rqueue-spring:2.13.1-RELEASE'
-  ```
-
-* Maven
-  ```xml
-  <dependency>
-      <groupId>com.github.sonus21</groupId>
-      <artifactId>rqueue-spring</artifactId>
-      <version>2.13.1-RELEASE</version>
-  </dependency>
-  ```
-
 #### Spring Framework 6.x Setup
 
 * Gradle
   ```groovy
-  implementation 'com.github.sonus21:rqueue-spring:3.1.0-RELEASE'
+  implementation 'com.github.sonus21:rqueue-spring:3.0.0-RELEASE'
   ```
 
 * Maven
   ```xml
   <dependency>
       <groupId>com.github.sonus21</groupId>
       <artifactId>rqueue-spring</artifactId>
-      <version>3.1.0-RELEASE</version>
+      <version>3.0.0-RELEASE</version>
   </dependency>
   ```
 

docs/message-handling/queue-priority.md

@@ -8,15 +8,18 @@ permalink: /priority
 ---
 
 Queue prioritization ensures that critical tasks are handled before lower-priority 
-ones. Rqueue supports two modes of priority handling:
+ones. Rqueue supports three modes of priority handling:
 
 1. **Weighted**: Polling frequency is based on numeric weights assigned to queues.
-2. **Strict**: Higher-priority queues are always polled first.
+2. **Strict**: Higher-priority queues are polled first, but starvation is considered
+   so lower-priority queues still get polling opportunities.
+3. **Hard Strict**: Messages are always fetched from the highest-priority queue first,
+   moving top-down only when that queue has no available message.
 
 ### Configuring Priority
 
 To enable priority handling:
-- Set `priorityMode` in the container factory to `STRICT` or `WEIGHTED`.
+- Set `priorityMode` in the container factory to `WEIGHTED`, `STRICT`, or `HARD_STRICT`.
 - Use the `priority` field in the `@RqueueListener` annotation to assign weights or levels.
 - Use the `priorityGroup` field to group multiple related queues. By default, queues with 
   specified priorities are added to a default group.
@@ -49,19 +52,32 @@ For implementation details, see [WeightedPriorityPoller][WeightedPriorityPoller]
 
 ### Strict Priority
 
-In strict mode, the poller always attempts to fetch messages from the highest-priority 
-queue first.
+In strict mode, the poller prefers the highest-priority queue first, but it also
+considers starvation so every queue continues to get polling chances over time.
 
 - The poller starts with Q1.
 - If Q1 is empty, it moves to Q2, then Q3.
-- If a queue is empty, it becomes inactive for the duration of the 
+- If a queue is empty, it becomes inactive for the duration of the
   **polling interval**.
-- To prevent total starvation of lower-priority queues, inactive queues become 
-  eligible for polling again after a maximum of 1 minute, even if higher-priority 
-  queues still have work.
+- If messages are not fetched from a lower-priority queue for a certain interval,
+  that queue becomes eligible again so it can be polled even while higher-priority
+  queues continue to receive traffic.
+- This gives lower-priority queues a chance to make progress and prevents permanent
+  starvation.
 
 For implementation details, see [StrictPriorityPoller][StrictPriorityPoller].
 
+### Hard Strict Priority
+
+In hard strict mode, the poller always follows a top-down priority order.
+
+- The poller starts with the highest-priority queue.
+- It continues to fetch from that queue as long as messages are available.
+- It moves to the next queue only when the current higher-priority queue has no
+  message available.
+- This approach keeps the queue order fully top-down and may starve lower-priority
+  queues while higher-priority queues continue to receive traffic.
+
 ### Additional Configuration
 
 * **`rqueue.add.default.queue.with.queue.level.priority`**: Determines if a "default" 

rqueue-core/build.gradle

@@ -53,7 +53,7 @@ dependencies {
     // https://mvnrepository.com/artifact/org.springframework/spring-webmvc
     api "org.springframework:spring-webmvc:${springVersion}"
     api "org.springframework:spring-webflux:${springVersion}"
-    api "io.pebbletemplates:pebble-spring7:${pebbleVersion}"
+    api "io.pebbletemplates:pebble-spring6:${pebbleVersion}"
     api "io.seruco.encoding:base62:${serucoEncodingVersion}"
     // https://mvnrepository.com/artifact/org.apache.commons/commons-collections4
     api "org.apache.commons:commons-collections4:${apacheCommonCollectionVerion}"
@@ -71,4 +71,4 @@ processResources {
         def contents = "Version: $version\n"
         new File(resourcesDir, "META-INF/RQUEUE.MF").text = contents
     }
-}
+}

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

@@ -22,7 +22,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
-import org.springframework.messaging.converter.JacksonJsonMessageConverter;
+import org.springframework.messaging.converter.MappingJackson2MessageConverter;
 import org.springframework.messaging.converter.MessageConverter;
 import org.springframework.messaging.support.GenericMessage;
 import tools.jackson.core.JacksonException;
@@ -37,7 +37,7 @@
  * <p>Target class is null till the time method arguments are not resolved, once method arguments
  * are resolved then it will become non-null.
  *
- * @see JacksonJsonMessageConverter
+ * @see MappingJackson2MessageConverter
  */
 @Slf4j
 public class JsonMessageConverter implements MessageConverter {