ARTEMIS-3556 show message protocol on message-view page

apache · Nov 11, 2021 · dde48d0 · dde48d0
1 parent 9f6d7a0
commit dde48d0
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 0 deletions.
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
@@ -330,6 +330,8 @@ default void rejectConsumer(long uniqueConsumerID) {
     */
    long getMessageID();
 
+   String getProtocolName();
+
    // used for NO-LOCAL: mainly for AMQP
    default Message setConnectionID(String connectionID) {
       return this;

diff --git a/...-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java b/...-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java
@@ -45,6 +45,7 @@
 import org.apache.activemq.artemis.api.core.RefCountMessage;
 import org.apache.activemq.artemis.api.core.RoutingType;
 import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
 import org.apache.activemq.artemis.core.buffers.impl.ChannelBufferWrapper;
 import org.apache.activemq.artemis.core.buffers.impl.ResetLimitWrappedActiveMQBuffer;
 import org.apache.activemq.artemis.core.message.LargeBodyReader;
@@ -121,6 +122,11 @@ public CoreMessage() {
       this.coreMessageObjectPools = null;
    }
 
+   @Override
+   public String getProtocolName() {
+      return ActiveMQClient.DEFAULT_CORE_PROTOCOL;
+   }
+
    /** On core there's no delivery annotation */
    @Override
    public Object getAnnotation(SimpleString key) {

diff --git a/...ient/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageInternalImpl.java b/...ient/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageInternalImpl.java
@@ -36,6 +36,12 @@ public class MessageInternalImpl implements MessageInternal {
 
    private CoreMessage message;
 
+   @Override
+   public String getProtocolName() {
+      // should normally not be visible in GUI
+      return getClass().getName();
+   }
+
    public MessageInternalImpl(ICoreMessage message) {
       this.message = (CoreMessage) message;
    }

diff --git a/.../main/java/org/apache/activemq/artemis/core/message/openmbean/CompositeDataConstants.java b/.../main/java/org/apache/activemq/artemis/core/message/openmbean/CompositeDataConstants.java
@@ -20,6 +20,7 @@ public interface CompositeDataConstants {
 
    String ADDRESS = "address";
    String MESSAGE_ID = "messageID";
+   String PROTOCOL = "protocol";
    String USER_ID = "userID";
    String TYPE = "type";
    String DURABLE = "durable";
@@ -35,6 +36,7 @@ public interface CompositeDataConstants {
 
    String ADDRESS_DESCRIPTION = "The Address";
    String MESSAGE_ID_DESCRIPTION = "The message ID";
+   String PROTOCOL_DESCRIPTION = "The message protocol";
    String USER_ID_DESCRIPTION = "The user ID";
    String TYPE_DESCRIPTION = "The message type";
    String DURABLE_DESCRIPTION = "Is the message durable";

diff --git a/.../main/java/org/apache/activemq/artemis/core/message/openmbean/MessageOpenTypeFactory.java b/.../main/java/org/apache/activemq/artemis/core/message/openmbean/MessageOpenTypeFactory.java
@@ -77,6 +77,7 @@ protected void init() throws OpenDataException {
       addItem(CompositeDataConstants.TYPE, CompositeDataConstants.TYPE_DESCRIPTION, SimpleType.BYTE);
       addItem(CompositeDataConstants.ADDRESS, CompositeDataConstants.ADDRESS_DESCRIPTION, SimpleType.STRING);
       addItem(CompositeDataConstants.MESSAGE_ID, CompositeDataConstants.MESSAGE_ID_DESCRIPTION, SimpleType.STRING);
+      addItem(CompositeDataConstants.PROTOCOL, CompositeDataConstants.PROTOCOL_DESCRIPTION, SimpleType.STRING);
       addItem(CompositeDataConstants.USER_ID, CompositeDataConstants.USER_ID_DESCRIPTION, SimpleType.STRING);
       addItem(CompositeDataConstants.DURABLE, CompositeDataConstants.DURABLE_DESCRIPTION, SimpleType.BOOLEAN);
       addItem(CompositeDataConstants.EXPIRATION, CompositeDataConstants.EXPIRATION_DESCRIPTION, SimpleType.LONG);
@@ -123,6 +124,7 @@ protected void init() throws OpenDataException {
    public Map<String, Object> getFields(M m, int valueSizeLimit, int deliveryCount) throws OpenDataException {
       Map<String, Object> rc = new HashMap<>();
       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());
       } else {

diff --git a/...-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java b/...-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
@@ -260,6 +260,11 @@ protected AMQPMessage(long messageFormat) {
       this.coreMessageObjectPools = null;
    }
 
+   @Override
+   public String getProtocolName() {
+      return ProtonProtocolManagerFactory.AMQP_PROTOCOL_NAME;
+   }
+
    public final MessageDataScanningStatus getDataScanningStatus() {
       return MessageDataScanningStatus.valueOf(messageDataScanned);
    }

diff --git a/...col/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenwireMessage.java b/...col/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenwireMessage.java
@@ -33,6 +33,11 @@
 // TODO: Implement this
 public class OpenwireMessage implements Message {
 
+   @Override
+   public String getProtocolName() {
+      return OpenWireProtocolManagerFactory.OPENWIRE_PROTOCOL_NAME;
+   }
+
    @Override
    public boolean containsProperty(SimpleString key) {
       return false;

diff --git a/.../test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java b/.../test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java
@@ -296,6 +296,12 @@ private void debugList(boolean fail,
 
    class FakeMessage implements Message {
 
+      @Override
+      public String getProtocolName() {
+         // should normally not be visible in GUI
+         return getClass().getName();
+      }
+
       @Override
       public SimpleString getReplyTo() {
          return null;

diff --git a/...s/src/test/java/org/apache/activemq/artemis/tests/integration/client/AcknowledgeTest.java b/...s/src/test/java/org/apache/activemq/artemis/tests/integration/client/AcknowledgeTest.java
@@ -338,6 +338,12 @@ class FakeMessageWithID implements Message {
 
       final long id;
 
+      @Override
+      public String getProtocolName() {
+         // should normally not be visible in GUI
+         return getClass().getName();
+      }
+
       @Override
       public SimpleString getReplyTo() {
          return null;