merge: resolve conflict in JetStreamMessageBroker — keep ADR-51 header constants

Origin added a static CAPS field; our branch replaced it with per-instance
dynamic capabilities and added ADR-51 scheduling header constants. Keep ours.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: sonus21

rqueue-core/src/main/java/com/github/sonus21/rqueue/core/spi/Capabilities.java

@@ -23,5 +23,6 @@ public record Capabilities(
     boolean usesPrimaryHandlerDispatch,
     boolean supportsViewData,
     boolean supportsMoveMessage) {
-  public static final Capabilities REDIS_DEFAULTS = new Capabilities(true, true, true, true, true, true);
+  public static final Capabilities REDIS_DEFAULTS =
+      new Capabilities(true, true, true, true, true, true);
 }

rqueue-core/src/main/java/com/github/sonus21/rqueue/models/request/ChartDataRequest.java

@@ -40,6 +40,7 @@ public class ChartDataRequest extends SerializableBase {
   private ChartType type;
   private String queue;
   private int number;
+
   @JsonProperty("aggregationType")
   private AggregationType aggregationType;
 

rqueue-core/src/main/java/com/github/sonus21/rqueue/models/request/MessageMoveRequest.java

@@ -37,9 +37,12 @@ public class MessageMoveRequest implements Serializable {
 
   private static final long serialVersionUID = -5105668034442269108L;
   private String src;
+
   @JsonProperty("srcType")
   private DataType srcType;
+
   private String dst;
+
   @JsonProperty("dstType")
   private DataType dstType;
 

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

@@ -67,7 +67,8 @@ class RqueueMessageEnqueuerBrokerRoutingTest extends TestBase {
   private static final QueueDetail queueDetail = TestUtils.createQueueDetail(queue);
   private static final RqueueMessageIdGenerator FIXED_ID = () -> "fixed-id";
   // NATS-shaped: not the primary-handler-dispatch (Redis) capability set.
-  private static final Capabilities NATS_LIKE = new Capabilities(true, false, false, false, false, false);
+  private static final Capabilities NATS_LIKE =
+      new Capabilities(true, false, false, false, false, false);
 
   private final MessageConverter messageConverter = new DefaultRqueueMessageConverter();
   private final MessageHeaders messageHeaders = RqueueMessageHeaders.emptyMessageHeaders();

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

@@ -180,7 +180,8 @@ public void close() {
   void brokerWithPrimaryHandlerDispatchUsesNormalStartQueuePath() throws Exception {
     EndpointRegistry.delete();
     // Capabilities with usesPrimaryHandlerDispatch=true (e.g. NATS after the refactor).
-    CountingBroker broker = new CountingBroker(new Capabilities(true, false, false, true, true, true));
+    CountingBroker broker =
+        new CountingBroker(new Capabilities(true, false, false, true, true, true));
     TrackingContainer container = new TrackingContainer(messageHandler);
     container.setMessageBroker(broker);
     container.afterPropertiesSet();
@@ -223,7 +224,8 @@ void redisDefaultsBrokerAlsoUsesNormalStartQueuePath() throws Exception {
   @Test
   void pollerForwardsPollingIntervalAsBrokerFetchWait() throws Exception {
     EndpointRegistry.delete();
-    CountingBroker broker = new CountingBroker(new Capabilities(true, false, false, true, true, true));
+    CountingBroker broker =
+        new CountingBroker(new Capabilities(true, false, false, true, true, true));
     RqueueMessageListenerContainer container =
         new RqueueMessageListenerContainer(messageHandler, rqueueMessageTemplate);
     container.rqueueBeanProvider = beanProvider;