You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2017/09/25 17:26:32 UTC
activemq git commit: AMQ-6823 Ensure that MessagePull is works across
HTTP transport
Repository: activemq
Updated Branches:
refs/heads/master 62ce85265 -> a21dd4052
AMQ-6823 Ensure that MessagePull is works across HTTP transport
The MessagePull command needs to have the transients initialized such
that the pull operation works across transports that use XStream or
other marshaling that doesn't performs custom serialization.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/a21dd405
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/a21dd405
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/a21dd405
Branch: refs/heads/master
Commit: a21dd40527d1576c8fa0029ca2996961af12bb9a
Parents: 62ce852
Author: Timothy Bish <ta...@gmail.com>
Authored: Mon Sep 25 13:26:18 2017 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Mon Sep 25 13:26:18 2017 -0400
----------------------------------------------------------------------
.../apache/activemq/command/MessagePull.java | 9 +-
.../transport/http/HttpPullConsumerTest.java | 211 +++++++++++++++++++
2 files changed, 219 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/a21dd405/activemq-client/src/main/java/org/apache/activemq/command/MessagePull.java
----------------------------------------------------------------------
diff --git a/activemq-client/src/main/java/org/apache/activemq/command/MessagePull.java b/activemq-client/src/main/java/org/apache/activemq/command/MessagePull.java
index 57a25f9..aa5a279 100644
--- a/activemq-client/src/main/java/org/apache/activemq/command/MessagePull.java
+++ b/activemq-client/src/main/java/org/apache/activemq/command/MessagePull.java
@@ -25,7 +25,7 @@ import org.apache.activemq.state.CommandVisitor;
*
*
*/
-public class MessagePull extends BaseCommand {
+public class MessagePull extends BaseCommand implements TransientInitializer {
public static final byte DATA_STRUCTURE_TYPE = CommandTypes.MESSAGE_PULL;
@@ -142,4 +142,11 @@ public class MessagePull extends BaseCommand {
public void setAlwaysSignalDone(boolean alwaysSignalDone) {
this.alwaysSignalDone = alwaysSignalDone;
}
+
+ @Override
+ public void initTransients() {
+ quantity = 1;
+ alwaysSignalDone = false;
+ tracked = false;
+ }
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/a21dd405/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpPullConsumerTest.java
----------------------------------------------------------------------
diff --git a/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpPullConsumerTest.java b/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpPullConsumerTest.java
new file mode 100644
index 0000000..e2fa7d2
--- /dev/null
+++ b/activemq-http/src/test/java/org/apache/activemq/transport/http/HttpPullConsumerTest.java
@@ -0,0 +1,211 @@
+/*
+ * 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.transport.http;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.URI;
+
+import javax.jms.BytesMessage;
+import javax.jms.Destination;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.net.ServerSocketFactory;
+
+import org.apache.activemq.ActiveMQConnection;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.transport.ws.WSTransportTestSupport;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ */
+public class HttpPullConsumerTest {
+
+ private static final Logger LOG = LoggerFactory.getLogger(WSTransportTestSupport.class);
+
+ @Rule
+ public TestName name = new TestName();
+
+ private int proxyPort = 0;
+
+ protected ActiveMQConnectionFactory factory;
+ protected ActiveMQConnection connection;
+ protected BrokerService broker;
+ protected URI httpConnectUri;
+
+ @Before
+ public void setUp() throws Exception {
+ LOG.info("========== Starting test: {} ==========", name.getMethodName());
+ broker = createBroker(true, true);
+
+ factory = new ActiveMQConnectionFactory(getHttpConnectionURI());
+ factory.getPrefetchPolicy().setAll(0);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ try {
+ stopBroker();
+ } catch(Exception e) {
+ LOG.warn("Error on Broker stop.");
+ }
+
+ try {
+ if (connection != null) {
+ connection.close();
+ }
+ } catch (Exception e) {
+ }
+
+ LOG.info("========== Finished test: {} ==========", name.getMethodName());
+ }
+
+ @Test(timeout = 30000)
+ public void testTextMessage() throws Exception {
+ connection = (ActiveMQConnection) factory.createConnection();
+
+ // Receive a message with the JMS API
+ connection.start();
+ Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ Destination destination = session.createQueue(getTestName());
+ MessageConsumer consumer = session.createConsumer(destination);
+ MessageProducer producer = session.createProducer(destination);
+
+ // Send the message.
+ {
+ TextMessage message = session.createTextMessage();
+ message.setText("Hi");
+ producer.send(message);
+ }
+
+ // Check the Message
+ {
+ TextMessage message = (TextMessage)consumer.receive(2000);
+ assertNotNull(message);
+ assertEquals("Hi", message.getText());
+ }
+
+ assertNull(consumer.receiveNoWait());
+ }
+
+ @Test(timeout = 30000)
+ public void testBytesMessageLength() throws Exception {
+ connection = (ActiveMQConnection) factory.createConnection();
+
+ // Receive a message with the JMS API
+ connection.start();
+ Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ Destination destination = session.createQueue(getTestName());
+ MessageConsumer consumer = session.createConsumer(destination);
+ MessageProducer producer = session.createProducer(destination);
+
+ // Send the message
+ {
+ BytesMessage message = session.createBytesMessage();
+ message.writeInt(1);
+ message.writeInt(2);
+ message.writeInt(3);
+ message.writeInt(4);
+ producer.send(message);
+ }
+
+ // Check the message.
+ {
+ BytesMessage message = (BytesMessage)consumer.receive(1000);
+ assertNotNull(message);
+ assertEquals(16, message.getBodyLength());
+ }
+
+ assertNull(consumer.receiveNoWait());
+ }
+
+ protected String getHttpConnectionURI() {
+ return "http://127.0.0.1:" + getProxyPort() + "?trace=true";
+ }
+
+ protected String getHttpConnectorURI() {
+ return "http://127.0.0.1:" + getProxyPort() +
+ "?trace=true&transport.trace=true";
+ }
+
+ protected BrokerService createBroker(boolean deleteMessages, boolean advisorySupport) throws Exception {
+
+ BrokerService broker = new BrokerService();
+
+ httpConnectUri = broker.addConnector(getHttpConnectorURI()).getPublishableConnectURI();
+
+ broker.setAdvisorySupport(advisorySupport);
+ broker.setUseJmx(true);
+ broker.getManagementContext().setCreateConnector(false);
+ broker.setPersistent(isPersistent());
+ broker.setDeleteAllMessagesOnStartup(deleteMessages);
+ broker.start();
+ broker.waitUntilStarted();
+
+ return broker;
+ }
+
+ protected boolean isPersistent() {
+ return false;
+ }
+
+ protected String getTestName() {
+ return name.getMethodName();
+ }
+
+ protected int getProxyPort() {
+ if (proxyPort == 0) {
+ ServerSocket ss = null;
+ try {
+ ss = ServerSocketFactory.getDefault().createServerSocket(0);
+ proxyPort = ss.getLocalPort();
+ } catch (IOException e) { // ignore
+ } finally {
+ try {
+ if (ss != null ) {
+ ss.close();
+ }
+ } catch (IOException e) { // ignore
+ }
+ }
+ }
+
+ return proxyPort;
+ }
+
+ protected void stopBroker() throws Exception {
+ if (broker != null) {
+ broker.stop();
+ broker.waitUntilStopped();
+ broker = null;
+ }
+ }
+}