You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2018/06/27 12:52:45 UTC
activemq git commit: AMQ-6575 - take message durability from publish
qos for retained messages, fix and test
Repository: activemq
Updated Branches:
refs/heads/master 8fd107559 -> 919ca96ce
AMQ-6575 - take message durability from publish qos for retained messages, fix and test
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/919ca96c
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/919ca96c
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/919ca96c
Branch: refs/heads/master
Commit: 919ca96cee67d7ceed06a5cc542628ddc21841e2
Parents: 8fd1075
Author: gtully <ga...@gmail.com>
Authored: Wed Jun 27 13:52:30 2018 +0100
Committer: gtully <ga...@gmail.com>
Committed: Wed Jun 27 13:52:30 2018 +0100
----------------------------------------------------------------------
.../transport/mqtt/MQTTProtocolConverter.java | 2 +-
.../mqtt/MQTTVirtualTopicSubscriptionsTest.java | 67 ++++++++++++++++++++
2 files changed, 68 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/919ca96c/activemq-mqtt/src/main/java/org/apache/activemq/transport/mqtt/MQTTProtocolConverter.java
----------------------------------------------------------------------
diff --git a/activemq-mqtt/src/main/java/org/apache/activemq/transport/mqtt/MQTTProtocolConverter.java b/activemq-mqtt/src/main/java/org/apache/activemq/transport/mqtt/MQTTProtocolConverter.java
index ca6b4cb..ff6ee43 100644
--- a/activemq-mqtt/src/main/java/org/apache/activemq/transport/mqtt/MQTTProtocolConverter.java
+++ b/activemq-mqtt/src/main/java/org/apache/activemq/transport/mqtt/MQTTProtocolConverter.java
@@ -550,7 +550,7 @@ public class MQTTProtocolConverter {
command.messageId(), clientId, connectionInfo.getConnectionId(), msg.getMessageId());
msg.setTimestamp(System.currentTimeMillis());
msg.setPriority((byte) Message.DEFAULT_PRIORITY);
- msg.setPersistent(command.qos() != QoS.AT_MOST_ONCE && !command.retain());
+ msg.setPersistent(command.qos() != QoS.AT_MOST_ONCE);
msg.setIntProperty(QOS_PROPERTY_NAME, command.qos().ordinal());
if (command.retain()) {
msg.setBooleanProperty(RetainedMessageSubscriptionRecoveryPolicy.RETAIN_PROPERTY, true);
http://git-wip-us.apache.org/repos/asf/activemq/blob/919ca96c/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTVirtualTopicSubscriptionsTest.java
----------------------------------------------------------------------
diff --git a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTVirtualTopicSubscriptionsTest.java b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTVirtualTopicSubscriptionsTest.java
index 052a7ee..578b2011 100644
--- a/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTVirtualTopicSubscriptionsTest.java
+++ b/activemq-mqtt/src/test/java/org/apache/activemq/transport/mqtt/MQTTVirtualTopicSubscriptionsTest.java
@@ -16,20 +16,34 @@
*/
package org.apache.activemq.transport.mqtt;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import org.apache.activemq.ActiveMQConnection;
+import org.apache.activemq.command.ActiveMQMessage;
+import org.apache.activemq.util.ByteSequence;
import org.apache.activemq.util.Wait;
import org.fusesource.mqtt.client.BlockingConnection;
import org.fusesource.mqtt.client.MQTT;
+import org.fusesource.mqtt.client.Message;
import org.fusesource.mqtt.client.QoS;
import org.fusesource.mqtt.client.Topic;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.jms.DeliveryMode;
+import javax.jms.MessageConsumer;
+import javax.jms.Session;
+import java.util.concurrent.TimeUnit;
/**
* Run the basic tests with the NIO Transport.
*/
public class MQTTVirtualTopicSubscriptionsTest extends MQTTTest {
+ private static final Logger LOG = LoggerFactory.getLogger(MQTTVirtualTopicSubscriptionsTest.class);
@Override
@Before
@@ -150,4 +164,57 @@ public class MQTTVirtualTopicSubscriptionsTest extends MQTTTest {
connection.disconnect();
}
}
+
+ @Test(timeout = 60 * 1000)
+ public void testRetainMessageDurability() throws Exception {
+ MQTT mqtt = createMQTTConnection();
+ mqtt.setClientId("sub");
+
+ final BlockingConnection connection = mqtt.blockingConnection();
+ connection.connect();
+
+ final String topicName = "foo/bah";
+
+ connection.subscribe(new Topic[] { new Topic(topicName, QoS.EXACTLY_ONCE)});
+
+
+ // jms client
+ ActiveMQConnection activeMQConnection = (ActiveMQConnection) cf.createConnection();
+ // MUST set to true to receive retained messages
+ activeMQConnection.setUseRetroactiveConsumer(true);
+ activeMQConnection.start();
+ Session s = activeMQConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ javax.jms.Queue consumerQ = s.createQueue("Consumer.RegularSub.VirtualTopic.foo.bah");
+ MessageConsumer consumer = s.createConsumer(consumerQ);
+
+
+ // publisher
+ final MQTTClientProvider provider = getMQTTClientProvider();
+ initializeConnection(provider);
+
+ // send retained message
+ final String RETAINED = "RETAINED_MESSAGE_TEXT";
+ provider.publish(topicName, RETAINED.getBytes(), EXACTLY_ONCE, true);
+
+ Message message = connection.receive(5, TimeUnit.SECONDS);
+ assertNotNull("got message", message);
+
+ String response = new String(message.getPayload());
+ LOG.info("Got message:" + response);
+
+
+ // jms - verify retained message is persistent
+ ActiveMQMessage activeMQMessage = (ActiveMQMessage) consumer.receive(5000);
+ assertNotNull("Should get retained message", activeMQMessage);
+ ByteSequence bs = activeMQMessage.getContent();
+ assertEquals(RETAINED, new String(bs.data, bs.offset, bs.length));
+ LOG.info("Got message with deliverMode:" + activeMQMessage.getJMSDeliveryMode());
+ assertEquals(DeliveryMode.PERSISTENT, activeMQMessage.getJMSDeliveryMode());
+
+ activeMQConnection.close();
+ connection.unsubscribe(new String[] { topicName });
+
+ connection.disconnect();
+ }
+
}