ARTEMIS-3475 avoiding possible recursion on toString and improving overal PacketImpl toString

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java

@@ -418,9 +418,14 @@ public class PacketImpl implements Packet {
       return true;
    }
 
+   /** extensions of this class are supposed to use getPacketString to provide toString functionality */
    @Override
-   public String toString() {
+   public final String toString() {
-      return getParentString() + "]";
+      return getPacketString() + "]";
+   }
+
+   protected String getPacketString() {
+      return this.getClass().getSimpleName() + "(" + this.getClass().getSimpleName() + ")[type=" + type + ", channelID=" + channelID + ", responseAsync=" + isResponseAsync() + ", requiresResponse=" + isRequiresResponse() + ", correlationID=" + getCorrelationID();
    }
 
    @Override
@@ -446,10 +451,6 @@ public class PacketImpl implements Packet {
       return (channelID == other.channelID) && (size == other.size) && (type != other.type);
    }
 
-   protected String getParentString() {
-      return "PACKET(" + this.getClass().getSimpleName() + ")[type=" + type + ", channelID=" + channelID + ", responseAsync=" + isResponseAsync() + ", requiresResponse=" + isRequiresResponse() + ", correlationID=" + getCorrelationID() + ", packetObject=" + this.getClass().getSimpleName();
-   }
-
    private int stringEncodeSize(final String str) {
       return DataConstants.SIZE_INT + str.length() * 2;
    }

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage.java

@@ -65,8 +65,8 @@ public class ActiveMQExceptionMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      return getParentString() + ", exception= " + exception + "]";
+      return super.getPacketString() + ", exception= " + exception;
    }
 
    @Override

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage_V2.java

@@ -68,11 +68,6 @@ public class ActiveMQExceptionMessage_V2 extends ActiveMQExceptionMessage {
       return this.correlationID;
    }
 
-   @Override
-   public String toString() {
-      return getParentString() + ", exception= " + exception + "]";
-   }
-
    @Override
    public int hashCode() {
       final int prime = 31;

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CheckFailoverMessage.java

@@ -43,10 +43,9 @@ public class CheckFailoverMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", nodeID=" + nodeID);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CheckFailoverReplyMessage.java

@@ -48,10 +48,9 @@ public class CheckFailoverReplyMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", okToFailover=" + okToFailover);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage.java

@@ -145,13 +145,12 @@ public class ClusterTopologyChangeMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", exit=" + exit);
       buff.append(", last=" + last);
       buff.append(", nodeID=" + nodeID);
       buff.append(", pair=" + pair);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V2.java

@@ -140,15 +140,14 @@ public class ClusterTopologyChangeMessage_V2 extends ClusterTopologyChangeMessag
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", exit=" + exit);
       buff.append(", last=" + last);
       buff.append(", nodeID=" + nodeID);
       buff.append(", pair=" + pair);
       buff.append(", backupGroupName=" + backupGroupName);
       buff.append(", uniqueEventID=" + uniqueEventID);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V3.java

@@ -90,17 +90,8 @@ public class ClusterTopologyChangeMessage_V3 extends ClusterTopologyChangeMessag
    }
 
    @Override
