Skip to content

Make constants for custom acknowledge modes public #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vpavic wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make constants for custom acknowledge modes public #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 2 additions & 3 deletions qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
22 changes: 9 additions & 13 deletions qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsSessionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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());
Expand All @@ -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());
Expand All @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions ...nt/src/test/java/org/apache/qpid/jms/integration/AmqpAcknowledgementsIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down Expand Up @@ -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;
Expand Down
7 changes: 3 additions & 4 deletions qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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 {
Expand Down
13 changes: 7 additions & 6 deletions ...jms-client/src/test/java/org/apache/qpid/jms/integration/NoAckSessionIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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");

Expand Down Expand Up @@ -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 ---------------------------------------//
Expand Down
4 changes: 1 addition & 3 deletions qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down