ARTEMIS-3556 use common protocol identifiers (except when unknown)

apache · Nov 6, 2021 · 3800136 · 3800136
1 parent 4f01182
commit 3800136
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 3 deletions.
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,8 +122,9 @@ public CoreMessage() {
       this.coreMessageObjectPools = null;
    }
 
+   @Override
    public String getProtocolName() {
-      return "CORE";
+      return ActiveMQClient.DEFAULT_CORE_PROTOCOL;
    }
 
    /** On core there's no delivery annotation */

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,7 @@ public class MessageInternalImpl implements MessageInternal {
 
    private CoreMessage message;
 
+   @Override
    public String getProtocolName() {
       // should normally not be visible in GUI
       return getClass().getName();

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,8 +260,9 @@ protected AMQPMessage(long messageFormat) {
       this.coreMessageObjectPools = null;
    }
 
+   @Override
    public String getProtocolName() {
-      return "AMQP";
+      return ProtonProtocolManagerFactory.AMQP_PROTOCOL_NAME;
    }
 
    public final MessageDataScanningStatus getDataScanningStatus() {

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,8 +33,9 @@
 // TODO: Implement this
 public class OpenwireMessage implements Message {
 
+   @Override
    public String getProtocolName() {
-      return "OPENWIRE";
+      return OpenWireProtocolManagerFactory.OPENWIRE_PROTOCOL_NAME;
    }
 
    @Override

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,7 @@ private void debugList(boolean fail,
 
    class FakeMessage implements Message {
 
+      @Override
       public String getProtocolName() {
          // should normally not be visible in GUI
          return getClass().getName();

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,7 @@ class FakeMessageWithID implements Message {
 
       final long id;
 
+      @Override
       public String getProtocolName() {
          // should normally not be visible in GUI
          return getClass().getName();