-   protected String getParentString() {
+   protected String getPacketString() {
-      return toString(false);
+      StringBuffer buff = new StringBuffer(super.getPacketString());
-   }
-
-   @Override
-   public String toString() {
-      return toString(true);
-   }
-
-   private String toString(boolean closed) {
-      StringBuffer buff = new StringBuffer(getParentString());
       buff.append(", exit=" + exit);
       buff.append(", last=" + last);
       buff.append(", nodeID=" + nodeID);
@@ -108,9 +99,6 @@ public class ClusterTopologyChangeMessage_V3 extends ClusterTopologyChangeMessag
       buff.append(", backupGroupName=" + backupGroupName);
       buff.append(", uniqueEventID=" + uniqueEventID);
       buff.append(", scaleDownGroupName=" + scaleDownGroupName);
-      if (closed) {
-         buff.append("]");
-      }
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage_V4.java

@@ -67,11 +67,10 @@ public class ClusterTopologyChangeMessage_V4 extends ClusterTopologyChangeMessag
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buf = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
-      buf.append(", clientVersion=" + serverVersion);
+      buff.append(", clientVersion=" + serverVersion);
-      buf.append("]");
+      return buff.toString();
-      return buf.toString();
    }
 
    @Override

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateAddressMessage.java

@@ -52,12 +52,11 @@ public class CreateAddressMessage extends PacketImpl {
    // Public --------------------------------------------------------
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", address=" + address);
       buff.append(", routingTypes=" + routingTypes);
       buff.append(", autoCreated=" + autoCreated);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage.java

@@ -68,15 +68,8 @@ public class CreateQueueMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
-      buff.append("]");
-      return buff.toString();
-   }
-
-   @Override
-   public String getParentString() {
-      StringBuffer buff = new StringBuffer(super.getParentString());
       buff.append(", address=" + address);
       buff.append(", queueName=" + queueName);
       buff.append(", filterString=" + filterString);

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage_V2.java

@@ -218,8 +218,8 @@ public class CreateQueueMessage_V2 extends CreateQueueMessage {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(super.getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", autoCreated=" + autoCreated);
       buff.append(", routingType=" + routingType);
       buff.append(", maxConsumers=" + maxConsumers);
@@ -239,8 +239,6 @@ public class CreateQueueMessage_V2 extends CreateQueueMessage {
       buff.append(", autoDeleteMessageCount=" + autoDeleteMessageCount);
       buff.append(", ringSize=" + ringSize);
       buff.append(", enabled=" + enabled);
-
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionMessage.java

@@ -215,17 +215,8 @@ public class CreateSessionMessage extends PacketImpl {
    }
 
    @Override
-   protected String getParentString() {
+   protected String getPacketString() {
-      return toString(false);
+      StringBuffer buff = new StringBuffer(super.getPacketString());
-   }
-
-   @Override
-   public String toString() {
-      return toString(true);
-   }
-
-   private String toString(boolean closed) {
-      StringBuffer buff = new StringBuffer(super.getParentString());
       buff.append(", autoCommitAcks=" + autoCommitAcks);
       buff.append(", autoCommitSends=" + autoCommitSends);
       buff.append(", defaultAddress=" + defaultAddress);
@@ -238,9 +229,6 @@ public class CreateSessionMessage extends PacketImpl {
       buff.append(", version=" + version);
       buff.append(", windowSize=" + windowSize);
       buff.append(", xa=" + xa);
-      if (closed) {
-         buff.append("]");
-      }
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionMessage_V2.java

@@ -66,11 +66,10 @@ public class CreateSessionMessage_V2 extends CreateSessionMessage {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buf = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
-      buf.append(", metadata=" + clientID);
+      buff.append(", metadata=" + clientID);
-      buf.append("]");
+      return buff.toString();
-      return buf.toString();
    }
 
    @Override

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionResponseMessage.java

@@ -80,10 +80,9 @@ public class CreateSessionResponseMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", serverVersion=" + serverVersion);
-      buff.append("]");
       return buff.toString();
    }
 }

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java

@@ -57,14 +57,13 @@ public class CreateSharedQueueMessage extends PacketImpl {
    // Public --------------------------------------------------------
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", address=" + address);
       buff.append(", queueName=" + queueName);
       buff.append(", filterString=" + filterString);
       buff.append(", durable=" + durable);
       buff.append(", requiresResponse=" + requiresResponse);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage_V2.java

@@ -295,8 +295,8 @@ public class CreateSharedQueueMessage_V2 extends CreateSharedQueueMessage {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", address=" + address);
       buff.append(", queueName=" + queueName);
       buff.append(", filterString=" + filterString);
@@ -320,7 +320,6 @@ public class CreateSharedQueueMessage_V2 extends CreateSharedQueueMessage {
       buff.append(", ringSize=" + ringSize);
       buff.append(", enabled=" + enabled);
       buff.append(", requiresResponse=" + requiresResponse);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectConsumerMessage.java

@@ -43,10 +43,9 @@ public class DisconnectConsumerMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", consumerId=" + consumerId);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectConsumerWithKillMessage.java

@@ -46,10 +46,9 @@ public class DisconnectConsumerWithKillMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", nodeID=" + nodeID);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage.java

@@ -62,11 +62,10 @@ public class DisconnectMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buf = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
-      buf.append(", nodeID=" + nodeID);
+      buff.append(", nodeID=" + nodeID);
-      buf.append("]");
+      return buff.toString();
-      return buf.toString();
    }
 
    @Override

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java

@@ -54,12 +54,11 @@ public class DisconnectMessage_V2 extends DisconnectMessage {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buf = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
-      buf.append(", nodeID=" + nodeID);
+      buff.append(", nodeID=" + nodeID);
-      buf.append(", scaleDownNodeID=" + scaleDownNodeID);
+      buff.append(", scaleDownNodeID=" + scaleDownNodeID);
-      buf.append("]");
+      return buff.toString();
-      return buf.toString();
    }
 
    @Override

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage_V3.java

@@ -88,13 +88,12 @@ public class DisconnectMessage_V3 extends DisconnectMessage {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buf = new StringBuffer(getParentString());
+      StringBuffer buf = new StringBuffer(super.getPacketString());
       buf.append(", nodeID=" + nodeID);
       buf.append(", reason=" + reason);
       buf.append(", targetNodeID=" + targetNodeID);
       buf.append(", targetConnector=" + targetConnector);
-      buf.append("]");
       return buf.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/MessagePacket.java

@@ -42,8 +42,8 @@ public abstract class MessagePacket extends PacketImpl implements MessagePacketI
    }
 
    @Override
-   public String getParentString() {
+   protected String getPacketString() {
-      return super.getParentString() + ", message=" + message;
+      return super.getPacketString() + ", message=" + message;
    }
 
 }

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NullResponseMessage_V2.java

@@ -74,8 +74,8 @@ public class NullResponseMessage_V2 extends NullResponseMessage {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      return getParentString() + ", correlationID=" + correlationID + "]";
+      return super.getPacketString() + ", correlationID=" + correlationID;
    }
 
    @Override

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java

@@ -55,8 +55,8 @@ public class PacketsConfirmedMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      return getParentString() + ", commandID=" + commandID + "]";
+      return super.getPacketString() + ", commandID=" + commandID;
    }
 
    @Override

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/Ping.java

