From 937fa974f83303559742bf2b2e1a4f961bb8ed92 Mon Sep 17 00:00:00 2001
From: Vedran Pavic <vedran@vedranpavic.com>
Date: Tue, 21 Apr 2026 23:51:10 +0200
Subject: [PATCH] Make constants for custom acknowledge modes public

In order to make existing constants for custom acknowledge modes in
`JmsSession` reusable in similar fashion to those from
`jakarta.jms.Session`, this commit changes their visibility from
`private` to `public`.

Signed-off-by: Vedran Pavic <vedran@vedranpavic.com>
---
 .../java/org/apache/qpid/jms/JmsSession.java  |  6 ++---
 .../qpid/jms/provider/amqp/AmqpConsumer.java  |  5 ++---
 .../org/apache/qpid/jms/JmsSessionTest.java   | 22 ++++++++-----------
 .../AmqpAcknowledgementsIntegrationTest.java  |  4 ++--
 .../integration/ConsumerIntegrationTest.java  |  7 +++---
 .../NoAckSessionIntegrationTest.java          | 13 ++++++-----
 .../integration/SessionIntegrationTest.java   |  4 +---
 7 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java
index 31d0cd322..5a6e4cc14 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java
@@ -108,9 +108,9 @@ public class JmsSession implements AutoCloseable, Session, QueueSession, TopicSe
 
     private static final Logger LOG = LoggerFactory.getLogger(JmsSession.class);
 
-    private static final int INDIVIDUAL_ACKNOWLEDGE = 101;
-    private static final int ARTEMIS_PRE_ACKNOWLEDGE = 100;
-    private static final int NO_ACKNOWLEDGE = 257;
+    public static final int INDIVIDUAL_ACKNOWLEDGE = 101;
+    public static final int ARTEMIS_PRE_ACKNOWLEDGE = 100;
+    public static final int NO_ACKNOWLEDGE = 257;
 
     private final JmsConnection connection;
     private final int acknowledgementMode;
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
index 696a6984c..4b9813a50 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
@@ -27,6 +27,7 @@
 import jakarta.jms.Session;
 
 import org.apache.qpid.jms.JmsDestination;
+import org.apache.qpid.jms.JmsSession;
 import org.apache.qpid.jms.message.JmsInboundMessageDispatch;
 import org.apache.qpid.jms.message.JmsMessage;
 import org.apache.qpid.jms.meta.JmsConsumerId;
@@ -55,8 +56,6 @@ public class AmqpConsumer extends AmqpAbstractResource<JmsConsumerInfo, Receiver
 
     private static final Logger LOG = LoggerFactory.getLogger(AmqpConsumer.class);
 
-    private static final int INDIVIDUAL_ACKNOWLEDGE = 101;
-
     protected final AmqpSession session;
     protected final int acknowledgementMode;
     protected AsyncResult stopRequest;
