[activemq-artemis] branch main updated: ARTEMIS-4209 avoid double 'ID:' for 'User ID' when browsing AMQP msgs

[jbertram]

This is an automated email from the ASF dual-hosted git repository.

jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
     new 448a6dee02 ARTEMIS-4209 avoid double 'ID:' for 'User ID' when browsing 
AMQP msgs
448a6dee02 is described below

commit 448a6dee02427f722f7a85bf21292752c0a11672
Author: Justin Bertram <jbert...@apache.org>
AuthorDate: Thu Mar 16 10:39:31 2023 -0500

    ARTEMIS-4209 avoid double 'ID:' for 'User ID' when browsing AMQP msgs
---
 .../core/message/openmbean/MessageOpenTypeFactory.java       |  3 ++-
 .../tests/integration/management/QueueControlTest.java       | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/openmbean/MessageOpenTypeFactory.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/openmbean/MessageOpenTypeFactory.java
index 06d66f3a36..9cde38646c 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/openmbean/MessageOpenTypeFactory.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/openmbean/MessageOpenTypeFactory.java
@@ -127,7 +127,8 @@ public class MessageOpenTypeFactory<M extends Message> {
       rc.put(CompositeDataConstants.MESSAGE_ID, "" + m.getMessageID());
       rc.put(CompositeDataConstants.PROTOCOL, m.getProtocolName());
       if (m.getUserID() != null) {
-         rc.put(CompositeDataConstants.USER_ID, "ID:" + 
m.getUserID().toString());
+         String userID = m.getUserID().toString();
+         rc.put(CompositeDataConstants.USER_ID, userID.startsWith("ID:") ? 
userID : "ID:" + userID);
       } else {
          rc.put(CompositeDataConstants.USER_ID, "");
       }
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
index 66a7d5f045..19af20d74f 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
@@ -4090,12 +4090,24 @@ public class QueueControlTest extends 
ManagementTestBase {
 
       Assert.assertEquals(2, browse.length);
 
+      String userID = (String) browse[0].get("userID");
+
+      Assert.assertTrue(userID.startsWith("ID:"));
+
+      Assert.assertFalse(userID.startsWith("ID:ID:"));
+
       String body = (String) browse[0].get("text");
 
       Assert.assertNotNull(body);
 
       Assert.assertEquals("theAMQPBody", body);
 
+      userID = (String) browse[1].get("userID");
+
+      Assert.assertTrue(userID.startsWith("ID:"));
+
+      Assert.assertFalse(userID.startsWith("ID:ID:"));
+
       body = (String) browse[1].get("text");
 
       Assert.assertNotNull(body);