@@ -63,10 +63,9 @@ public final class Ping extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buf = new StringBuffer(getParentString());
+      StringBuffer buf = new StringBuffer(super.getPacketString());
       buf.append(", connectionTTL=" + connectionTTL);
-      buf.append("]");
       return buf.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReattachSessionMessage.java

@@ -72,11 +72,10 @@ public class ReattachSessionMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", lastConfirmedCommandID=" + lastConfirmedCommandID);
       buff.append(", name=" + name);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java

@@ -79,11 +79,10 @@ public class ReattachSessionResponseMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", lastConfirmedCommandID=" + lastConfirmedCommandID);
       buff.append(", reattached=" + reattached);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/RollbackMessage.java

@@ -66,10 +66,9 @@ public class RollbackMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", considerLastMessageAsDelivered=" + considerLastMessageAsDelivered);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java

@@ -85,12 +85,11 @@ public class SessionAcknowledgeMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", consumerID=" + consumerID);
       buff.append(", messageID=" + messageID);
       buff.append(", requiresResponse=" + requiresResponse);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java

@@ -74,11 +74,10 @@ public class SessionAddMetaDataMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", key=" + key);
       buff.append(", data=" + data);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java

@@ -98,8 +98,8 @@ public class SessionAddMetaDataMessageV2 extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", key=" + key);
       buff.append(", data=" + data);
       buff.append(", requiresConfirmation=" + requiresConfirmation);

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java

