You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2019/11/23 23:05:11 UTC
[qpid-broker-j] branch 7.1.x updated (432e1f5 -> 99237c7)
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a change to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git.
from 432e1f5 NO-JIRA: Fix failing test with Java11 and TLS 1.3
new 47844e4 QPID-8380 : Add groupId to MessageInfo
new 9698710 QPID-8373 : Add deliveredToConsumerId to MessageInfo
new 443bfd3 QPID-8373 : Modify test to encourage synchronous send
new 99237c7 QPID-8373: Modify test to use synchrnous publishing and preconfigured receive interval
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/qpid/server/message/MessageInfo.java | 2 +
.../qpid/server/message/MessageInfoImpl.java | 18 +++++
.../tests/http/endtoend/message/MessageTest.java | 80 ++++++++++++++++++++--
3 files changed, 96 insertions(+), 4 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-broker-j] 02/04: QPID-8373 : Add deliveredToConsumerId to
MessageInfo
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 9698710d315620bd496f3ec9f231c02de3c5afdc
Author: Robert Godfrey <rg...@apache.org>
AuthorDate: Wed Nov 20 10:42:41 2019 +0100
QPID-8373 : Add deliveredToConsumerId to MessageInfo
(cherry picked from commit 5ef97289cea7b797e0c50fbeb6f2c91361da0b00)
---
.../apache/qpid/server/message/MessageInfo.java | 1 +
.../qpid/server/message/MessageInfoImpl.java | 10 +++++
.../tests/http/endtoend/message/MessageTest.java | 49 ++++++++++++++++++++--
3 files changed, 57 insertions(+), 3 deletions(-)
diff --git a/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfo.java b/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfo.java
index b0e720b..d0fdce5 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfo.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfo.java
@@ -36,6 +36,7 @@ public interface MessageInfo extends ManagedAttributeValue
int getDeliveryCount();
String getState();
String getDeliveredTo();
+ String getDeliveredToConsumerId();
Date getArrivalTime();
boolean isPersistent();
String getMessageId();
diff --git a/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfoImpl.java b/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfoImpl.java
index f495361..252950e 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfoImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfoImpl.java
@@ -25,6 +25,8 @@ import java.util.Date;
import java.util.LinkedHashMap;
import java.util.Map;
+import org.apache.qpid.server.model.Consumer;
+
public class MessageInfoImpl implements MessageInfo
{
private final String _deliveredTo;
@@ -52,6 +54,7 @@ public class MessageInfoImpl implements MessageInfo
private final Date _notValidBefore;
private final String _messageType;
private final String _groupId;
+ private final String _deliveredToConsumerId;
public MessageInfoImpl(final MessageInstance instance, final boolean includeHeaders)
{
@@ -60,6 +63,7 @@ public class MessageInfoImpl implements MessageInfo
MessageInstanceConsumer<?> acquiringConsumer = instance.getAcquiringConsumer();
_deliveredTo = acquiringConsumer == null ? null : String.valueOf(acquiringConsumer.getIdentifier());
+ _deliveredToConsumerId = (acquiringConsumer instanceof Consumer) ? String.valueOf(((Consumer<?,?>)acquiringConsumer).getId()) : null;
_arrivalTime = message.getArrivalTime() == 0L ? null : new Date(message.getArrivalTime());
_messageType = message.getMessageType();
_persistent = message.isPersistent();
@@ -150,6 +154,12 @@ public class MessageInfoImpl implements MessageInfo
}
@Override
+ public String getDeliveredToConsumerId()
+ {
+ return _deliveredToConsumerId;
+ }
+
+ @Override
public Date getArrivalTime()
{
return _arrivalTime == null ? null : new Date(_arrivalTime.getTime());
diff --git a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
index d1661e6..36afeed 100644
--- a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
+++ b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
@@ -32,8 +32,6 @@ import static org.hamcrest.Matchers.typeCompatibleWith;
import static org.junit.Assert.assertThat;
import static org.junit.Assume.assumeThat;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
@@ -57,7 +55,6 @@ import javax.jms.TextMessage;
import com.fasterxml.jackson.core.type.TypeReference;
import com.google.common.base.Strings;
-import com.google.common.io.ByteStreams;
import org.junit.Before;
import org.junit.Test;
@@ -153,6 +150,52 @@ public class MessageTest extends HttpTestBase
@Test
+ public void getAcquiredMessage() throws Exception
+ {
+
+ Connection connection = getConnection();
+ try
+ {
+ Session session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+ Queue queue = session.createQueue(QUEUE_NAME);
+
+ MessageProducer producer = session.createProducer(queue);
+ Message jmsMessage = session.createMessage();
+ producer.send(jmsMessage);
+
+ List<Map<String, Object>> messages = getHelper().postJson("queue/myqueue/getMessageInfo",
+ Collections.singletonMap("includeHeaders",
+ Boolean.FALSE),
+ LIST_MAP_TYPE_REF, SC_OK);
+ assertThat(messages.size(), is(equalTo(1)));
+ Map<String, Object> message = messages.get(0);
+
+ assertThat(message.get("deliveredToConsumerId"), is(nullValue()));
+ connection.start();
+ MessageConsumer consumer = session.createConsumer(queue);
+ jmsMessage = consumer.receive(5000);
+ assertThat(jmsMessage, is(notNullValue()));
+
+ messages = getHelper().postJson("queue/myqueue/getMessageInfo",
+ Collections.singletonMap("includeHeaders",
+ Boolean.FALSE),
+ LIST_MAP_TYPE_REF, SC_OK);
+ assertThat(messages.size(), is(equalTo(1)));
+
+ message = messages.get(0);
+
+ assertThat(message.get("deliveredToConsumerId"), is(notNullValue()));
+ }
+ finally
+ {
+ connection.close();
+ }
+
+ }
+
+
+
+ @Test
public void getJmsMapMessage() throws Exception
{
final String mapKey = "key";
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-broker-j] 04/04: QPID-8373: Modify test to use synchrnous
publishing and preconfigured receive interval
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 99237c7c10e556afb4724736ac6e85e1f991a91e
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Sat Nov 23 22:41:31 2019 +0000
QPID-8373: Modify test to use synchrnous publishing and preconfigured receive interval
(cherry picked from commit 55cc0b9e83a7e15c1b7aa990413b882836e11894)
---
.../org/apache/qpid/tests/http/endtoend/message/MessageTest.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
index 2be0603..bbe6ba7 100644
--- a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
+++ b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
@@ -153,8 +153,7 @@ public class MessageTest extends HttpTestBase
@Test
public void getAcquiredMessage() throws Exception
{
-
- Connection connection = getConnection();
+ Connection connection = getConnectionBuilder().setSyncPublish(true).build();
try
{
Session session = connection.createSession(false, Session.CLIENT_ACKNOWLEDGE);
@@ -175,7 +174,7 @@ public class MessageTest extends HttpTestBase
assertThat(message.get("deliveredToConsumerId"), is(nullValue()));
connection.start();
MessageConsumer consumer = session.createConsumer(queue);
- jmsMessage = consumer.receive(5000);
+ jmsMessage = consumer.receive(getReceiveTimeout());
assertThat(jmsMessage, is(notNullValue()));
messages = getHelper().postJson("queue/myqueue/getMessageInfo",
@@ -192,11 +191,8 @@ public class MessageTest extends HttpTestBase
{
connection.close();
}
-
}
-
-
@Test
public void getJmsMapMessage() throws Exception
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-broker-j] 01/04: QPID-8380 : Add groupId to MessageInfo
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 47844e4ea483538fb157cb5b6473e3a6d214df3c
Author: Robert Godfrey <rg...@apache.org>
AuthorDate: Tue Nov 19 11:39:15 2019 +0100
QPID-8380 : Add groupId to MessageInfo
(cherry picked from commit 1ffacb65710a9d1f46350b5361e337a76bd924ca)
---
.../apache/qpid/server/message/MessageInfo.java | 1 +
.../qpid/server/message/MessageInfoImpl.java | 8 ++++++
.../tests/http/endtoend/message/MessageTest.java | 33 +++++++++++++++++++++-
3 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfo.java b/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfo.java
index 055ec23..b0e720b 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfo.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfo.java
@@ -49,6 +49,7 @@ public interface MessageInfo extends ManagedAttributeValue
Date getTimestamp();
String getType();
String getUserId();
+ String getGroupId();
Map<String,Object> getHeaders();
Date getNotValidBefore();
String getInitialRoutingAddress();
diff --git a/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfoImpl.java b/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfoImpl.java
index 7626dc6..f495361 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfoImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/message/MessageInfoImpl.java
@@ -51,6 +51,7 @@ public class MessageInfoImpl implements MessageInfo
private final String _to;
private final Date _notValidBefore;
private final String _messageType;
+ private final String _groupId;
public MessageInfoImpl(final MessageInstance instance, final boolean includeHeaders)
{
@@ -73,6 +74,7 @@ public class MessageInfoImpl implements MessageInfo
_timestamp = messageHeader.getTimestamp() == 0L ? null : new Date(messageHeader.getTimestamp());
_type = messageHeader.getType();
_userId = messageHeader.getUserId();
+ _groupId = messageHeader.getGroupId();
if (instance.isAvailable())
{
_state = instance.isHeld() ? "Held" : "Available";
@@ -226,6 +228,12 @@ public class MessageInfoImpl implements MessageInfo
}
@Override
+ public String getGroupId()
+ {
+ return _groupId;
+ }
+
+ @Override
public Map<String, Object> getHeaders()
{
return _headers;
diff --git a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
index 4c525e3..d1661e6 100644
--- a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
+++ b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
@@ -90,7 +90,7 @@ public class MessageTest extends HttpTestBase
}
@Test
- public void getJmsMessage() throws Exception
+ public void getJmsMessageWithProperty() throws Exception
{
final String messageProperty = "myProp";
final String messagePropertyValue = "myValue";
@@ -122,6 +122,37 @@ public class MessageTest extends HttpTestBase
}
@Test
+ public void getJmsMessageWithGroupId() throws Exception
+ {
+ final String groupIdValue = "mygroup";
+
+ Connection connection = getConnection();
+ try
+ {
+ Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ MessageProducer producer = session.createProducer(session.createQueue(QUEUE_NAME));
+ Message message = session.createMessage();
+ message.setStringProperty("JMSXGroupID", groupIdValue);
+ producer.send(message);
+ }
+ finally
+ {
+ connection.close();
+ }
+
+ List<Map<String, Object>> messages = getHelper().postJson("queue/myqueue/getMessageInfo",
+ Collections.singletonMap("includeHeaders",
+ Boolean.FALSE),
+ LIST_MAP_TYPE_REF, SC_OK);
+ assertThat(messages.size(), is(equalTo(1)));
+
+ Map<String, Object> message = messages.get(0);
+
+ assertThat(message.get("groupId"), is(groupIdValue));
+ }
+
+
+ @Test
public void getJmsMapMessage() throws Exception
{
final String mapKey = "key";
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-broker-j] 03/04: QPID-8373 : Modify test to encourage
synchronous send
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 443bfd3298500c75088b6739e233909cc0e8c57a
Author: Robert Godfrey <rg...@apache.org>
AuthorDate: Sat Nov 23 15:04:15 2019 +0100
QPID-8373 : Modify test to encourage synchronous send
(cherry picked from commit c59342a4eb53fccfc6f7476e7321938f5bd9ac50)
---
.../java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
index 36afeed..2be0603 100644
--- a/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
+++ b/systests/qpid-systests-http-management/src/test/java/org/apache/qpid/tests/http/endtoend/message/MessageTest.java
@@ -44,6 +44,7 @@ import java.util.stream.IntStream;
import javax.jms.BytesMessage;
import javax.jms.Connection;
+import javax.jms.DeliveryMode;
import javax.jms.MapMessage;
import javax.jms.Message;
import javax.jms.MessageConsumer;
@@ -160,6 +161,7 @@ public class MessageTest extends HttpTestBase
Queue queue = session.createQueue(QUEUE_NAME);
MessageProducer producer = session.createProducer(queue);
+ producer.setDeliveryMode(DeliveryMode.PERSISTENT);
Message jmsMessage = session.createMessage();
producer.send(jmsMessage);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org