This is an automated email from the ASF dual-hosted git repository.
cshannon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/main by this push:
new 2c69e3074 AMQ-7309 - Implement JMS 2.0 createSession methods
new 160840d3b Merge pull request #978 from cshannon/AMQ-7309-session
2c69e3074 is described below
commit 2c69e30748c361ac3d62b6b3b37e703ac64a220b
Author: Christopher L. Shannon (cshannon) <[email protected]>
AuthorDate: Wed Feb 15 08:30:21 2023 -0500
AMQ-7309 - Implement JMS 2.0 createSession methods
Adds a real implemention for createSession() and createSession(ackMode)
methods on ActiveMQConnection
---
.../org/apache/activemq/ActiveMQConnection.java | 6 +-
.../activemq/jms2/ActiveMQJMS2ConnectionTest.java | 65 ++++++++++++++++++++++
2 files changed, 68 insertions(+), 3 deletions(-)
diff --git
a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
index 58d419725..2ccac1d99 100644
--- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
+++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java
@@ -317,7 +317,7 @@ public class ActiveMQConnection implements Connection,
TopicConnection, QueueCon
*/
@Override
public Session createSession() throws JMSException {
- throw new UnsupportedOperationException("createSession() is
unsupported");
+ return createSession(false, Session.AUTO_ACKNOWLEDGE);
}
/**
@@ -340,8 +340,8 @@ public class ActiveMQConnection implements Connection,
TopicConnection, QueueCon
* @since 2.0
*/
@Override
- public Session createSession(int sessionMode) throws JMSException {
- throw new UnsupportedOperationException("createSession(int
sessionMode) is unsupported");
+ public Session createSession(int acknowledgeMode) throws JMSException {
+ return createSession(acknowledgeMode == Session.SESSION_TRANSACTED,
acknowledgeMode);
}
/**
diff --git
a/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2ConnectionTest.java
b/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2ConnectionTest.java
new file mode 100644
index 000000000..d6765ad38
--- /dev/null
+++
b/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2ConnectionTest.java
@@ -0,0 +1,65 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.jms2;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import javax.jms.JMSException;
+import javax.jms.Session;
+import org.junit.Test;
+
+public class ActiveMQJMS2ConnectionTest extends ActiveMQJMS2TestBase {
+
+ @Test
+ public void testCreateSession() throws Exception {
+ verifySession(connection.createSession(), Session.AUTO_ACKNOWLEDGE);
+ }
+
+ @Test
+ public void testCreateSessionAckModeAuto() throws Exception {
+ verifySession(connection.createSession(Session.AUTO_ACKNOWLEDGE),
Session.AUTO_ACKNOWLEDGE);
+ }
+
+ @Test
+ public void testCreateSessionAckModeClient() throws Exception {
+ verifySession(connection.createSession(Session.CLIENT_ACKNOWLEDGE),
Session.CLIENT_ACKNOWLEDGE);
+ }
+
+ @Test
+ public void testCreateSessionAckModeDups() throws Exception {
+ verifySession(connection.createSession(Session.DUPS_OK_ACKNOWLEDGE),
Session.DUPS_OK_ACKNOWLEDGE);
+ }
+
+ @Test
+ public void testCreateSessionAckModeTrans() throws Exception {
+ verifySession(connection.createSession(Session.SESSION_TRANSACTED),
Session.SESSION_TRANSACTED);
+ }
+
+ private void verifySession(Session session, int acknowledgeMode) throws
JMSException {
+ try {
+ assertNotNull(session);
+ assertEquals(acknowledgeMode, session.getAcknowledgeMode());
+ assertEquals(acknowledgeMode == Session.SESSION_TRANSACTED,
session.getTransacted());
+ } finally {
+ if (session != null) {
+ session.close();
+ }
+ }
+ }
+
+}