@@ -50,8 +50,8 @@ public class SessionBindingQueryMessage extends QueueAbstractPacket {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", address=" + address);
       buff.append("]");
       return buff.toString();

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java

@@ -90,15 +90,8 @@ public class SessionBindingQueryResponseMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
-      buff.append("]");
-      return buff.toString();
-   }
-
-   @Override
-   public String getParentString() {
-      StringBuffer buff = new StringBuffer(super.getParentString());
       buff.append(", exists=" + exists);
       buff.append(", queueNames=" + queueNames);
       return buff.toString();

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage_V2.java

@@ -70,15 +70,8 @@ public class SessionBindingQueryResponseMessage_V2 extends SessionBindingQueryRe
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
-      buff.append("]");
-      return buff.toString();
-   }
-
-   @Override
-   public String getParentString() {
-      StringBuffer buff = new StringBuffer(super.getParentString());
       buff.append(", autoCreateQueues=" + autoCreateQueues);
       return buff.toString();
    }

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage_V3.java

@@ -73,15 +73,8 @@ public class SessionBindingQueryResponseMessage_V3 extends SessionBindingQueryRe
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
-      buff.append("]");
-      return buff.toString();
-   }
-
-   @Override
-   public String getParentString() {
-      StringBuffer buff = new StringBuffer(super.getParentString());
       buff.append(", autoCreateAddresses=" + autoCreateAddresses);
       return buff.toString();
    }

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage_V4.java

@@ -161,15 +161,8 @@ public class SessionBindingQueryResponseMessage_V4 extends SessionBindingQueryRe
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
-      buff.append("]");
-      return buff.toString();
-   }
-
-   @Override
-   public String getParentString() {
-      StringBuffer buff = new StringBuffer(super.getParentString());
       buff.append(", defaultPurgeOnNoConsumers=" + defaultPurgeOnNoConsumers);
       buff.append(", defaultMaxConsumers=" + defaultMaxConsumers);
       buff.append(", defaultExclusive=" + defaultExclusive);

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java

@@ -50,8 +50,8 @@ public class SessionConsumerCloseMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      return getParentString() + ", consumerID=" + consumerID + "]";
+      return super.getPacketString() + ", consumerID=" + consumerID;
    }
 
    @Override

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java

@@ -57,8 +57,8 @@ public class SessionConsumerFlowCreditMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      return getParentString() + ", consumerID=" + consumerID + ", credits=" + credits + "]";
+      return super.getPacketString() + ", consumerID=" + consumerID + ", credits=" + credits;
    }
 
    @Override

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionContinuationMessage.java

@@ -101,11 +101,10 @@ public abstract class SessionContinuationMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", body=" + Arrays.toString(body));
       buff.append(", continues=" + continues);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java

@@ -54,15 +54,14 @@ public class SessionCreateConsumerMessage extends QueueAbstractPacket {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", queueName=" + queueName);
       buff.append(", filterString=" + filterString);
       buff.append(", id=" + id);
       buff.append(", browseOnly=" + browseOnly);
       buff.append(", requiresResponse=" + requiresResponse);
       buff.append(", priority=" + priority);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java

@@ -35,10 +35,9 @@ public class SessionDeleteQueueMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", queueName=" + queueName);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionExpireMessage.java

@@ -78,11 +78,10 @@ public class SessionExpireMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", consumerID=" + consumerID);
       buff.append(", messageID=" + messageID);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java

@@ -59,11 +59,10 @@ public class SessionForceConsumerDelivery extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buf = new StringBuffer(getParentString());
+      StringBuffer buf = new StringBuffer(super.getPacketString());
       buf.append(", consumerID=" + consumerID);
       buf.append(", sequence=" + sequence);
-      buf.append("]");
       return buf.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java

@@ -94,12 +94,11 @@ public class SessionIndividualAcknowledgeMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", consumerID=" + consumerID);
       buff.append(", messageID=" + messageID);
       buff.append(", requiresResponse=" + requiresResponse);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java

@@ -68,11 +68,10 @@ public class SessionProducerCreditsFailMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", address=" + address);
       buff.append(", credits=" + credits);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java

