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

This commit is contained in:
Clebert Suconic 2021-09-13 10:08:24 -04:00 committed by clebertsuconic
parent 6385e471e4
commit 2481a784f3
89 changed files with 201 additions and 349 deletions

View File

@ -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() {
return getParentString() + "]";
public final String toString() {
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;
}

View File

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

View File

@ -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;

View File

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

View File

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

View File

@ -145,13 +145,12 @@ public class ClusterTopologyChangeMessage extends PacketImpl {
}
@Override
public String toString() {
StringBuffer buff = new StringBuffer(getParentString());
protected String getPacketString() {
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();
}

View File

@ -140,15 +140,14 @@ public class ClusterTopologyChangeMessage_V2 extends ClusterTopologyChangeMessag
}
@Override
public String toString() {
StringBuffer buff = new StringBuffer(getParentString());
protected String getPacketString() {
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();
}

View File

@ -90,17 +90,8 @@ public class ClusterTopologyChangeMessage_V3 extends ClusterTopologyChangeMessag
}
@Override
protected String getParentString() {
return toString(false);
}
@Override
public String toString() {
return toString(true);
}
private String toString(boolean closed) {
StringBuffer buff = new StringBuffer(getParentString());
protected String getPacketString() {
StringBuffer buff = new StringBuffer(super.getPacketString());
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();
}

View File

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

View File

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

View File

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

View File

@ -218,8 +218,8 @@ public class CreateQueueMessage_V2 extends CreateQueueMessage {
}
@Override
public String toString() {
StringBuffer buff = new StringBuffer(super.getParentString());
protected String getPacketString() {
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();
}

View File

@ -215,17 +215,8 @@ public class CreateSessionMessage extends PacketImpl {
}
@Override
protected String getParentString() {
return toString(false);
}
@Override
public String toString() {
return toString(true);
}
private String toString(boolean closed) {
StringBuffer buff = new StringBuffer(super.getParentString());
protected String getPacketString() {
StringBuffer buff = new StringBuffer(super.getPacketString());
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();
}

View File

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

View File

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

View File

@ -57,14 +57,13 @@ public class CreateSharedQueueMessage extends PacketImpl {
// Public --------------------------------------------------------
@Override
public String toString() {
StringBuffer buff = new StringBuffer(getParentString());
protected String getPacketString() {
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();
}

View File

@ -295,8 +295,8 @@ public class CreateSharedQueueMessage_V2 extends CreateSharedQueueMessage {
}
@Override
public String toString() {
StringBuffer buff = new StringBuffer(getParentString());
protected String getPacketString() {
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();
}

View File

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

View File

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

View File

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

View File

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

View File

@ -88,13 +88,12 @@ public class DisconnectMessage_V3 extends DisconnectMessage {
}
@Override
public String toString() {
StringBuffer buf = new StringBuffer(getParentString());
protected String getPacketString() {
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();
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -54,15 +54,14 @@ public class SessionCreateConsumerMessage extends QueueAbstractPacket {
}
@Override
public String toString() {
StringBuffer buff = new StringBuffer(getParentString());
protected String getPacketString() {
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();
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -115,13 +115,12 @@ public class SessionReceiveLargeMessage extends PacketImpl implements MessagePac
}
@Override
public String toString() {
StringBuffer buff = new StringBuffer(getParentString());
protected String getPacketString() {
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();
}

View File

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

View File

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

View File

@ -151,13 +151,12 @@ public class SessionSendContinuationMessage extends SessionContinuationMessage {
}
@Override
public String toString() {
StringBuffer buff = new StringBuffer(getParentString());
protected String getPacketString() {
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();
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -64,13 +64,12 @@ public class SessionXAResponseMessage_V2 extends SessionXAResponseMessage {
}
@Override
public String toString() {
StringBuffer buff = new StringBuffer(getParentString());
protected String getPacketString() {
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();
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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() +
", journalID=" + journalID + ", txAction='" + txOperation + "']";
return baseString + "[type=" + getType() + ", channel=" + getChannelID() +
", journalID=" + journalID + ", txAction='" + txOperation + "'";
}
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -228,14 +228,13 @@ public class ReplicationStartSyncMessage extends PacketImpl {
}
@Override
public String toString() {
StringBuffer buf = new StringBuffer(getParentString());
protected String getPacketString() {
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();
}
}

View File

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