@@ -91,7 +90,7 @@ private void acknowledgeUndeliveredRecoveredMessages() {
         if (acknowledgementMode == Session.CLIENT_ACKNOWLEDGE
                 || acknowledgementMode == Session.AUTO_ACKNOWLEDGE
                     || acknowledgementMode == Session.DUPS_OK_ACKNOWLEDGE
-                        || acknowledgementMode == INDIVIDUAL_ACKNOWLEDGE) {
+                        || acknowledgementMode == JmsSession.INDIVIDUAL_ACKNOWLEDGE) {
             // Send dispositions for any messages which were previously delivered and
             // session recovered, but were then not delivered again afterwards.
             Delivery delivery = getEndpoint().head();
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsSessionTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsSessionTest.java
index 429cfbc0f..e03b003ba 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsSessionTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsSessionTest.java
@@ -49,10 +49,6 @@
  */
 public class JmsSessionTest extends JmsConnectionTestSupport {
 
-    private static final int NO_ACKNOWLEDGE = 257;
-    private static final int ARTEMIS_PRE_ACKNOWLEDGE = 100;
-    private static final int INDIVIDUAL_ACKNOWLEDGE = 101;
-
     @Override
     @BeforeEach
     public void setUp(TestInfo testInfo) throws Exception {
@@ -85,12 +81,12 @@ public void testGetAcknowledgementMode() throws JMSException {
         assertEquals(Session.DUPS_OK_ACKNOWLEDGE, session.getAcknowledgeMode());
         session = (JmsSession) connection.createSession(true, Session.SESSION_TRANSACTED);
         assertEquals(Session.SESSION_TRANSACTED, session.getAcknowledgeMode());
-        session = (JmsSession) connection.createSession(false, NO_ACKNOWLEDGE);
-        assertEquals(NO_ACKNOWLEDGE, session.getAcknowledgeMode());
-        session = (JmsSession) connection.createSession(false, ARTEMIS_PRE_ACKNOWLEDGE);
-        assertEquals(ARTEMIS_PRE_ACKNOWLEDGE, session.getAcknowledgeMode());
-        session = (JmsSession) connection.createSession(false, INDIVIDUAL_ACKNOWLEDGE);
-        assertEquals(INDIVIDUAL_ACKNOWLEDGE, session.getAcknowledgeMode());
+        session = (JmsSession) connection.createSession(false, JmsSession.NO_ACKNOWLEDGE);
+        assertEquals(JmsSession.NO_ACKNOWLEDGE, session.getAcknowledgeMode());
+        session = (JmsSession) connection.createSession(false, JmsSession.ARTEMIS_PRE_ACKNOWLEDGE);
+        assertEquals(JmsSession.ARTEMIS_PRE_ACKNOWLEDGE, session.getAcknowledgeMode());
+        session = (JmsSession) connection.createSession(false, JmsSession.INDIVIDUAL_ACKNOWLEDGE);
+        assertEquals(JmsSession.INDIVIDUAL_ACKNOWLEDGE, session.getAcknowledgeMode());
     }
 
     @Test
@@ -129,7 +125,7 @@ public void testIsClientAcknowledge() throws JMSException {
     @Test
     @Timeout(10)
     public void testIsNoAcknowledge() throws JMSException {
-        JmsSession session = (JmsSession) connection.createSession(false, NO_ACKNOWLEDGE);
+        JmsSession session = (JmsSession) connection.createSession(false, JmsSession.NO_ACKNOWLEDGE);
         assertFalse(session.isAutoAcknowledge());
         assertFalse(session.isClientAcknowledge());
         assertFalse(session.isDupsOkAcknowledge());
@@ -140,7 +136,7 @@ public void testIsNoAcknowledge() throws JMSException {
     @Test
     @Timeout(10)
     public void testIsNoAcknowledgeWithArtemisMode() throws JMSException {
-        JmsSession session = (JmsSession) connection.createSession(false, ARTEMIS_PRE_ACKNOWLEDGE);
+        JmsSession session = (JmsSession) connection.createSession(false, JmsSession.ARTEMIS_PRE_ACKNOWLEDGE);
         assertFalse(session.isAutoAcknowledge());
         assertFalse(session.isClientAcknowledge());
         assertFalse(session.isDupsOkAcknowledge());
@@ -160,7 +156,7 @@ public void testIsTransacted() throws JMSException {
     @Test
     @Timeout(10)
     public void testIsIndividualAcknowledge() throws JMSException {
-        JmsSession session = (JmsSession) connection.createSession(false, INDIVIDUAL_ACKNOWLEDGE);
+        JmsSession session = (JmsSession) connection.createSession(false, JmsSession.INDIVIDUAL_ACKNOWLEDGE);
         assertFalse(session.isAutoAcknowledge());
         assertFalse(session.isClientAcknowledge());
         assertFalse(session.isDupsOkAcknowledge());
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/AmqpAcknowledgementsIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/AmqpAcknowledgementsIntegrationTest.java
index fa3037a56..273797ca7 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/AmqpAcknowledgementsIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/AmqpAcknowledgementsIntegrationTest.java
@@ -39,6 +39,7 @@
 import jakarta.jms.Queue;
 import jakarta.jms.Session;
 
+import org.apache.qpid.jms.JmsSession;
 import org.apache.qpid.jms.message.JmsMessageSupport;
 import org.apache.qpid.jms.test.QpidJmsTestCase;
 import org.apache.qpid.jms.test.testpeer.TestAmqpPeer;
@@ -55,7 +56,6 @@
 
 public class AmqpAcknowledgementsIntegrationTest extends QpidJmsTestCase {
 
-    private static final int INDIVIDUAL_ACK = 101;
     private static final int SKIP = -1;
     private static final int INVALID = 99;
 
@@ -314,7 +314,7 @@ public void testAcknowledgeIndividualMessages()  throws Exception {
 
             testPeer.expectBegin();
 
-            Session session = connection.createSession(INDIVIDUAL_ACK);
+            Session session = connection.createSession(JmsSession.INDIVIDUAL_ACKNOWLEDGE);
             Queue queue = session.createQueue("myQueue");
 
             int msgCount = 6;
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java
index 9f91191bc..55a20cbdf 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java
@@ -53,6 +53,7 @@
 import org.apache.qpid.jms.JmsConnection;
 import org.apache.qpid.jms.JmsDefaultConnectionListener;
 import org.apache.qpid.jms.JmsOperationTimedOutException;
+import org.apache.qpid.jms.JmsSession;
 import org.apache.qpid.jms.message.JmsInboundMessageDispatch;
 import org.apache.qpid.jms.policy.JmsDefaultPrefetchPolicy;
 import org.apache.qpid.jms.test.QpidJmsTestCase;
@@ -87,8 +88,6 @@ public class ConsumerIntegrationTest extends QpidJmsTestCase {
 
     private static final Logger LOG = LoggerFactory.getLogger(ConsumerIntegrationTest.class);
 
-    private static final int INDIVIDUAL_ACKNOWLEDGE = 101;
-
     private final IntegrationTestFixture testFixture = new IntegrationTestFixture();
 
     @Test
@@ -1228,7 +1227,7 @@ public void testMessageListenerClosesItsConsumerAfterRecoverDupsOk() throws Exce
     @Test
     @Timeout(20)
     public void testMessageListenerClosesItsConsumerAfterRecoverIndividualAck() throws Exception {
-        doMessageListenerClosesItsConsumerTestImpl(true, false, INDIVIDUAL_ACKNOWLEDGE);
+        doMessageListenerClosesItsConsumerTestImpl(true, false, JmsSession.INDIVIDUAL_ACKNOWLEDGE);
     }
 
     @Test
@@ -1252,7 +1251,7 @@ public void testMessageListenerClosesItsConsumerBeforeRecoverDupsOk() throws Exc
     @Test
     @Timeout(20)
     public void testMessageListenerClosesItsConsumerBeforeRecoverIndividualAck() throws Exception {
-        doMessageListenerClosesItsConsumerTestImpl(false, true, INDIVIDUAL_ACKNOWLEDGE);
+        doMessageListenerClosesItsConsumerTestImpl(false, true, JmsSession.INDIVIDUAL_ACKNOWLEDGE);
     }
 
     private void doMessageListenerClosesItsConsumerTestImpl(boolean recoverAfterClose, boolean recoverBeforeClose, int ackMode) throws Exception {
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/NoAckSessionIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/NoAckSessionIntegrationTest.java
index ab71a33d9..219c7b35d 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/NoAckSessionIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/NoAckSessionIntegrationTest.java
@@ -32,6 +32,7 @@
 import jakarta.jms.TemporaryTopic;
 import jakarta.jms.Topic;
 
+import org.apache.qpid.jms.JmsSession;
 import org.apache.qpid.jms.test.QpidJmsTestCase;
 import org.apache.qpid.jms.test.testpeer.ListDescribedType;
 import org.apache.qpid.jms.test.testpeer.TestAmqpPeer;
@@ -57,7 +58,7 @@ public void testNoAckSessionDoesNotPresettleProducers() throws Exception {
             Connection connection = testFixture.establishConnecton(testPeer);
             testPeer.expectBegin();
 
-            Session session = connection.createSession(false, 100);
+            Session session = connection.createSession(false, JmsSession.ARTEMIS_PRE_ACKNOWLEDGE);
 
             Destination destination = session.createQueue("MyQueue");
 
@@ -95,31 +96,31 @@ public void testNoAckSessionDoesNotPresettleProducers() throws Exception {
     @Test
     @Timeout(20)
     public void testNoAckSessionAppliedToTopic() throws Exception {
-        doTestConsumerWithPresettleOptions(100, Topic.class);
+        doTestConsumerWithPresettleOptions(JmsSession.ARTEMIS_PRE_ACKNOWLEDGE, Topic.class);
     }
 
     @Test
     @Timeout(20)
     public void testNoAckSessionAppliedToTopicAltMode() throws Exception {
-        doTestConsumerWithPresettleOptions(257, Topic.class);
+        doTestConsumerWithPresettleOptions(JmsSession.NO_ACKNOWLEDGE, Topic.class);
     }
 
     @Test
     @Timeout(20)
     public void testNoAckSessionAppliedToQueue() throws Exception {
-        doTestConsumerWithPresettleOptions(100, Queue.class);
+        doTestConsumerWithPresettleOptions(JmsSession.ARTEMIS_PRE_ACKNOWLEDGE, Queue.class);
     }
 
     @Test
     @Timeout(20)
     public void testNoAckSessionAppliedToTempTopic() throws Exception {
-        doTestConsumerWithPresettleOptions(100, TemporaryTopic.class);
+        doTestConsumerWithPresettleOptions(JmsSession.ARTEMIS_PRE_ACKNOWLEDGE, TemporaryTopic.class);
     }
 
     @Test
     @Timeout(20)
     public void testNoAckSessionAppliedToTempQueue() throws Exception {
-        doTestConsumerWithPresettleOptions(100, TemporaryQueue.class);
+        doTestConsumerWithPresettleOptions(JmsSession.ARTEMIS_PRE_ACKNOWLEDGE, TemporaryQueue.class);
     }
 
     //----- Test Method implementation ---------------------------------------//
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
index c4c06d41d..b74d543c4 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
@@ -105,8 +105,6 @@ public class SessionIntegrationTest extends QpidJmsTestCase {
 
     private static final Logger LOG = LoggerFactory.getLogger(SessionIntegrationTest.class);
 
-    private static final int INDIVIDUAL_ACK = 101;
-
     private final IntegrationTestFixture testFixture = new IntegrationTestFixture();
 
     @Test
@@ -2281,7 +2279,7 @@ public void testAcknowledgeIndividualMessages()  throws Exception {
 
             testPeer.expectBegin();
 
-            Session session = connection.createSession(INDIVIDUAL_ACK);
+            Session session = connection.createSession(JmsSession.INDIVIDUAL_ACKNOWLEDGE);
             Queue queue = session.createQueue("myQueue");
 
             int msgCount = 5;