@@ -68,11 +68,10 @@ public class SessionProducerCreditsMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", address=" + address);
       buff.append(", credits=" + credits);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java

@@ -50,10 +50,9 @@ public class SessionQueueQueryMessage extends QueueAbstractPacket {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", queueName=" + queueName);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java

@@ -157,15 +157,8 @@ public class SessionQueueQueryResponseMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
-      buff.append("]");
-      return buff.toString();
-   }
-
-   @Override
-   public String getParentString() {
-      StringBuffer buff = new StringBuffer(super.getParentString());
       buff.append(", address=" + address);
       buff.append(", name=" + name);
       buff.append(", consumerCount=" + consumerCount);

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage_V2.java

@@ -92,15 +92,8 @@ public class SessionQueueQueryResponseMessage_V2 extends SessionQueueQueryRespon
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
-      buff.append("]");
-      return buff.toString();
-   }
-
-   @Override
-   public String getParentString() {
-      StringBuffer buff = new StringBuffer(super.getParentString());
       buff.append(", autoCreationEnabled=" + autoCreateQueues);
       return buff.toString();
    }

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage_V3.java

@@ -423,15 +423,8 @@ public class SessionQueueQueryResponseMessage_V3 extends SessionQueueQueryRespon
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
-      buff.append("]");
-      return buff.toString();
-   }
-
-   @Override
-   public String getParentString() {
-      StringBuffer buff = new StringBuffer(super.getParentString());
       buff.append(", autoCreated=" + autoCreated);
       buff.append(", purgeOnNoConsumers=" + purgeOnNoConsumers);
       buff.append(", routingType=" + routingType);

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java

@@ -107,10 +107,9 @@ public class SessionReceiveContinuationMessage extends SessionContinuationMessag
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", consumerID=" + consumerID);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java

@@ -115,13 +115,12 @@ public class SessionReceiveLargeMessage extends PacketImpl implements MessagePac
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", consumerID=" + consumerID);
       buff.append(", deliveryCount=" + deliveryCount);
       buff.append(", largeMessageSize=" + largeMessageSize);
       buff.append(", message=" + message);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveMessage.java

@@ -91,8 +91,8 @@ public class SessionReceiveMessage extends MessagePacket {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", consumerID=" + consumerID);
       buff.append(", deliveryCount=" + deliveryCount);
       buff.append("]");

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java

@@ -75,11 +75,10 @@ public class SessionRequestProducerCreditsMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", credits=" + credits);
       buff.append(", address=" + address);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java

@@ -151,13 +151,12 @@ public class SessionSendContinuationMessage extends SessionContinuationMessage {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", continues=" + continues);
       buff.append(", message=" + message);
       buff.append(", messageBodySize=" + messageBodySize);
       buff.append(", requiresResponse=" + requiresResponse);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendContinuationMessage_V2.java

@@ -95,8 +95,8 @@ public class SessionSendContinuationMessage_V2 extends SessionSendContinuationMe
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", continues=" + continues);
       buff.append(", message=" + message);
       buff.append(", messageBodySize=" + messageBodySize);

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java

@@ -74,10 +74,9 @@ public class SessionSendLargeMessage extends PacketImpl implements MessagePacket
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", largeMessage=" + largeMessage);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendMessage.java

@@ -118,10 +118,9 @@ public class SessionSendMessage extends MessagePacket {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", requiresResponse=" + requiresResponse);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendMessage_V2.java

@@ -79,11 +79,10 @@ public class SessionSendMessage_V2 extends SessionSendMessage {
 
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", correlationID=" + correlationID);
       buff.append(", requiresResponse=" + super.isRequiresResponse());
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java

@@ -71,10 +71,9 @@ public class SessionXAAfterFailedMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", xid=" + xid);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXACommitMessage.java

@@ -60,8 +60,8 @@ public class SessionXACommitMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   public String getPacketString() {
-      return getParentString() + ", xid=" + xid + ", onePhase=" + onePhase + "]";
+      return super.getPacketString() + ", xid=" + xid + ", onePhase=" + onePhase + "]";
    }
 
    @Override

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAEndMessage.java

