ARTEMIS-3556 use common protocol identifiers

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;

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java

@@ -121,6 +121,10 @@ public CoreMessage() {
       this.coreMessageObjectPools = null;
    }
 
+   public String getProtocolName() {
+      return "CORE";
+   }
+
    /** On core there's no delivery annotation */
    @Override
    public Object getAnnotation(SimpleString key) {

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageInternalImpl.java

@@ -36,6 +36,10 @@ public class MessageInternalImpl implements MessageInternal {
 
    private CoreMessage message;
 
+   public String getProtocolName() {
+      return "INTERNAL";
+   }
+
    public MessageInternalImpl(ICoreMessage message) {
       this.message = (CoreMessage) message;
    }

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/openmbean/MessageOpenTypeFactory.java

@@ -124,7 +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.getClass().getSimpleName());
+      rc.put(CompositeDataConstants.PROTOCOL, m.getProtocolName());
       if (m.getUserID() != null) {
          rc.put(CompositeDataConstants.USER_ID, "ID:" + m.getUserID().toString());
       } else {

artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java

@@ -260,6 +260,10 @@ protected AMQPMessage(long messageFormat) {
       this.coreMessageObjectPools = null;
    }
 
+   public String getProtocolName() {
+      return "AMQP";
+   }
+
    public final MessageDataScanningStatus getDataScanningStatus() {
       return MessageDataScanningStatus.valueOf(messageDataScanned);
    }

artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenwireMessage.java

@@ -33,6 +33,10 @@
 // TODO: Implement this
 public class OpenwireMessage implements Message {
 
+   public String getProtocolName() {
+      return "OPENWIRE";
+   }
+
    @Override
    public boolean containsProperty(SimpleString key) {
       return false;

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AcknowledgeTest.java

@@ -338,6 +338,10 @@ class FakeMessageWithID implements Message {
 
       final long id;
 
+      public String getProtocolName() {
+          return "FAKE";
+       }
+
       @Override
       public SimpleString getReplyTo() {
          return null;