Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 549C918E1A for ; Mon, 10 Aug 2015 15:14:01 +0000 (UTC) Received: (qmail 45191 invoked by uid 500); 10 Aug 2015 15:13:02 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 45068 invoked by uid 500); 10 Aug 2015 15:13:02 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 44250 invoked by uid 99); 10 Aug 2015 15:13:02 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Aug 2015 15:13:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CDD73E0509; Mon, 10 Aug 2015 15:13:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: clebertsuconic@apache.org To: commits@activemq.apache.org Date: Mon, 10 Aug 2015 15:13:29 -0000 Message-Id: <47e243561f51494db8b285f79d579205@git.apache.org> In-Reply-To: <6d75255d38c94b2f8601b49eb76c9d59@git.apache.org> References: <6d75255d38c94b2f8601b49eb76c9d59@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [30/53] [abbrv] [partial] activemq-artemis git commit: automatic checkstyle change http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionMessage.java index d217fc1..b18821a 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionMessage.java @@ -19,8 +19,8 @@ package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; -public class CreateSessionMessage extends PacketImpl -{ +public class CreateSessionMessage extends PacketImpl { + private String name; private long sessionChannelID; @@ -56,8 +56,7 @@ public class CreateSessionMessage extends PacketImpl final boolean autoCommitAcks, final boolean preAcknowledge, final int windowSize, - final String defaultAddress) - { + final String defaultAddress) { super(CREATESESSION); this.name = name; @@ -85,71 +84,58 @@ public class CreateSessionMessage extends PacketImpl this.defaultAddress = defaultAddress; } - public CreateSessionMessage() - { + public CreateSessionMessage() { super(CREATESESSION); } // Public -------------------------------------------------------- - public String getName() - { + public String getName() { return name; } - public long getSessionChannelID() - { + public long getSessionChannelID() { return sessionChannelID; } - public int getVersion() - { + public int getVersion() { return version; } - public String getUsername() - { + public String getUsername() { return username; } - public String getPassword() - { + public String getPassword() { return password; } - public boolean isXA() - { + public boolean isXA() { return xa; } - public boolean isAutoCommitSends() - { + public boolean isAutoCommitSends() { return autoCommitSends; } - public boolean isAutoCommitAcks() - { + public boolean isAutoCommitAcks() { return autoCommitAcks; } - public boolean isPreAcknowledge() - { + public boolean isPreAcknowledge() { return preAcknowledge; } - public int getWindowSize() - { + public int getWindowSize() { return windowSize; } - public String getDefaultAddress() - { + public String getDefaultAddress() { return defaultAddress; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeString(name); buffer.writeLong(sessionChannelID); buffer.writeInt(version); @@ -165,8 +151,7 @@ public class CreateSessionMessage extends PacketImpl } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { name = buffer.readString(); sessionChannelID = buffer.readLong(); version = buffer.readInt(); @@ -182,19 +167,16 @@ public class CreateSessionMessage extends PacketImpl } @Override - public final boolean isRequiresConfirmations() - { + public final boolean isRequiresConfirmations() { return false; } - public int getMinLargeMessageSize() - { + public int getMinLargeMessageSize() { return minLargeMessageSize; } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + (autoCommitAcks ? 1231 : 1237); @@ -204,7 +186,7 @@ public class CreateSessionMessage extends PacketImpl result = prime * result + ((name == null) ? 0 : name.hashCode()); result = prime * result + ((password == null) ? 0 : password.hashCode()); result = prime * result + (preAcknowledge ? 1231 : 1237); - result = prime * result + (int)(sessionChannelID ^ (sessionChannelID >>> 32)); + result = prime * result + (int) (sessionChannelID ^ (sessionChannelID >>> 32)); result = prime * result + ((username == null) ? 0 : username.hashCode()); result = prime * result + version; result = prime * result + windowSize; @@ -213,21 +195,19 @@ public class CreateSessionMessage extends PacketImpl } @Override - public boolean equals(Object obj) - { + public boolean equals(Object obj) { if (this == obj) return true; if (!super.equals(obj)) return false; if (!(obj instanceof CreateSessionMessage)) return false; - CreateSessionMessage other = (CreateSessionMessage)obj; + CreateSessionMessage other = (CreateSessionMessage) obj; if (autoCommitAcks != other.autoCommitAcks) return false; if (autoCommitSends != other.autoCommitSends) return false; - if (defaultAddress == null) - { + if (defaultAddress == null) { if (other.defaultAddress != null) return false; } @@ -235,15 +215,13 @@ public class CreateSessionMessage extends PacketImpl return false; if (minLargeMessageSize != other.minLargeMessageSize) return false; - if (name == null) - { + if (name == null) { if (other.name != null) return false; } else if (!name.equals(other.name)) return false; - if (password == null) - { + if (password == null) { if (other.password != null) return false; } @@ -253,8 +231,7 @@ public class CreateSessionMessage extends PacketImpl return false; if (sessionChannelID != other.sessionChannelID) return false; - if (username == null) - { + if (username == null) { if (other.username != null) return false; } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionResponseMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionResponseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionResponseMessage.java index 40fdb5d..6f15777 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionResponseMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionResponseMessage.java @@ -19,54 +19,46 @@ package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; -public class CreateSessionResponseMessage extends PacketImpl -{ +public class CreateSessionResponseMessage extends PacketImpl { + private int serverVersion; - public CreateSessionResponseMessage(final int serverVersion) - { + public CreateSessionResponseMessage(final int serverVersion) { super(CREATESESSION_RESP); this.serverVersion = serverVersion; } - public CreateSessionResponseMessage() - { + public CreateSessionResponseMessage() { super(CREATESESSION_RESP); } @Override - public boolean isResponse() - { + public boolean isResponse() { return true; } - public int getServerVersion() - { + public int getServerVersion() { return serverVersion; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeInt(serverVersion); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { serverVersion = buffer.readInt(); } @Override - public final boolean isRequiresConfirmations() - { + public final boolean isRequiresConfirmations() { return false; } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + serverVersion; @@ -74,15 +66,14 @@ public class CreateSessionResponseMessage extends PacketImpl } @Override - public boolean equals(Object obj) - { + public boolean equals(Object obj) { if (this == obj) return true; if (!super.equals(obj)) return false; if (!(obj instanceof CreateSessionResponseMessage)) return false; - CreateSessionResponseMessage other = (CreateSessionResponseMessage)obj; + CreateSessionResponseMessage other = (CreateSessionResponseMessage) obj; if (serverVersion != other.serverVersion) return false; return true; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java index 079fcf7..8191f16 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java @@ -20,8 +20,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; -public class CreateSharedQueueMessage extends PacketImpl -{ +public class CreateSharedQueueMessage extends PacketImpl { private SimpleString address; @@ -37,8 +36,7 @@ public class CreateSharedQueueMessage extends PacketImpl final SimpleString queueName, final SimpleString filterString, final boolean durable, - final boolean requiresResponse) - { + final boolean requiresResponse) { this(); this.address = address; @@ -48,16 +46,14 @@ public class CreateSharedQueueMessage extends PacketImpl this.requiresResponse = requiresResponse; } - public CreateSharedQueueMessage() - { + public CreateSharedQueueMessage() { super(CREATE_SHARED_QUEUE); } // Public -------------------------------------------------------- @Override - public String toString() - { + public String toString() { StringBuffer buff = new StringBuffer(getParentString()); buff.append(", address=" + address); buff.append(", queueName=" + queueName); @@ -67,49 +63,40 @@ public class CreateSharedQueueMessage extends PacketImpl return buff.toString(); } - public SimpleString getAddress() - { + public SimpleString getAddress() { return address; } - public SimpleString getQueueName() - { + public SimpleString getQueueName() { return queueName; } - public SimpleString getFilterString() - { + public SimpleString getFilterString() { return filterString; } - public boolean isRequiresResponse() - { + public boolean isRequiresResponse() { return requiresResponse; } - public void setAddress(SimpleString address) - { + public void setAddress(SimpleString address) { this.address = address; } - public void setQueueName(SimpleString queueName) - { + public void setQueueName(SimpleString queueName) { this.queueName = queueName; } - public void setFilterString(SimpleString filterString) - { + public void setFilterString(SimpleString filterString) { this.filterString = filterString; } - public boolean isDurable() - { + public boolean isDurable() { return durable; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeSimpleString(address); buffer.writeSimpleString(queueName); buffer.writeNullableSimpleString(filterString); @@ -118,8 +105,7 @@ public class CreateSharedQueueMessage extends PacketImpl } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { address = buffer.readSimpleString(); queueName = buffer.readSimpleString(); filterString = buffer.readNullableSimpleString(); @@ -128,8 +114,7 @@ public class CreateSharedQueueMessage extends PacketImpl } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + ((address == null) ? 0 : address.hashCode()); @@ -141,31 +126,27 @@ public class CreateSharedQueueMessage extends PacketImpl } @Override - public boolean equals(Object obj) - { + public boolean equals(Object obj) { if (this == obj) return true; if (!super.equals(obj)) return false; if (!(obj instanceof CreateSharedQueueMessage)) return false; - CreateSharedQueueMessage other = (CreateSharedQueueMessage)obj; - if (address == null) - { + CreateSharedQueueMessage other = (CreateSharedQueueMessage) obj; + if (address == null) { if (other.address != null) return false; } else if (!address.equals(other.address)) return false; - if (filterString == null) - { + if (filterString == null) { if (other.filterString != null) return false; } else if (!filterString.equals(other.filterString)) return false; - if (queueName == null) - { + if (queueName == null) { if (other.queueName != null) return false; } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectConsumerMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectConsumerMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectConsumerMessage.java index f6e7063..540bc37 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectConsumerMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectConsumerMessage.java @@ -16,39 +16,33 @@ */ package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; - import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; -public class DisconnectConsumerMessage extends PacketImpl -{ +public class DisconnectConsumerMessage extends PacketImpl { + private long consumerId; - public DisconnectConsumerMessage(final long consumerId) - { + public DisconnectConsumerMessage(final long consumerId) { super(DISCONNECT_CONSUMER); this.consumerId = consumerId; } - public DisconnectConsumerMessage() - { + public DisconnectConsumerMessage() { super(DISCONNECT_CONSUMER); } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeLong(consumerId); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { consumerId = buffer.readLong(); } - public long getConsumerId() - { + public long getConsumerId() { return consumerId; } } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage.java index c9f0d66..13fdc08 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage.java @@ -20,8 +20,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; -public class DisconnectMessage extends PacketImpl -{ +public class DisconnectMessage extends PacketImpl { // Constants ----------------------------------------------------- // Attributes ---------------------------------------------------- @@ -32,45 +31,38 @@ public class DisconnectMessage extends PacketImpl // Constructors -------------------------------------------------- - public DisconnectMessage(final SimpleString nodeID) - { + public DisconnectMessage(final SimpleString nodeID) { super(DISCONNECT); this.nodeID = nodeID; } - public DisconnectMessage() - { + public DisconnectMessage() { super(DISCONNECT); } - public DisconnectMessage(byte disconnectV2) - { + public DisconnectMessage(byte disconnectV2) { super(disconnectV2); } // Public -------------------------------------------------------- - public SimpleString getNodeID() - { + public SimpleString getNodeID() { return nodeID; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeNullableSimpleString(nodeID); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { nodeID = buffer.readNullableSimpleString(); } @Override - public String toString() - { + public String toString() { StringBuffer buf = new StringBuffer(getParentString()); buf.append(", nodeID=" + nodeID); buf.append("]"); @@ -78,14 +70,12 @@ public class DisconnectMessage extends PacketImpl } @Override - public final boolean isRequiresConfirmations() - { + public final boolean isRequiresConfirmations() { return false; } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + ((nodeID == null) ? 0 : nodeID.hashCode()); @@ -93,30 +83,23 @@ public class DisconnectMessage extends PacketImpl } @Override - public boolean equals(Object obj) - { - if (this == obj) - { + public boolean equals(Object obj) { + if (this == obj) { return true; } - if (!super.equals(obj)) - { + if (!super.equals(obj)) { return false; } - if (!(obj instanceof DisconnectMessage)) - { + if (!(obj instanceof DisconnectMessage)) { return false; } - DisconnectMessage other = (DisconnectMessage)obj; - if (nodeID == null) - { - if (other.nodeID != null) - { + DisconnectMessage other = (DisconnectMessage) obj; + if (nodeID == null) { + if (other.nodeID != null) { return false; } } - else if (!nodeID.equals(other.nodeID)) - { + else if (!nodeID.equals(other.nodeID)) { return false; } return true; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java index cbde5a5..8d50ed1 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java @@ -19,12 +19,11 @@ package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.SimpleString; -public class DisconnectMessage_V2 extends DisconnectMessage -{ +public class DisconnectMessage_V2 extends DisconnectMessage { + private SimpleString scaleDownNodeID; - public DisconnectMessage_V2(final SimpleString nodeID, final String scaleDownNodeID) - { + public DisconnectMessage_V2(final SimpleString nodeID, final String scaleDownNodeID) { super(DISCONNECT_V2); this.nodeID = nodeID; @@ -32,35 +31,30 @@ public class DisconnectMessage_V2 extends DisconnectMessage this.scaleDownNodeID = SimpleString.toSimpleString(scaleDownNodeID); } - public DisconnectMessage_V2() - { + public DisconnectMessage_V2() { super(DISCONNECT_V2); } // Public -------------------------------------------------------- - public SimpleString getScaleDownNodeID() - { + public SimpleString getScaleDownNodeID() { return scaleDownNodeID; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { super.encodeRest(buffer); buffer.writeNullableSimpleString(scaleDownNodeID); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { super.decodeRest(buffer); scaleDownNodeID = buffer.readNullableSimpleString(); } @Override - public String toString() - { + public String toString() { StringBuffer buf = new StringBuffer(getParentString()); buf.append(", nodeID=" + nodeID); buf.append(", scaleDownNodeID=" + scaleDownNodeID); @@ -69,8 +63,7 @@ public class DisconnectMessage_V2 extends DisconnectMessage } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + ((scaleDownNodeID == null) ? 0 : scaleDownNodeID.hashCode()); @@ -78,30 +71,23 @@ public class DisconnectMessage_V2 extends DisconnectMessage } @Override - public boolean equals(Object obj) - { - if (this == obj) - { + public boolean equals(Object obj) { + if (this == obj) { return true; } - if (!super.equals(obj)) - { + if (!super.equals(obj)) { return false; } - if (!(obj instanceof DisconnectMessage_V2)) - { + if (!(obj instanceof DisconnectMessage_V2)) { return false; } DisconnectMessage_V2 other = (DisconnectMessage_V2) obj; - if (scaleDownNodeID == null) - { - if (other.scaleDownNodeID != null) - { + if (scaleDownNodeID == null) { + if (other.scaleDownNodeID != null) { return false; } } - else if (!scaleDownNodeID.equals(other.scaleDownNodeID)) - { + else if (!scaleDownNodeID.equals(other.scaleDownNodeID)) { return false; } return true; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/MessagePacket.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/MessagePacket.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/MessagePacket.java index 275f0a5..abcb233 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/MessagePacket.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/MessagePacket.java @@ -20,19 +20,17 @@ import org.apache.activemq.artemis.api.core.Message; import org.apache.activemq.artemis.core.message.impl.MessageInternal; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; -public abstract class MessagePacket extends PacketImpl -{ +public abstract class MessagePacket extends PacketImpl { + protected MessageInternal message; - public MessagePacket(final byte type, final MessageInternal message) - { + public MessagePacket(final byte type, final MessageInternal message) { super(type); this.message = message; } - public Message getMessage() - { + public Message getMessage() { return message; } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NullResponseMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NullResponseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NullResponseMessage.java index d62781a..b979495 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NullResponseMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NullResponseMessage.java @@ -18,17 +18,14 @@ package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; -public class NullResponseMessage extends PacketImpl -{ +public class NullResponseMessage extends PacketImpl { - public NullResponseMessage() - { + public NullResponseMessage() { super(NULL_RESPONSE); } @Override - public boolean isResponse() - { + public boolean isResponse() { return true; } } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java index 7659b25..6cec0ac 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java @@ -19,58 +19,48 @@ package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; -public class PacketsConfirmedMessage extends PacketImpl -{ +public class PacketsConfirmedMessage extends PacketImpl { private int commandID; - public PacketsConfirmedMessage(final int commandID) - { + public PacketsConfirmedMessage(final int commandID) { super(PACKETS_CONFIRMED); this.commandID = commandID; } - public PacketsConfirmedMessage() - { + public PacketsConfirmedMessage() { super(PACKETS_CONFIRMED); } // Public -------------------------------------------------------- - public int getCommandID() - { + public int getCommandID() { return commandID; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeInt(commandID); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { commandID = buffer.readInt(); } - @Override - public final boolean isRequiresConfirmations() - { + public final boolean isRequiresConfirmations() { return false; } @Override - public String toString() - { + public String toString() { return getParentString() + ", commandID=" + commandID + "]"; } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + commandID; @@ -78,23 +68,18 @@ public class PacketsConfirmedMessage extends PacketImpl } @Override - public boolean equals(Object obj) - { - if (this == obj) - { + public boolean equals(Object obj) { + if (this == obj) { return true; } - if (!super.equals(obj)) - { + if (!super.equals(obj)) { return false; } - if (!(obj instanceof PacketsConfirmedMessage)) - { + if (!(obj instanceof PacketsConfirmedMessage)) { return false; } - PacketsConfirmedMessage other = (PacketsConfirmedMessage)obj; - if (commandID != other.commandID) - { + PacketsConfirmedMessage other = (PacketsConfirmedMessage) obj; + if (commandID != other.commandID) { return false; } return true; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/Ping.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/Ping.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/Ping.java index 7113d5a..2656294 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/Ping.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/Ping.java @@ -23,48 +23,41 @@ import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; * Ping is sent on the client side by {@link org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryImpl}. At the server's * side it is handled by org.apache.activemq.artemis.core.remoting.server.impl.RemotingServiceImpl */ -public final class Ping extends PacketImpl -{ +public final class Ping extends PacketImpl { + private long connectionTTL; - public Ping(final long connectionTTL) - { + public Ping(final long connectionTTL) { super(PING); this.connectionTTL = connectionTTL; } - public Ping() - { + public Ping() { super(PING); } - public long getConnectionTTL() - { + public long getConnectionTTL() { return connectionTTL; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeLong(connectionTTL); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { connectionTTL = buffer.readLong(); } @Override - public boolean isRequiresConfirmations() - { + public boolean isRequiresConfirmations() { return false; } @Override - public String toString() - { + public String toString() { StringBuffer buf = new StringBuffer(getParentString()); buf.append(", connectionTTL=" + connectionTTL); buf.append("]"); @@ -72,32 +65,26 @@ public final class Ping extends PacketImpl } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); - result = prime * result + (int)(connectionTTL ^ (connectionTTL >>> 32)); + result = prime * result + (int) (connectionTTL ^ (connectionTTL >>> 32)); return result; } @Override - public boolean equals(Object obj) - { - if (this == obj) - { + public boolean equals(Object obj) { + if (this == obj) { return true; } - if (!super.equals(obj)) - { + if (!super.equals(obj)) { return false; } - if (!(obj instanceof Ping)) - { + if (!(obj instanceof Ping)) { return false; } - Ping other = (Ping)obj; - if (connectionTTL != other.connectionTTL) - { + Ping other = (Ping) obj; + if (connectionTTL != other.connectionTTL) { return false; } return true; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReattachSessionMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReattachSessionMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReattachSessionMessage.java index 2ec3144..db35eac 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReattachSessionMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReattachSessionMessage.java @@ -19,14 +19,13 @@ package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; -public class ReattachSessionMessage extends PacketImpl -{ +public class ReattachSessionMessage extends PacketImpl { + private String name; private int lastConfirmedCommandID; - public ReattachSessionMessage(final String name, final int lastConfirmedCommandID) - { + public ReattachSessionMessage(final String name, final int lastConfirmedCommandID) { super(REATTACH_SESSION); this.name = name; @@ -34,44 +33,37 @@ public class ReattachSessionMessage extends PacketImpl this.lastConfirmedCommandID = lastConfirmedCommandID; } - public ReattachSessionMessage() - { + public ReattachSessionMessage() { super(REATTACH_SESSION); } - public String getName() - { + public String getName() { return name; } - public int getLastConfirmedCommandID() - { + public int getLastConfirmedCommandID() { return lastConfirmedCommandID; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeString(name); buffer.writeInt(lastConfirmedCommandID); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { name = buffer.readString(); lastConfirmedCommandID = buffer.readInt(); } @Override - public final boolean isRequiresConfirmations() - { + public final boolean isRequiresConfirmations() { return false; } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + lastConfirmedCommandID; @@ -80,19 +72,17 @@ public class ReattachSessionMessage extends PacketImpl } @Override - public boolean equals(Object obj) - { + public boolean equals(Object obj) { if (this == obj) return true; if (!super.equals(obj)) return false; if (!(obj instanceof ReattachSessionMessage)) return false; - ReattachSessionMessage other = (ReattachSessionMessage)obj; + ReattachSessionMessage other = (ReattachSessionMessage) obj; if (lastConfirmedCommandID != other.lastConfirmedCommandID) return false; - if (name == null) - { + if (name == null) { if (other.name != null) return false; } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java index 1ed282a..89c59b6 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java @@ -19,14 +19,13 @@ package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; -public class ReattachSessionResponseMessage extends PacketImpl -{ +public class ReattachSessionResponseMessage extends PacketImpl { + private int lastConfirmedCommandID; private boolean reattached; - public ReattachSessionResponseMessage(final int lastConfirmedCommandID, final boolean reattached) - { + public ReattachSessionResponseMessage(final int lastConfirmedCommandID, final boolean reattached) { super(REATTACH_SESSION_RESP); this.lastConfirmedCommandID = lastConfirmedCommandID; @@ -34,52 +33,44 @@ public class ReattachSessionResponseMessage extends PacketImpl this.reattached = reattached; } - public ReattachSessionResponseMessage() - { + public ReattachSessionResponseMessage() { super(REATTACH_SESSION_RESP); } // Public -------------------------------------------------------- - public int getLastConfirmedCommandID() - { + public int getLastConfirmedCommandID() { return lastConfirmedCommandID; } - public boolean isReattached() - { + public boolean isReattached() { return reattached; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeInt(lastConfirmedCommandID); buffer.writeBoolean(reattached); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { lastConfirmedCommandID = buffer.readInt(); reattached = buffer.readBoolean(); } @Override - public boolean isResponse() - { + public boolean isResponse() { return true; } @Override - public final boolean isRequiresConfirmations() - { + public final boolean isRequiresConfirmations() { return false; } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + lastConfirmedCommandID; @@ -88,15 +79,14 @@ public class ReattachSessionResponseMessage extends PacketImpl } @Override - public boolean equals(Object obj) - { + public boolean equals(Object obj) { if (this == obj) return true; if (!super.equals(obj)) return false; if (!(obj instanceof ReattachSessionResponseMessage)) return false; - ReattachSessionResponseMessage other = (ReattachSessionResponseMessage)obj; + ReattachSessionResponseMessage other = (ReattachSessionResponseMessage) obj; if (lastConfirmedCommandID != other.lastConfirmedCommandID) return false; if (reattached != other.reattached) http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/RollbackMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/RollbackMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/RollbackMessage.java index 11c3c61..f9f9479 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/RollbackMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/RollbackMessage.java @@ -19,55 +19,46 @@ package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; -public class RollbackMessage extends PacketImpl -{ +public class RollbackMessage extends PacketImpl { - public RollbackMessage() - { + public RollbackMessage() { super(SESS_ROLLBACK); } - public RollbackMessage(final boolean considerLastMessageAsDelivered) - { + public RollbackMessage(final boolean considerLastMessageAsDelivered) { super(SESS_ROLLBACK); this.considerLastMessageAsDelivered = considerLastMessageAsDelivered; } - private boolean considerLastMessageAsDelivered; /** * @return the considerLastMessageAsDelivered */ - public boolean isConsiderLastMessageAsDelivered() - { + public boolean isConsiderLastMessageAsDelivered() { return considerLastMessageAsDelivered; } /** * @param isLastMessageAsDelivered the considerLastMessageAsDelivered to set */ - public void setConsiderLastMessageAsDelivered(final boolean isLastMessageAsDelivered) - { + public void setConsiderLastMessageAsDelivered(final boolean isLastMessageAsDelivered) { considerLastMessageAsDelivered = isLastMessageAsDelivered; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeBoolean(considerLastMessageAsDelivered); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { considerLastMessageAsDelivered = buffer.readBoolean(); } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + (considerLastMessageAsDelivered ? 1231 : 1237); @@ -75,15 +66,14 @@ public class RollbackMessage extends PacketImpl } @Override - public boolean equals(Object obj) - { + public boolean equals(Object obj) { if (this == obj) return true; if (!super.equals(obj)) return false; if (!(obj instanceof RollbackMessage)) return false; - RollbackMessage other = (RollbackMessage)obj; + RollbackMessage other = (RollbackMessage) obj; if (considerLastMessageAsDelivered != other.considerLastMessageAsDelivered) return false; return true; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java index 49a3308..45a4a25 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java @@ -19,16 +19,15 @@ package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; -public class SessionAcknowledgeMessage extends PacketImpl -{ +public class SessionAcknowledgeMessage extends PacketImpl { + private long consumerID; private long messageID; private boolean requiresResponse; - public SessionAcknowledgeMessage(final long consumerID, final long messageID, final boolean requiresResponse) - { + public SessionAcknowledgeMessage(final long consumerID, final long messageID, final boolean requiresResponse) { super(SESS_ACKNOWLEDGE); this.consumerID = consumerID; @@ -38,31 +37,26 @@ public class SessionAcknowledgeMessage extends PacketImpl this.requiresResponse = requiresResponse; } - public SessionAcknowledgeMessage() - { + public SessionAcknowledgeMessage() { super(SESS_ACKNOWLEDGE); } // Public -------------------------------------------------------- - public long getConsumerID() - { + public long getConsumerID() { return consumerID; } - public long getMessageID() - { + public long getMessageID() { return messageID; } - public boolean isRequiresResponse() - { + public boolean isRequiresResponse() { return requiresResponse; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeLong(consumerID); buffer.writeLong(messageID); @@ -71,8 +65,7 @@ public class SessionAcknowledgeMessage extends PacketImpl } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { consumerID = buffer.readLong(); messageID = buffer.readLong(); @@ -81,26 +74,24 @@ public class SessionAcknowledgeMessage extends PacketImpl } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); - result = prime * result + (int)(consumerID ^ (consumerID >>> 32)); - result = prime * result + (int)(messageID ^ (messageID >>> 32)); + result = prime * result + (int) (consumerID ^ (consumerID >>> 32)); + result = prime * result + (int) (messageID ^ (messageID >>> 32)); result = prime * result + (requiresResponse ? 1231 : 1237); return result; } @Override - public boolean equals(Object obj) - { + public boolean equals(Object obj) { if (this == obj) return true; if (!super.equals(obj)) return false; if (!(obj instanceof SessionAcknowledgeMessage)) return false; - SessionAcknowledgeMessage other = (SessionAcknowledgeMessage)obj; + SessionAcknowledgeMessage other = (SessionAcknowledgeMessage) obj; if (consumerID != other.consumerID) return false; if (messageID != other.messageID) http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java index 4e750fe..b54336e 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java @@ -24,56 +24,48 @@ import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; * * Packet deprecated: It exists only to support old formats */ -public class SessionAddMetaDataMessage extends PacketImpl -{ +public class SessionAddMetaDataMessage extends PacketImpl { + private String key; private String data; - public SessionAddMetaDataMessage() - { + public SessionAddMetaDataMessage() { super(SESS_ADD_METADATA); } - public SessionAddMetaDataMessage(String k, String d) - { + public SessionAddMetaDataMessage(String k, String d) { this(); key = k; data = d; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeString(key); buffer.writeString(data); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { key = buffer.readString(); data = buffer.readString(); } @Override - public final boolean isRequiresConfirmations() - { + public final boolean isRequiresConfirmations() { return false; } - public String getKey() - { + public String getKey() { return key; } - public String getData() - { + public String getData() { return data; } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + ((data == null) ? 0 : data.hashCode()); @@ -82,24 +74,21 @@ public class SessionAddMetaDataMessage extends PacketImpl } @Override - public boolean equals(Object obj) - { + public boolean equals(Object obj) { if (this == obj) return true; if (!super.equals(obj)) return false; if (!(obj instanceof SessionAddMetaDataMessage)) return false; - SessionAddMetaDataMessage other = (SessionAddMetaDataMessage)obj; - if (data == null) - { + SessionAddMetaDataMessage other = (SessionAddMetaDataMessage) obj; + if (data == null) { if (other.data != null) return false; } else if (!data.equals(other.data)) return false; - if (key == null) - { + if (key == null) { if (other.key != null) return false; } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java index c203eb7..d0d12fc 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java @@ -24,8 +24,8 @@ import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; * * This packet replaces {@link SessionAddMetaDataMessage} */ -public class SessionAddMetaDataMessageV2 extends PacketImpl -{ +public class SessionAddMetaDataMessageV2 extends PacketImpl { + private String key; private String data; /** @@ -33,32 +33,27 @@ public class SessionAddMetaDataMessageV2 extends PacketImpl */ private boolean requiresConfirmation = true; - public SessionAddMetaDataMessageV2() - { + public SessionAddMetaDataMessageV2() { super(SESS_ADD_METADATA2); } - protected SessionAddMetaDataMessageV2(byte packetCode) - { + protected SessionAddMetaDataMessageV2(byte packetCode) { super(packetCode); } - public SessionAddMetaDataMessageV2(String k, String d) - { + public SessionAddMetaDataMessageV2(String k, String d) { this(); key = k; data = d; } - protected SessionAddMetaDataMessageV2(final byte packetCode, String k, String d) - { + protected SessionAddMetaDataMessageV2(final byte packetCode, String k, String d) { super(packetCode); key = k; data = d; } - public SessionAddMetaDataMessageV2(String k, String d, boolean requiresConfirmation) - { + public SessionAddMetaDataMessageV2(String k, String d, boolean requiresConfirmation) { this(); key = k; data = d; @@ -66,40 +61,34 @@ public class SessionAddMetaDataMessageV2 extends PacketImpl } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeString(key); buffer.writeString(data); buffer.writeBoolean(requiresConfirmation); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { key = buffer.readString(); data = buffer.readString(); requiresConfirmation = buffer.readBoolean(); } @Override - public final boolean isRequiresConfirmations() - { + public final boolean isRequiresConfirmations() { return requiresConfirmation; } - public String getKey() - { + public String getKey() { return key; } - public String getData() - { + public String getData() { return data; } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + ((data == null) ? 0 : data.hashCode()); @@ -109,24 +98,21 @@ public class SessionAddMetaDataMessageV2 extends PacketImpl } @Override - public boolean equals(Object obj) - { + public boolean equals(Object obj) { if (this == obj) return true; if (!super.equals(obj)) return false; if (!(obj instanceof SessionAddMetaDataMessageV2)) return false; - SessionAddMetaDataMessageV2 other = (SessionAddMetaDataMessageV2)obj; - if (data == null) - { + SessionAddMetaDataMessageV2 other = (SessionAddMetaDataMessageV2) obj; + if (data == null) { if (other.data != null) return false; } else if (!data.equals(other.data)) return false; - if (key == null) - { + if (key == null) { if (other.key != null) return false; } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java index d2df21e..73cf603 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryMessage.java @@ -20,42 +20,36 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; -public class SessionBindingQueryMessage extends PacketImpl -{ +public class SessionBindingQueryMessage extends PacketImpl { + private SimpleString address; - public SessionBindingQueryMessage(final SimpleString address) - { + public SessionBindingQueryMessage(final SimpleString address) { super(SESS_BINDINGQUERY); this.address = address; } - public SessionBindingQueryMessage() - { + public SessionBindingQueryMessage() { super(SESS_BINDINGQUERY); } - public SimpleString getAddress() - { + public SimpleString getAddress() { return address; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeSimpleString(address); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { address = buffer.readSimpleString(); } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + ((address == null) ? 0 : address.hashCode()); @@ -63,17 +57,15 @@ public class SessionBindingQueryMessage extends PacketImpl } @Override - public boolean equals(Object obj) - { + public boolean equals(Object obj) { if (this == obj) return true; if (!super.equals(obj)) return false; if (!(obj instanceof SessionBindingQueryMessage)) return false; - SessionBindingQueryMessage other = (SessionBindingQueryMessage)obj; - if (address == null) - { + SessionBindingQueryMessage other = (SessionBindingQueryMessage) obj; + if (address == null) { if (other.address != null) return false; } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java index 5561eb6..7d77edc 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage.java @@ -24,17 +24,15 @@ import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; /** - * * A SessionBindingQueryResponseMessage */ -public class SessionBindingQueryResponseMessage extends PacketImpl -{ +public class SessionBindingQueryResponseMessage extends PacketImpl { + protected boolean exists; protected List queueNames; - public SessionBindingQueryResponseMessage(final boolean exists, final List queueNames) - { + public SessionBindingQueryResponseMessage(final boolean exists, final List queueNames) { super(SESS_BINDINGQUERY_RESP); this.exists = exists; @@ -42,58 +40,48 @@ public class SessionBindingQueryResponseMessage extends PacketImpl this.queueNames = queueNames; } - public SessionBindingQueryResponseMessage() - { + public SessionBindingQueryResponseMessage() { super(SESS_BINDINGQUERY_RESP); } - public SessionBindingQueryResponseMessage(byte v2) - { + public SessionBindingQueryResponseMessage(byte v2) { super(v2); } @Override - public boolean isResponse() - { + public boolean isResponse() { return true; } - public boolean isExists() - { + public boolean isExists() { return exists; } - public List getQueueNames() - { + public List getQueueNames() { return queueNames; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeBoolean(exists); buffer.writeInt(queueNames.size()); - for (SimpleString queueName : queueNames) - { + for (SimpleString queueName : queueNames) { buffer.writeSimpleString(queueName); } } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { exists = buffer.readBoolean(); int numQueues = buffer.readInt(); queueNames = new ArrayList(numQueues); - for (int i = 0; i < numQueues; i++) - { + for (int i = 0; i < numQueues; i++) { queueNames.add(buffer.readSimpleString()); } } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + (exists ? 1231 : 1237); @@ -102,19 +90,17 @@ public class SessionBindingQueryResponseMessage extends PacketImpl } @Override - public boolean equals(Object obj) - { + public boolean equals(Object obj) { if (this == obj) return true; if (!super.equals(obj)) return false; if (!(obj instanceof SessionBindingQueryResponseMessage)) return false; - SessionBindingQueryResponseMessage other = (SessionBindingQueryResponseMessage)obj; + SessionBindingQueryResponseMessage other = (SessionBindingQueryResponseMessage) obj; if (exists != other.exists) return false; - if (queueNames == null) - { + if (queueNames == null) { if (other.queueNames != null) return false; } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage_V2.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage_V2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage_V2.java index 0d142b1..269633c 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage_V2.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionBindingQueryResponseMessage_V2.java @@ -21,12 +21,13 @@ import java.util.List; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.SimpleString; -public class SessionBindingQueryResponseMessage_V2 extends SessionBindingQueryResponseMessage -{ +public class SessionBindingQueryResponseMessage_V2 extends SessionBindingQueryResponseMessage { + private boolean autoCreateJmsQueues; - public SessionBindingQueryResponseMessage_V2(final boolean exists, final List queueNames, final boolean autoCreateJmsQueues) - { + public SessionBindingQueryResponseMessage_V2(final boolean exists, + final List queueNames, + final boolean autoCreateJmsQueues) { super(SESS_BINDINGQUERY_RESP_V2); this.exists = exists; @@ -36,33 +37,28 @@ public class SessionBindingQueryResponseMessage_V2 extends SessionBindingQueryRe this.autoCreateJmsQueues = autoCreateJmsQueues; } - public SessionBindingQueryResponseMessage_V2() - { + public SessionBindingQueryResponseMessage_V2() { super(SESS_BINDINGQUERY_RESP_V2); } - public boolean isAutoCreateJmsQueues() - { + public boolean isAutoCreateJmsQueues() { return autoCreateJmsQueues; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { super.encodeRest(buffer); buffer.writeBoolean(autoCreateJmsQueues); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { super.decodeRest(buffer); autoCreateJmsQueues = buffer.readBoolean(); } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + (autoCreateJmsQueues ? 1231 : 1237); @@ -70,15 +66,14 @@ public class SessionBindingQueryResponseMessage_V2 extends SessionBindingQueryRe } @Override - public boolean equals(Object obj) - { + public boolean equals(Object obj) { if (this == obj) return true; if (!super.equals(obj)) return false; if (!(obj instanceof SessionBindingQueryResponseMessage_V2)) return false; - SessionBindingQueryResponseMessage_V2 other = (SessionBindingQueryResponseMessage_V2)obj; + SessionBindingQueryResponseMessage_V2 other = (SessionBindingQueryResponseMessage_V2) obj; if (autoCreateJmsQueues != other.autoCreateJmsQueues) return false; return true; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCloseMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCloseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCloseMessage.java index ee9e242..3024e87 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCloseMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCloseMessage.java @@ -18,22 +18,17 @@ package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; -public class SessionCloseMessage extends PacketImpl -{ +public class SessionCloseMessage extends PacketImpl { - - public SessionCloseMessage() - { + public SessionCloseMessage() { super(SESS_CLOSE); } // Public -------------------------------------------------------- @Override - public boolean equals(final Object other) - { - if (other instanceof SessionCloseMessage == false) - { + public boolean equals(final Object other) { + if (other instanceof SessionCloseMessage == false) { return false; } @@ -41,8 +36,7 @@ public class SessionCloseMessage extends PacketImpl } @Override - public int hashCode() - { + public int hashCode() { // TODO return 0; } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCommitMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCommitMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCommitMessage.java index acacbcc..2154190 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCommitMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCommitMessage.java @@ -18,11 +18,9 @@ package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; -public class SessionCommitMessage extends PacketImpl -{ +public class SessionCommitMessage extends PacketImpl { - public SessionCommitMessage() - { + public SessionCommitMessage() { super(SESS_COMMIT); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java index debc8c8..a3570a2 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java @@ -19,67 +19,58 @@ package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; -public class SessionConsumerCloseMessage extends PacketImpl -{ +public class SessionConsumerCloseMessage extends PacketImpl { private long consumerID; - public SessionConsumerCloseMessage(final long objectID) - { + public SessionConsumerCloseMessage(final long objectID) { super(SESS_CONSUMER_CLOSE); consumerID = objectID; } - public SessionConsumerCloseMessage() - { + public SessionConsumerCloseMessage() { super(SESS_CONSUMER_CLOSE); } // Public -------------------------------------------------------- - public long getConsumerID() - { + public long getConsumerID() { return consumerID; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeLong(consumerID); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { consumerID = buffer.readLong(); } @Override - public String toString() - { + public String toString() { return getParentString() + ", consumerID=" + consumerID + "]"; } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); - result = prime * result + (int)(consumerID ^ (consumerID >>> 32)); + result = prime * result + (int) (consumerID ^ (consumerID >>> 32)); return result; } @Override - public boolean equals(Object obj) - { + public boolean equals(Object obj) { if (this == obj) return true; if (!super.equals(obj)) return false; if (!(obj instanceof SessionConsumerCloseMessage)) return false; - SessionConsumerCloseMessage other = (SessionConsumerCloseMessage)obj; + SessionConsumerCloseMessage other = (SessionConsumerCloseMessage) obj; if (consumerID != other.consumerID) return false; return true; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java index 65db75a..71ab68a 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java @@ -19,75 +19,66 @@ package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; -public class SessionConsumerFlowCreditMessage extends PacketImpl -{ +public class SessionConsumerFlowCreditMessage extends PacketImpl { + private long consumerID; private int credits; - public SessionConsumerFlowCreditMessage(final long consumerID, final int credits) - { + public SessionConsumerFlowCreditMessage(final long consumerID, final int credits) { super(SESS_FLOWTOKEN); this.consumerID = consumerID; this.credits = credits; } - public SessionConsumerFlowCreditMessage() - { + public SessionConsumerFlowCreditMessage() { super(SESS_FLOWTOKEN); } // Public -------------------------------------------------------- - public long getConsumerID() - { + public long getConsumerID() { return consumerID; } - public int getCredits() - { + public int getCredits() { return credits; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeLong(consumerID); buffer.writeInt(credits); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { consumerID = buffer.readLong(); credits = buffer.readInt(); } @Override - public String toString() - { + public String toString() { return getParentString() + ", consumerID=" + consumerID + ", credits=" + credits + "]"; } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); - result = prime * result + (int)(consumerID ^ (consumerID >>> 32)); + result = prime * result + (int) (consumerID ^ (consumerID >>> 32)); result = prime * result + credits; return result; } @Override - public boolean equals(Object obj) - { + public boolean equals(Object obj) { if (this == obj) return true; if (!super.equals(obj)) return false; if (!(obj instanceof SessionConsumerFlowCreditMessage)) return false; - SessionConsumerFlowCreditMessage other = (SessionConsumerFlowCreditMessage)obj; + SessionConsumerFlowCreditMessage other = (SessionConsumerFlowCreditMessage) obj; if (consumerID != other.consumerID) return false; if (credits != other.credits) http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionContinuationMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionContinuationMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionContinuationMessage.java index e0f891c..901837b 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionContinuationMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionContinuationMessage.java @@ -22,25 +22,22 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; import org.apache.activemq.artemis.utils.DataConstants; -public abstract class SessionContinuationMessage extends PacketImpl -{ +public abstract class SessionContinuationMessage extends PacketImpl { public static final int SESSION_CONTINUATION_BASE_SIZE = PACKET_HEADERS_SIZE + DataConstants.SIZE_INT + - DataConstants.SIZE_BOOLEAN; + DataConstants.SIZE_BOOLEAN; protected byte[] body; protected boolean continues; - public SessionContinuationMessage(final byte type, final byte[] body, final boolean continues) - { + public SessionContinuationMessage(final byte type, final byte[] body, final boolean continues) { super(type); this.body = body; this.continues = continues; } - public SessionContinuationMessage(final byte type) - { + public SessionContinuationMessage(final byte type) { super(type); } @@ -49,14 +46,11 @@ public abstract class SessionContinuationMessage extends PacketImpl /** * @return the body */ - public byte[] getBody() - { - if (size <= 0) - { + public byte[] getBody() { + if (size <= 0) { return new byte[0]; } - else - { + else { return body; } } @@ -64,22 +58,19 @@ public abstract class SessionContinuationMessage extends PacketImpl /** * @return the continues */ - public boolean isContinues() - { + public boolean isContinues() { return continues; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeInt(body.length); buffer.writeBytes(body); buffer.writeBoolean(continues); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { int size = buffer.readInt(); body = new byte[size]; buffer.readBytes(body); @@ -87,8 +78,7 @@ public abstract class SessionContinuationMessage extends PacketImpl } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + Arrays.hashCode(body); @@ -97,15 +87,14 @@ public abstract class SessionContinuationMessage extends PacketImpl } @Override - public boolean equals(Object obj) - { + public boolean equals(Object obj) { if (this == obj) return true; if (!super.equals(obj)) return false; if (!(obj instanceof SessionContinuationMessage)) return false; - SessionContinuationMessage other = (SessionContinuationMessage)obj; + SessionContinuationMessage other = (SessionContinuationMessage) obj; if (!Arrays.equals(body, other.body)) return false; if (continues != other.continues) http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java index 488230f..bae39d2 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCreateConsumerMessage.java @@ -20,8 +20,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; -public class SessionCreateConsumerMessage extends PacketImpl -{ +public class SessionCreateConsumerMessage extends PacketImpl { private long id; @@ -37,8 +36,7 @@ public class SessionCreateConsumerMessage extends PacketImpl final SimpleString queueName, final SimpleString filterString, final boolean browseOnly, - final boolean requiresResponse) - { + final boolean requiresResponse) { super(SESS_CREATECONSUMER); this.id = id; @@ -48,14 +46,12 @@ public class SessionCreateConsumerMessage extends PacketImpl this.requiresResponse = requiresResponse; } - public SessionCreateConsumerMessage() - { + public SessionCreateConsumerMessage() { super(SESS_CREATECONSUMER); } @Override - public String toString() - { + public String toString() { StringBuffer buff = new StringBuffer(getParentString()); buff.append(", queueName=" + queueName); buff.append(", filterString=" + filterString); @@ -63,49 +59,40 @@ public class SessionCreateConsumerMessage extends PacketImpl return buff.toString(); } - public long getID() - { + public long getID() { return id; } - public SimpleString getQueueName() - { + public SimpleString getQueueName() { return queueName; } - public SimpleString getFilterString() - { + public SimpleString getFilterString() { return filterString; } - public boolean isBrowseOnly() - { + public boolean isBrowseOnly() { return browseOnly; } - public boolean isRequiresResponse() - { + public boolean isRequiresResponse() { return requiresResponse; } - public void setQueueName(SimpleString queueName) - { + public void setQueueName(SimpleString queueName) { this.queueName = queueName; } - public void setFilterString(SimpleString filterString) - { + public void setFilterString(SimpleString filterString) { this.filterString = filterString; } - public void setBrowseOnly(boolean browseOnly) - { + public void setBrowseOnly(boolean browseOnly) { this.browseOnly = browseOnly; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeLong(id); buffer.writeSimpleString(queueName); buffer.writeNullableSimpleString(filterString); @@ -114,8 +101,7 @@ public class SessionCreateConsumerMessage extends PacketImpl } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { id = buffer.readLong(); queueName = buffer.readSimpleString(); filterString = buffer.readNullableSimpleString(); @@ -124,32 +110,29 @@ public class SessionCreateConsumerMessage extends PacketImpl } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + (browseOnly ? 1231 : 1237); result = prime * result + ((filterString == null) ? 0 : filterString.hashCode()); - result = prime * result + (int)(id ^ (id >>> 32)); + result = prime * result + (int) (id ^ (id >>> 32)); result = prime * result + ((queueName == null) ? 0 : queueName.hashCode()); result = prime * result + (requiresResponse ? 1231 : 1237); return result; } @Override - public boolean equals(Object obj) - { + public boolean equals(Object obj) { if (this == obj) return true; if (!super.equals(obj)) return false; if (!(obj instanceof SessionCreateConsumerMessage)) return false; - SessionCreateConsumerMessage other = (SessionCreateConsumerMessage)obj; + SessionCreateConsumerMessage other = (SessionCreateConsumerMessage) obj; if (browseOnly != other.browseOnly) return false; - if (filterString == null) - { + if (filterString == null) { if (other.filterString != null) return false; } @@ -157,8 +140,7 @@ public class SessionCreateConsumerMessage extends PacketImpl return false; if (id != other.id) return false; - if (queueName == null) - { + if (queueName == null) { if (other.queueName != null) return false; }