@@ -61,8 +61,8 @@ public class SessionXAEndMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   public String getPacketString() {
-      return getParentString() + ", xid=" + xid + ", failed=" + failed + "]";
+      return super.getPacketString() + ", xid=" + xid + ", failed=" + failed + "]";
    }
 
    @Override

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java

@@ -59,9 +59,8 @@ public class SessionXAForgetMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
-      buff.append(", xid=" + xid);
       buff.append("]");
       return buff.toString();
    }

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java

@@ -68,8 +68,8 @@ public class SessionXAGetInDoubtXidsResponseMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", xids=" + xids);
       buff.append("]");
       return buff.toString();

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java

@@ -61,10 +61,9 @@ public class SessionXAGetTimeoutResponseMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", timeoutSeconds=" + timeoutSeconds);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAJoinMessage.java

@@ -59,10 +59,9 @@ public class SessionXAJoinMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", xid=" + xid);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAPrepareMessage.java

@@ -59,10 +59,9 @@ public class SessionXAPrepareMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", xid=" + xid);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java

@@ -85,8 +85,8 @@ public class SessionXAResponseMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", error=" + error);
       buff.append(", message=" + message);
       buff.append(", responseCode=" + responseCode);

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResponseMessage_V2.java

@@ -64,13 +64,12 @@ public class SessionXAResponseMessage_V2 extends SessionXAResponseMessage {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", error=" + error);
       buff.append(", message=" + message);
       buff.append(", responseCode=" + responseCode);
       buff.append(", correlationID=" + correlationID);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java

@@ -61,10 +61,9 @@ public class SessionXAResumeMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", xid=" + xid);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java

@@ -61,10 +61,9 @@ public class SessionXARollbackMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", xid=" + xid);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java

@@ -58,10 +58,9 @@ public class SessionXASetTimeoutMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", timeoutSeconds=" + timeoutSeconds);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java

@@ -63,10 +63,9 @@ public class SessionXASetTimeoutResponseMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", ok=" + ok);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAStartMessage.java

@@ -68,10 +68,9 @@ public class SessionXAStartMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", xid=" + xid);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java

@@ -60,10 +60,9 @@ public class SubscribeClusterTopologyUpdatesMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", clusterConnection=" + clusterConnection);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java

@@ -62,10 +62,9 @@ public class SubscribeClusterTopologyUpdatesMessageV2 extends SubscribeClusterTo
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
       buff.append(", clientVersion=" + clientVersion);
-      buff.append("]");
       return buff.toString();
    }
 

artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java

@@ -103,7 +103,7 @@ public final class BackupReplicationStartFailedMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      return getParentString() + ", problem=" + problem.name() + "]";
+      return super.getPacketString() + ", problem=" + problem.name();
    }
 }

artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java

@@ -144,15 +144,14 @@ public class NodeAnnounceMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      return "NodeAnnounceMessage [backup=" + backup +
+      String baseString = super.getPacketString();
+      return baseString +
+         ", backup=" + backup +
          ", connector=" +
          connector +
          ", nodeID=" +
-         nodeID +
+         nodeID;
-         ", toString()=" +
-         super.toString() +
-         "]";
    }
 
    @Override

artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/QuorumVoteMessage.java

@@ -68,17 +68,9 @@ public class QuorumVoteMessage extends PacketImpl {
       vote = voteHandler.decode(voteBuffer);
    }
 
-
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buff = new StringBuffer(getParentString());
+      StringBuffer buff = new StringBuffer(super.getPacketString());
-      buff.append("]");
-      return buff.toString();
-   }
-
-   @Override
-   public String getParentString() {
-      StringBuffer buff = new StringBuffer(super.getParentString());
       buff.append(", vote=" + vote);
       buff.append(", handler=" + handler);
       return buff.toString();

artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java

@@ -108,9 +108,10 @@ public final class ReplicationCommitMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
+      String baseString = super.getPacketString();
       String txOperation = rollback ? "rollback" : "commmit";
-      return ReplicationCommitMessage.class.getSimpleName() + "[type=" + getType() + ", channel=" + getChannelID() +
+      return baseString + "[type=" + getType() + ", channel=" + getChannelID() +
-         ", journalID=" + journalID + ", txAction='" + txOperation + "']";
+         ", journalID=" + journalID + ", txAction='" + txOperation + "'";
    }
 }

artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLargeMessageBeginMessage.java

@@ -67,10 +67,9 @@ public class ReplicationLargeMessageBeginMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      return "ReplicationLargeMessageBeginMessage{" +
+      return  super.getPacketString() +
-         "messageId=" + messageId +
+         "messageId=" + messageId;
-         '}';
    }
 
    @Override

artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLargeMessageEndMessage.java

@@ -86,10 +86,9 @@ public class ReplicationLargeMessageEndMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      return "ReplicationLargeMessageEndMessage{" +
+      return  super.getPacketString() +
-         "messageId=" + messageId + ", isDelete=" + isDelete +
+         "messageId=" + messageId + ", isDelete=" + isDelete;
-         '}';
    }
 
    @Override

artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLargeMessageWriteMessage.java

@@ -91,11 +91,10 @@ public final class ReplicationLargeMessageWriteMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      return "ReplicationLargeMessageWriteMessage{" +
+      return  super.getPacketString() +
          "messageId=" + messageId +
-         ", body.size=" + body.length +
+         ", body.size=" + body.length;
-         '}';
    }
 
    @Override

artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationLiveIsStoppingMessage.java

@@ -87,7 +87,7 @@ public final class ReplicationLiveIsStoppingMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      return super.toString() + ":" + liveStopping;
+      return super.getPacketString() + ", liveStopping=" + liveStopping;
    }
 }

artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationPageEventMessage.java

@@ -87,9 +87,10 @@ public class ReplicationPageEventMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      return ReplicationPageEventMessage.class.getSimpleName() + "(channel=" + channelID + ", isDelete=" + isDelete +
+      String baseString = super.getPacketString();
-         ", storeName=" + storeName + ", pageNumber=" + pageNumber + ")";
+      return baseString + ", channel=" + channelID + ", isDelete=" + isDelete +
+         ", storeName=" + storeName + ", pageNumber=" + pageNumber;
    }
 
    @Override

artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationResponseMessageV2.java

@@ -62,10 +62,9 @@ public final class ReplicationResponseMessageV2 extends ReplicationResponseMessa
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buf = new StringBuffer(getParentString());
+      StringBuffer buf = new StringBuffer(getPacketString());
       buf.append(", synchronizationIsFinishedAcknowledgement=" + synchronizationIsFinishedAcknowledgement);
-      buf.append("]");
       return buf.toString();
    }
 }

artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java

@@ -228,14 +228,13 @@ public class ReplicationStartSyncMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      StringBuffer buf = new StringBuffer(getParentString());
+      StringBuffer buf = new StringBuffer(super.getPacketString());
       buf.append(", synchronizationIsFinished=" + synchronizationIsFinished);
       buf.append(", dataType=" + dataType);
       buf.append(", nodeID=" + nodeID);
       buf.append(", ids=" + Arrays.toString(ids));
       buf.append(", allowsAutoFailBack=" + allowsAutoFailBack);
-      buf.append("]");
       return buf.toString();
    }
 }

artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationSyncFileMessage.java

@@ -276,8 +276,8 @@ public final class ReplicationSyncFileMessage extends PacketImpl {
    }
 
    @Override
-   public String toString() {
+   protected String getPacketString() {
-      return ReplicationSyncFileMessage.class.getSimpleName() + "(" + fileType +
+      return super.getPacketString() + ", fileType=" + fileType +
-         (journalType != null ? ", " + journalType : "") + ", id=" + fileId + ")";
+         (journalType != null ? ", " + journalType : "") + ", id=" + fileId;
    }
 }