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 3D35418DE2 for ; Mon, 10 Aug 2015 15:13:03 +0000 (UTC) Received: (qmail 45103 invoked by uid 500); 10 Aug 2015 15:13:02 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 44988 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 44162 invoked by uid 99); 10 Aug 2015 15:13:01 -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:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C5323E050A; 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:28 -0000 Message-Id: <5f129568cf284977823c1afe629c13c3@git.apache.org> In-Reply-To: <6d75255d38c94b2f8601b49eb76c9d59@git.apache.org> References: <6d75255d38c94b2f8601b49eb76c9d59@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [29/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/SessionDeleteQueueMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java index 47d0a51..def97d8 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionDeleteQueueMessage.java @@ -20,51 +20,44 @@ 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 SessionDeleteQueueMessage extends PacketImpl -{ +public class SessionDeleteQueueMessage extends PacketImpl { + private SimpleString queueName; - public SessionDeleteQueueMessage(final SimpleString queueName) - { + public SessionDeleteQueueMessage(final SimpleString queueName) { super(DELETE_QUEUE); this.queueName = queueName; } - public SessionDeleteQueueMessage() - { + public SessionDeleteQueueMessage() { super(DELETE_QUEUE); } @Override - public String toString() - { + public String toString() { StringBuffer buff = new StringBuffer(getParentString()); buff.append(", queueName=" + queueName); buff.append("]"); return buff.toString(); } - public SimpleString getQueueName() - { + public SimpleString getQueueName() { return queueName; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeSimpleString(queueName); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { queueName = buffer.readSimpleString(); } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + ((queueName == null) ? 0 : queueName.hashCode()); @@ -72,17 +65,15 @@ public class SessionDeleteQueueMessage 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 SessionDeleteQueueMessage)) return false; - SessionDeleteQueueMessage other = (SessionDeleteQueueMessage)obj; - if (queueName == null) - { + SessionDeleteQueueMessage other = (SessionDeleteQueueMessage) obj; + 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/SessionExpireMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionExpireMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionExpireMessage.java index 230831c..48e9ea4 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionExpireMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionExpireMessage.java @@ -19,8 +19,7 @@ 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 SessionExpireMessage extends PacketImpl -{ +public class SessionExpireMessage extends PacketImpl { // Constants ----------------------------------------------------- // Attributes ---------------------------------------------------- @@ -33,8 +32,7 @@ public class SessionExpireMessage extends PacketImpl // Constructors -------------------------------------------------- - public SessionExpireMessage(final long consumerID, final long messageID) - { + public SessionExpireMessage(final long consumerID, final long messageID) { super(SESS_EXPIRED); this.consumerID = consumerID; @@ -42,59 +40,52 @@ public class SessionExpireMessage extends PacketImpl this.messageID = messageID; } - public SessionExpireMessage() - { + public SessionExpireMessage() { super(SESS_EXPIRED); } // Public -------------------------------------------------------- - public long getConsumerID() - { + public long getConsumerID() { return consumerID; } - public long getMessageID() - { + public long getMessageID() { return messageID; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeLong(consumerID); buffer.writeLong(messageID); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { consumerID = buffer.readLong(); messageID = buffer.readLong(); } @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)); 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 SessionExpireMessage)) return false; - SessionExpireMessage other = (SessionExpireMessage)obj; + SessionExpireMessage other = (SessionExpireMessage) 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/SessionForceConsumerDelivery.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java index add873c..6885627 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionForceConsumerDelivery.java @@ -20,54 +20,46 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; /** - * * A SessionConsumerForceDelivery */ -public class SessionForceConsumerDelivery extends PacketImpl -{ +public class SessionForceConsumerDelivery extends PacketImpl { + private long consumerID; private long sequence; - public SessionForceConsumerDelivery(final long consumerID, final long sequence) - { + public SessionForceConsumerDelivery(final long consumerID, final long sequence) { super(SESS_FORCE_CONSUMER_DELIVERY); this.consumerID = consumerID; this.sequence = sequence; } - public SessionForceConsumerDelivery() - { + public SessionForceConsumerDelivery() { super(SESS_FORCE_CONSUMER_DELIVERY); } - public long getConsumerID() - { + public long getConsumerID() { return consumerID; } - public long getSequence() - { + public long getSequence() { return sequence; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeLong(consumerID); buffer.writeLong(sequence); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { consumerID = buffer.readLong(); sequence = buffer.readLong(); } @Override - public String toString() - { + public String toString() { StringBuffer buf = new StringBuffer(getParentString()); buf.append(", consumerID=" + consumerID); buf.append(", sequence=" + sequence); @@ -76,25 +68,23 @@ public class SessionForceConsumerDelivery 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)(sequence ^ (sequence >>> 32)); + result = prime * result + (int) (consumerID ^ (consumerID >>> 32)); + result = prime * result + (int) (sequence ^ (sequence >>> 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 SessionForceConsumerDelivery)) return false; - SessionForceConsumerDelivery other = (SessionForceConsumerDelivery)obj; + SessionForceConsumerDelivery other = (SessionForceConsumerDelivery) obj; if (consumerID != other.consumerID) return false; if (sequence != other.sequence) 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/SessionIndividualAcknowledgeMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java index 74b3f81..6ca5f88 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java @@ -19,8 +19,7 @@ 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 SessionIndividualAcknowledgeMessage extends PacketImpl -{ +public class SessionIndividualAcknowledgeMessage extends PacketImpl { // Constants ----------------------------------------------------- // Attributes ---------------------------------------------------- @@ -35,8 +34,9 @@ public class SessionIndividualAcknowledgeMessage extends PacketImpl // Constructors -------------------------------------------------- - public SessionIndividualAcknowledgeMessage(final long consumerID, final long messageID, final boolean requiresResponse) - { + public SessionIndividualAcknowledgeMessage(final long consumerID, + final long messageID, + final boolean requiresResponse) { super(SESS_INDIVIDUAL_ACKNOWLEDGE); this.consumerID = consumerID; @@ -46,31 +46,26 @@ public class SessionIndividualAcknowledgeMessage extends PacketImpl this.requiresResponse = requiresResponse; } - public SessionIndividualAcknowledgeMessage() - { + public SessionIndividualAcknowledgeMessage() { super(SESS_INDIVIDUAL_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); @@ -79,8 +74,7 @@ public class SessionIndividualAcknowledgeMessage extends PacketImpl } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { consumerID = buffer.readLong(); messageID = buffer.readLong(); @@ -89,26 +83,24 @@ public class SessionIndividualAcknowledgeMessage 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 SessionIndividualAcknowledgeMessage)) return false; - SessionIndividualAcknowledgeMessage other = (SessionIndividualAcknowledgeMessage)obj; + SessionIndividualAcknowledgeMessage other = (SessionIndividualAcknowledgeMessage) 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/SessionProducerCreditsFailMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java index 64c7d20..6e995ba 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionProducerCreditsFailMessage.java @@ -20,14 +20,13 @@ 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 SessionProducerCreditsFailMessage extends PacketImpl -{ +public class SessionProducerCreditsFailMessage extends PacketImpl { + private int credits; private SimpleString address; - public SessionProducerCreditsFailMessage(final int credits, final SimpleString address) - { + public SessionProducerCreditsFailMessage(final int credits, final SimpleString address) { super(SESS_PRODUCER_FAIL_CREDITS); this.credits = credits; @@ -35,38 +34,32 @@ public class SessionProducerCreditsFailMessage extends PacketImpl this.address = address; } - public SessionProducerCreditsFailMessage() - { + public SessionProducerCreditsFailMessage() { super(SESS_PRODUCER_FAIL_CREDITS); } - public int getCredits() - { + public int getCredits() { return credits; } - public SimpleString getAddress() - { + public SimpleString getAddress() { return address; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeInt(credits); buffer.writeSimpleString(address); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { credits = buffer.readInt(); 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()); @@ -75,17 +68,15 @@ public class SessionProducerCreditsFailMessage 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 SessionProducerCreditsFailMessage)) return false; - SessionProducerCreditsFailMessage other = (SessionProducerCreditsFailMessage)obj; - if (address == null) - { + SessionProducerCreditsFailMessage other = (SessionProducerCreditsFailMessage) 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/SessionProducerCreditsMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java index b2f009b..c2bd339 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionProducerCreditsMessage.java @@ -20,14 +20,13 @@ 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 SessionProducerCreditsMessage extends PacketImpl -{ +public class SessionProducerCreditsMessage extends PacketImpl { + private int credits; private SimpleString address; - public SessionProducerCreditsMessage(final int credits, final SimpleString address) - { + public SessionProducerCreditsMessage(final int credits, final SimpleString address) { super(SESS_PRODUCER_CREDITS); this.credits = credits; @@ -35,38 +34,32 @@ public class SessionProducerCreditsMessage extends PacketImpl this.address = address; } - public SessionProducerCreditsMessage() - { + public SessionProducerCreditsMessage() { super(SESS_PRODUCER_CREDITS); } - public int getCredits() - { + public int getCredits() { return credits; } - public SimpleString getAddress() - { + public SimpleString getAddress() { return address; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeInt(credits); buffer.writeSimpleString(address); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { credits = buffer.readInt(); 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()); @@ -75,17 +68,15 @@ public class SessionProducerCreditsMessage 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 SessionProducerCreditsMessage)) return false; - SessionProducerCreditsMessage other = (SessionProducerCreditsMessage)obj; - if (address == null) - { + SessionProducerCreditsMessage other = (SessionProducerCreditsMessage) 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/SessionQueueQueryMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java index f885e42..df38bf4 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryMessage.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 SessionQueueQueryMessage extends PacketImpl -{ +public class SessionQueueQueryMessage extends PacketImpl { + private SimpleString queueName; - public SessionQueueQueryMessage(final SimpleString queueName) - { + public SessionQueueQueryMessage(final SimpleString queueName) { super(SESS_QUEUEQUERY); this.queueName = queueName; } - public SessionQueueQueryMessage() - { + public SessionQueueQueryMessage() { super(SESS_QUEUEQUERY); } - public SimpleString getQueueName() - { + public SimpleString getQueueName() { return queueName; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeSimpleString(queueName); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { queueName = buffer.readSimpleString(); } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + ((queueName == null) ? 0 : queueName.hashCode()); @@ -63,17 +57,15 @@ public class SessionQueueQueryMessage 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 SessionQueueQueryMessage)) return false; - SessionQueueQueryMessage other = (SessionQueueQueryMessage)obj; - if (queueName == null) - { + SessionQueueQueryMessage other = (SessionQueueQueryMessage) obj; + 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/SessionQueueQueryResponseMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java index 08f8f90..edd7a4f 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage.java @@ -23,8 +23,8 @@ import org.apache.activemq.artemis.core.client.impl.QueueQueryImpl; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; import org.apache.activemq.artemis.core.server.QueueQueryResult; -public class SessionQueueQueryResponseMessage extends PacketImpl -{ +public class SessionQueueQueryResponseMessage extends PacketImpl { + protected SimpleString name; protected boolean exists; @@ -41,19 +41,15 @@ public class SessionQueueQueryResponseMessage extends PacketImpl protected boolean temporary; - public SessionQueueQueryResponseMessage(final QueueQueryResult result) - { - this(result.getName(), result.getAddress(), result.isDurable(), result.isTemporary(), - result.getFilterString(), result.getConsumerCount(), result.getMessageCount(), result.isExists()); + public SessionQueueQueryResponseMessage(final QueueQueryResult result) { + this(result.getName(), result.getAddress(), result.isDurable(), result.isTemporary(), result.getFilterString(), result.getConsumerCount(), result.getMessageCount(), result.isExists()); } - public SessionQueueQueryResponseMessage() - { + public SessionQueueQueryResponseMessage() { this(null, null, false, false, null, 0, 0, false); } - public SessionQueueQueryResponseMessage(byte v2) - { + public SessionQueueQueryResponseMessage(byte v2) { super(v2); } @@ -64,8 +60,7 @@ public class SessionQueueQueryResponseMessage extends PacketImpl final SimpleString filterString, final int consumerCount, final long messageCount, - final boolean exists) - { + final boolean exists) { super(SESS_QUEUEQUERY_RESP); this.durable = durable; @@ -86,54 +81,44 @@ public class SessionQueueQueryResponseMessage extends PacketImpl } @Override - public boolean isResponse() - { + public boolean isResponse() { return true; } - public boolean isExists() - { + public boolean isExists() { return exists; } - public boolean isDurable() - { + public boolean isDurable() { return durable; } - public int getConsumerCount() - { + public int getConsumerCount() { return consumerCount; } - public long getMessageCount() - { + public long getMessageCount() { return messageCount; } - public SimpleString getFilterString() - { + public SimpleString getFilterString() { return filterString; } - public SimpleString getAddress() - { + public SimpleString getAddress() { return address; } - public SimpleString getName() - { + public SimpleString getName() { return name; } - public boolean isTemporary() - { + public boolean isTemporary() { return temporary; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeBoolean(exists); buffer.writeBoolean(durable); buffer.writeBoolean(temporary); @@ -145,8 +130,7 @@ public class SessionQueueQueryResponseMessage extends PacketImpl } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { exists = buffer.readBoolean(); durable = buffer.readBoolean(); temporary = buffer.readBoolean(); @@ -158,8 +142,7 @@ public class SessionQueueQueryResponseMessage 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()); @@ -167,36 +150,26 @@ public class SessionQueueQueryResponseMessage extends PacketImpl result = prime * result + (durable ? 1231 : 1237); result = prime * result + (exists ? 1231 : 1237); result = prime * result + ((filterString == null) ? 0 : filterString.hashCode()); - result = prime * result + (int)(messageCount ^ (messageCount >>> 32)); + result = prime * result + (int) (messageCount ^ (messageCount >>> 32)); result = prime * result + ((name == null) ? 0 : name.hashCode()); result = prime * result + (temporary ? 1231 : 1237); return result; } - public ClientSession.QueueQuery toQueueQuery() - { - return new QueueQueryImpl(isDurable(), - isTemporary(), - getConsumerCount(), - getMessageCount(), - getFilterString(), - getAddress(), - getName(), - isExists()); + public ClientSession.QueueQuery toQueueQuery() { + return new QueueQueryImpl(isDurable(), isTemporary(), getConsumerCount(), getMessageCount(), getFilterString(), getAddress(), getName(), isExists()); } @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 SessionQueueQueryResponseMessage)) return false; - SessionQueueQueryResponseMessage other = (SessionQueueQueryResponseMessage)obj; - if (address == null) - { + SessionQueueQueryResponseMessage other = (SessionQueueQueryResponseMessage) obj; + if (address == null) { if (other.address != null) return false; } @@ -208,8 +181,7 @@ public class SessionQueueQueryResponseMessage extends PacketImpl return false; if (exists != other.exists) return false; - if (filterString == null) - { + if (filterString == null) { if (other.filterString != null) return false; } @@ -217,8 +189,7 @@ public class SessionQueueQueryResponseMessage extends PacketImpl return false; if (messageCount != other.messageCount) return false; - if (name == null) - { + if (name == null) { if (other.name != null) return false; } @@ -229,5 +200,4 @@ public class SessionQueueQueryResponseMessage extends PacketImpl 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/SessionQueueQueryResponseMessage_V2.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage_V2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage_V2.java index 3f78acf..c98ac0a 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage_V2.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionQueueQueryResponseMessage_V2.java @@ -22,18 +22,15 @@ import org.apache.activemq.artemis.api.core.client.ClientSession; import org.apache.activemq.artemis.core.client.impl.QueueQueryImpl; import org.apache.activemq.artemis.core.server.QueueQueryResult; -public class SessionQueueQueryResponseMessage_V2 extends SessionQueueQueryResponseMessage -{ +public class SessionQueueQueryResponseMessage_V2 extends SessionQueueQueryResponseMessage { + private boolean autoCreationEnabled; - public SessionQueueQueryResponseMessage_V2(final QueueQueryResult result) - { - this(result.getName(), result.getAddress(), result.isDurable(), result.isTemporary(), - result.getFilterString(), result.getConsumerCount(), result.getMessageCount(), result.isExists(), result.isAutoCreateJmsQueues()); + public SessionQueueQueryResponseMessage_V2(final QueueQueryResult result) { + this(result.getName(), result.getAddress(), result.isDurable(), result.isTemporary(), result.getFilterString(), result.getConsumerCount(), result.getMessageCount(), result.isExists(), result.isAutoCreateJmsQueues()); } - public SessionQueueQueryResponseMessage_V2() - { + public SessionQueueQueryResponseMessage_V2() { this(null, null, false, false, null, 0, 0, false, false); } @@ -45,8 +42,7 @@ public class SessionQueueQueryResponseMessage_V2 extends SessionQueueQueryRespon final int consumerCount, final long messageCount, final boolean exists, - final boolean autoCreationEnabled) - { + final boolean autoCreationEnabled) { super(SESS_QUEUEQUERY_RESP_V2); this.durable = durable; @@ -68,57 +64,43 @@ public class SessionQueueQueryResponseMessage_V2 extends SessionQueueQueryRespon this.autoCreationEnabled = autoCreationEnabled; } - public boolean isAutoCreationEnabled() - { + public boolean isAutoCreationEnabled() { return autoCreationEnabled; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { super.encodeRest(buffer); buffer.writeBoolean(autoCreationEnabled); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { super.decodeRest(buffer); autoCreationEnabled = buffer.readBoolean(); } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + (autoCreationEnabled ? 1231 : 1237); return result; } - public ClientSession.QueueQuery toQueueQuery() - { - return new QueueQueryImpl(isDurable(), - isTemporary(), - getConsumerCount(), - getMessageCount(), - getFilterString(), - getAddress(), - getName(), - isExists(), - isAutoCreationEnabled()); + public ClientSession.QueueQuery toQueueQuery() { + return new QueueQueryImpl(isDurable(), isTemporary(), getConsumerCount(), getMessageCount(), getFilterString(), getAddress(), getName(), isExists(), isAutoCreationEnabled()); } @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 SessionQueueQueryResponseMessage_V2)) return false; - SessionQueueQueryResponseMessage_V2 other = (SessionQueueQueryResponseMessage_V2)obj; + SessionQueueQueryResponseMessage_V2 other = (SessionQueueQueryResponseMessage_V2) obj; if (autoCreationEnabled != other.autoCreationEnabled) 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/SessionReceiveClientLargeMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java index 3e651df..66e509c 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveClientLargeMessage.java @@ -20,18 +20,16 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.core.client.impl.ClientLargeMessageInternal; import org.apache.activemq.artemis.core.message.impl.MessageInternal; -public class SessionReceiveClientLargeMessage extends SessionReceiveLargeMessage -{ - public SessionReceiveClientLargeMessage(MessageInternal message) - { +public class SessionReceiveClientLargeMessage extends SessionReceiveLargeMessage { + + public SessionReceiveClientLargeMessage(MessageInternal message) { super(message); } @Override - public void decodeRest(ActiveMQBuffer buffer) - { + public void decodeRest(ActiveMQBuffer buffer) { super.decodeRest(buffer); - ((ClientLargeMessageInternal)getLargeMessage()).setLargeMessageSize(getLargeMessageSize()); + ((ClientLargeMessageInternal) getLargeMessage()).setLargeMessageSize(getLargeMessageSize()); } } 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/SessionReceiveContinuationMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java index 8a7d49b..7ed680a 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java @@ -19,8 +19,7 @@ package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.utils.DataConstants; -public class SessionReceiveContinuationMessage extends SessionContinuationMessage -{ +public class SessionReceiveContinuationMessage extends SessionContinuationMessage { // Constants ----------------------------------------------------- @@ -34,8 +33,7 @@ public class SessionReceiveContinuationMessage extends SessionContinuationMessag // Constructors -------------------------------------------------- - public SessionReceiveContinuationMessage() - { + public SessionReceiveContinuationMessage() { super(SESS_RECEIVE_CONTINUATION); } @@ -48,8 +46,7 @@ public class SessionReceiveContinuationMessage extends SessionContinuationMessag public SessionReceiveContinuationMessage(final long consumerID, final byte[] body, final boolean continues, - final boolean requiresResponse) - { + final boolean requiresResponse) { super(SESS_RECEIVE_CONTINUATION, body, continues); this.consumerID = consumerID; } @@ -58,8 +55,7 @@ public class SessionReceiveContinuationMessage extends SessionContinuationMessag final byte[] body, final boolean continues, final boolean requiresResponse, - final int packetSize) - { + final int packetSize) { this(consumerID, body, continues, requiresResponse); this.size = packetSize; } @@ -67,61 +63,52 @@ public class SessionReceiveContinuationMessage extends SessionContinuationMessag /** * @return the consumerID */ - public long getConsumerID() - { + public long getConsumerID() { return consumerID; } // Public -------------------------------------------------------- @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { super.encodeRest(buffer); buffer.writeLong(consumerID); } + @Override - public int getPacketSize() - { - if (size == -1) - { + public int getPacketSize() { + if (size == -1) { // This packet was created by the LargeMessageController return 0; } - else - { + else { return size; } } - - @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { super.decodeRest(buffer); consumerID = buffer.readLong(); } @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 SessionReceiveContinuationMessage)) return false; - SessionReceiveContinuationMessage other = (SessionReceiveContinuationMessage)obj; + SessionReceiveContinuationMessage other = (SessionReceiveContinuationMessage) 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/SessionReceiveLargeMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java index 556f698..460cd23 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveLargeMessage.java @@ -20,11 +20,13 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.core.message.impl.MessageInternal; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; -public class SessionReceiveLargeMessage extends PacketImpl -{ +public class SessionReceiveLargeMessage extends PacketImpl { + private final MessageInternal message; - /** Since we receive the message before the entire message was received, */ + /** + * Since we receive the message before the entire message was received, + */ private long largeMessageSize; private long consumerID; @@ -32,8 +34,7 @@ public class SessionReceiveLargeMessage extends PacketImpl private int deliveryCount; // To be used on decoding at the client while receiving a large message - public SessionReceiveLargeMessage(final MessageInternal message) - { + public SessionReceiveLargeMessage(final MessageInternal message) { super(SESS_RECEIVE_LARGE_MSG); this.message = message; } @@ -41,8 +42,7 @@ public class SessionReceiveLargeMessage extends PacketImpl public SessionReceiveLargeMessage(final long consumerID, final MessageInternal message, final long largeMessageSize, - final int deliveryCount) - { + final int deliveryCount) { super(SESS_RECEIVE_LARGE_MSG); this.consumerID = consumerID; @@ -54,32 +54,27 @@ public class SessionReceiveLargeMessage extends PacketImpl this.largeMessageSize = largeMessageSize; } - public MessageInternal getLargeMessage() - { + public MessageInternal getLargeMessage() { return message; } - public long getConsumerID() - { + public long getConsumerID() { return consumerID; } - public int getDeliveryCount() - { + public int getDeliveryCount() { return deliveryCount; } /** * @return the largeMessageSize */ - public long getLargeMessageSize() - { + public long getLargeMessageSize() { return largeMessageSize; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeLong(consumerID); buffer.writeInt(deliveryCount); buffer.writeLong(largeMessageSize); @@ -87,8 +82,7 @@ public class SessionReceiveLargeMessage extends PacketImpl } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { consumerID = buffer.readLong(); deliveryCount = buffer.readInt(); largeMessageSize = buffer.readLong(); @@ -96,35 +90,32 @@ public class SessionReceiveLargeMessage 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) (consumerID ^ (consumerID >>> 32)); result = prime * result + deliveryCount; - result = prime * result + (int)(largeMessageSize ^ (largeMessageSize >>> 32)); + result = prime * result + (int) (largeMessageSize ^ (largeMessageSize >>> 32)); result = prime * result + ((message == null) ? 0 : message.hashCode()); 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 SessionReceiveLargeMessage)) return false; - SessionReceiveLargeMessage other = (SessionReceiveLargeMessage)obj; + SessionReceiveLargeMessage other = (SessionReceiveLargeMessage) obj; if (consumerID != other.consumerID) return false; if (deliveryCount != other.deliveryCount) return false; if (largeMessageSize != other.largeMessageSize) return false; - if (message == null) - { + if (message == null) { if (other.message != 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/SessionReceiveMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveMessage.java index 2171349..83fe33c 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveMessage.java @@ -21,8 +21,7 @@ import org.apache.activemq.artemis.core.message.impl.MessageInternal; import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; import org.apache.activemq.artemis.utils.DataConstants; -public class SessionReceiveMessage extends MessagePacket -{ +public class SessionReceiveMessage extends MessagePacket { // Constants ----------------------------------------------------- // Attributes ---------------------------------------------------- @@ -31,8 +30,7 @@ public class SessionReceiveMessage extends MessagePacket private int deliveryCount; - public SessionReceiveMessage(final long consumerID, final MessageInternal message, final int deliveryCount) - { + public SessionReceiveMessage(final long consumerID, final MessageInternal message, final int deliveryCount) { super(SESS_RECEIVE_MSG, message); this.consumerID = consumerID; @@ -40,31 +38,26 @@ public class SessionReceiveMessage extends MessagePacket this.deliveryCount = deliveryCount; } - public SessionReceiveMessage(final MessageInternal message) - { + public SessionReceiveMessage(final MessageInternal message) { super(SESS_RECEIVE_MSG, message); } // Public -------------------------------------------------------- - public long getConsumerID() - { + public long getConsumerID() { return consumerID; } - public int getDeliveryCount() - { + public int getDeliveryCount() { return deliveryCount; } @Override - public ActiveMQBuffer encode(final RemotingConnection connection) - { + public ActiveMQBuffer encode(final RemotingConnection connection) { ActiveMQBuffer buffer = message.getEncodedBuffer(); // Sanity check - if (buffer.writerIndex() != message.getEndOfMessagePosition()) - { + if (buffer.writerIndex() != message.getEndOfMessagePosition()) { throw new IllegalStateException("Wrong encode position"); } @@ -87,8 +80,7 @@ public class SessionReceiveMessage extends MessagePacket } @Override - public void decode(final ActiveMQBuffer buffer) - { + public void decode(final ActiveMQBuffer buffer) { channelID = buffer.readLong(); message.decodeFromBuffer(buffer); @@ -105,25 +97,23 @@ public class SessionReceiveMessage extends MessagePacket } @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 + deliveryCount; 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 SessionReceiveMessage)) return false; - SessionReceiveMessage other = (SessionReceiveMessage)obj; + SessionReceiveMessage other = (SessionReceiveMessage) obj; if (consumerID != other.consumerID) return false; if (deliveryCount != other.deliveryCount) 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/SessionRequestProducerCreditsMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java index 7de5d41..10fcd63 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java @@ -20,14 +20,13 @@ 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 SessionRequestProducerCreditsMessage extends PacketImpl -{ +public class SessionRequestProducerCreditsMessage extends PacketImpl { + private int credits; private SimpleString address; - public SessionRequestProducerCreditsMessage(final int credits, final SimpleString address) - { + public SessionRequestProducerCreditsMessage(final int credits, final SimpleString address) { super(SESS_PRODUCER_REQUEST_CREDITS); this.credits = credits; @@ -35,20 +34,17 @@ public class SessionRequestProducerCreditsMessage extends PacketImpl this.address = address; } - public SessionRequestProducerCreditsMessage() - { + public SessionRequestProducerCreditsMessage() { super(SESS_PRODUCER_REQUEST_CREDITS); } // Public -------------------------------------------------------- - public int getCredits() - { + public int getCredits() { return credits; } - public SimpleString getAddress() - { + public SimpleString getAddress() { return address; } @@ -58,22 +54,19 @@ public class SessionRequestProducerCreditsMessage extends PacketImpl // } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeInt(credits); buffer.writeSimpleString(address); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { credits = buffer.readInt(); 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()); @@ -82,17 +75,15 @@ public class SessionRequestProducerCreditsMessage 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 SessionRequestProducerCreditsMessage)) return false; - SessionRequestProducerCreditsMessage other = (SessionRequestProducerCreditsMessage)obj; - if (address == null) - { + SessionRequestProducerCreditsMessage other = (SessionRequestProducerCreditsMessage) 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/SessionSendContinuationMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java index fd8d50d..761b961 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java @@ -23,8 +23,8 @@ import org.apache.activemq.artemis.core.message.impl.MessageInternal; /** * A SessionSendContinuationMessage
*/ -public class SessionSendContinuationMessage extends SessionContinuationMessage -{ +public class SessionSendContinuationMessage extends SessionContinuationMessage { + private boolean requiresResponse; // Used on confirmation handling @@ -48,8 +48,7 @@ public class SessionSendContinuationMessage extends SessionContinuationMessage // Constructors -------------------------------------------------- - public SessionSendContinuationMessage() - { + public SessionSendContinuationMessage() { super(SESS_SEND_CONTINUATION); handler = null; } @@ -59,10 +58,12 @@ public class SessionSendContinuationMessage extends SessionContinuationMessage * @param continues * @param requiresResponse */ - public SessionSendContinuationMessage(final MessageInternal message, final byte[] body, final boolean continues, - final boolean requiresResponse, final long messageBodySize, - SendAcknowledgementHandler handler) - { + public SessionSendContinuationMessage(final MessageInternal message, + final byte[] body, + final boolean continues, + final boolean requiresResponse, + final long messageBodySize, + SendAcknowledgementHandler handler) { super(SESS_SEND_CONTINUATION, body, continues); this.requiresResponse = requiresResponse; this.message = message; @@ -75,50 +76,41 @@ public class SessionSendContinuationMessage extends SessionContinuationMessage /** * @return the requiresResponse */ - public boolean isRequiresResponse() - { + public boolean isRequiresResponse() { return requiresResponse; } - public long getMessageBodySize() - { + public long getMessageBodySize() { return messageBodySize; } - /** * @return the message */ - public MessageInternal getMessage() - { + public MessageInternal getMessage() { return message; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { super.encodeRest(buffer); - if (!continues) - { + if (!continues) { buffer.writeLong(messageBodySize); } buffer.writeBoolean(requiresResponse); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { super.decodeRest(buffer); - if (!continues) - { + if (!continues) { messageBodySize = buffer.readLong(); } requiresResponse = buffer.readBoolean(); } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + ((message == null) ? 0 : message.hashCode()); @@ -128,8 +120,7 @@ public class SessionSendContinuationMessage extends SessionContinuationMessage } @Override - public boolean equals(Object obj) - { + public boolean equals(Object obj) { if (this == obj) return true; if (!super.equals(obj)) @@ -137,8 +128,7 @@ public class SessionSendContinuationMessage extends SessionContinuationMessage if (!(obj instanceof SessionSendContinuationMessage)) return false; SessionSendContinuationMessage other = (SessionSendContinuationMessage) obj; - if (message == null) - { + if (message == null) { if (other.message != null) return false; } @@ -151,8 +141,7 @@ public class SessionSendContinuationMessage extends SessionContinuationMessage return true; } - public SendAcknowledgementHandler getHandler() - { + public SendAcknowledgementHandler getHandler() { return handler; } } 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/SessionSendLargeMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java index aeac5e8..1bf9bbb 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java @@ -20,19 +20,18 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.core.message.impl.MessageInternal; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; -public class SessionSendLargeMessage extends PacketImpl -{ +public class SessionSendLargeMessage extends PacketImpl { - - /** Used only if largeMessage */ + /** + * Used only if largeMessage + */ private final MessageInternal largeMessage; // Static -------------------------------------------------------- // Constructors -------------------------------------------------- - public SessionSendLargeMessage(final MessageInternal largeMessage) - { + public SessionSendLargeMessage(final MessageInternal largeMessage) { super(SESS_SEND_LARGE); this.largeMessage = largeMessage; @@ -40,26 +39,22 @@ public class SessionSendLargeMessage extends PacketImpl // Public -------------------------------------------------------- - public MessageInternal getLargeMessage() - { + public MessageInternal getLargeMessage() { return largeMessage; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { largeMessage.encodeHeadersAndProperties(buffer); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { largeMessage.decodeHeadersAndProperties(buffer); } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + ((largeMessage == null) ? 0 : largeMessage.hashCode()); @@ -67,17 +62,15 @@ public class SessionSendLargeMessage 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 SessionSendLargeMessage)) return false; - SessionSendLargeMessage other = (SessionSendLargeMessage)obj; - if (largeMessage == null) - { + SessionSendLargeMessage other = (SessionSendLargeMessage) obj; + if (largeMessage == null) { if (other.largeMessage != 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/SessionSendMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendMessage.java index f0fd112..525f00a 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendMessage.java @@ -22,8 +22,7 @@ import org.apache.activemq.artemis.core.message.impl.MessageInternal; import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; import org.apache.activemq.artemis.utils.DataConstants; -public class SessionSendMessage extends MessagePacket -{ +public class SessionSendMessage extends MessagePacket { private boolean requiresResponse; @@ -37,40 +36,35 @@ public class SessionSendMessage extends MessagePacket */ private final transient SendAcknowledgementHandler handler; - public SessionSendMessage(final MessageInternal message, final boolean requiresResponse, - final SendAcknowledgementHandler handler) - { + public SessionSendMessage(final MessageInternal message, + final boolean requiresResponse, + final SendAcknowledgementHandler handler) { super(SESS_SEND, message); this.handler = handler; this.requiresResponse = requiresResponse; } - public SessionSendMessage(final MessageInternal message) - { + public SessionSendMessage(final MessageInternal message) { super(SESS_SEND, message); this.handler = null; } // Public -------------------------------------------------------- - public boolean isRequiresResponse() - { + public boolean isRequiresResponse() { return requiresResponse; } - public SendAcknowledgementHandler getHandler() - { + public SendAcknowledgementHandler getHandler() { return handler; } @Override - public ActiveMQBuffer encode(final RemotingConnection connection) - { + public ActiveMQBuffer encode(final RemotingConnection connection) { ActiveMQBuffer buffer = message.getEncodedBuffer(); // Sanity check - if (buffer.writerIndex() != message.getEndOfMessagePosition()) - { + if (buffer.writerIndex() != message.getEndOfMessagePosition()) { throw new IllegalStateException("Wrong encode position"); } @@ -94,8 +88,7 @@ public class SessionSendMessage extends MessagePacket } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { // Buffer comes in after having read standard headers and positioned at Beginning of body part message.decodeFromBuffer(buffer); @@ -109,8 +102,7 @@ public class SessionSendMessage extends MessagePacket } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + (requiresResponse ? 1231 : 1237); @@ -118,8 +110,7 @@ public class SessionSendMessage extends MessagePacket } @Override - public boolean equals(Object obj) - { + public boolean equals(Object obj) { if (this == obj) return true; if (!super.equals(obj)) 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/SessionUniqueAddMetaDataMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java index ebe1afe..e367a8a 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java @@ -16,9 +16,7 @@ */ package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; - -public class SessionUniqueAddMetaDataMessage extends SessionAddMetaDataMessageV2 -{ +public class SessionUniqueAddMetaDataMessage extends SessionAddMetaDataMessageV2 { // Constants ----------------------------------------------------- @@ -28,14 +26,11 @@ public class SessionUniqueAddMetaDataMessage extends SessionAddMetaDataMessageV2 // Constructors -------------------------------------------------- - public SessionUniqueAddMetaDataMessage() - { + public SessionUniqueAddMetaDataMessage() { super(SESS_UNIQUE_ADD_METADATA); } - - public SessionUniqueAddMetaDataMessage(String key, String data) - { + public SessionUniqueAddMetaDataMessage(String key, String data) { super(SESS_UNIQUE_ADD_METADATA, key, data); } 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/SessionXAAfterFailedMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java index de6759b..13700b5 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java @@ -25,8 +25,7 @@ import org.apache.activemq.artemis.utils.XidCodecSupport; /** * to be called after a failure on an XA Session */ -public class SessionXAAfterFailedMessage extends PacketImpl -{ +public class SessionXAAfterFailedMessage extends PacketImpl { // Constants ----------------------------------------------------- // Attributes ---------------------------------------------------- @@ -37,40 +36,34 @@ public class SessionXAAfterFailedMessage extends PacketImpl // Constructors -------------------------------------------------- - public SessionXAAfterFailedMessage(final Xid xid) - { + public SessionXAAfterFailedMessage(final Xid xid) { super(SESS_XA_FAILED); this.xid = xid; } - public SessionXAAfterFailedMessage() - { + public SessionXAAfterFailedMessage() { super(SESS_XA_FAILED); } // Public -------------------------------------------------------- - public Xid getXid() - { + public Xid getXid() { return xid; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { XidCodecSupport.encodeXid(xid, buffer); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { xid = XidCodecSupport.decodeXid(buffer); } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + ((xid == null) ? 0 : xid.hashCode()); @@ -78,17 +71,15 @@ public class SessionXAAfterFailedMessage 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 SessionXAAfterFailedMessage)) return false; - SessionXAAfterFailedMessage other = (SessionXAAfterFailedMessage)obj; - if (xid == null) - { + SessionXAAfterFailedMessage other = (SessionXAAfterFailedMessage) obj; + if (xid == null) { if (other.xid != null) return false; } @@ -97,5 +88,4 @@ public class SessionXAAfterFailedMessage extends PacketImpl 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/SessionXACommitMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXACommitMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXACommitMessage.java index 7e8198d..1e1ad76 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXACommitMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXACommitMessage.java @@ -22,58 +22,50 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; import org.apache.activemq.artemis.utils.XidCodecSupport; -public class SessionXACommitMessage extends PacketImpl -{ +public class SessionXACommitMessage extends PacketImpl { + private boolean onePhase; private Xid xid; - public SessionXACommitMessage(final Xid xid, final boolean onePhase) - { + public SessionXACommitMessage(final Xid xid, final boolean onePhase) { super(SESS_XA_COMMIT); this.xid = xid; this.onePhase = onePhase; } - public SessionXACommitMessage() - { + public SessionXACommitMessage() { super(SESS_XA_COMMIT); } - public Xid getXid() - { + public Xid getXid() { return xid; } - public boolean isOnePhase() - { + public boolean isOnePhase() { return onePhase; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { XidCodecSupport.encodeXid(xid, buffer); buffer.writeBoolean(onePhase); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { xid = XidCodecSupport.decodeXid(buffer); onePhase = buffer.readBoolean(); } @Override - public String toString() - { + public String toString() { return getParentString() + ", xid=" + xid + ", onePhase=" + onePhase + "]"; } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + (onePhase ? 1231 : 1237); @@ -82,19 +74,17 @@ public class SessionXACommitMessage 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 SessionXACommitMessage)) return false; - SessionXACommitMessage other = (SessionXACommitMessage)obj; + SessionXACommitMessage other = (SessionXACommitMessage) obj; if (onePhase != other.onePhase) return false; - if (xid == null) - { + if (xid == null) { if (other.xid != 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/SessionXAEndMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAEndMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAEndMessage.java index 3047df2..5e99eb9 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAEndMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAEndMessage.java @@ -22,14 +22,13 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; import org.apache.activemq.artemis.utils.XidCodecSupport; -public class SessionXAEndMessage extends PacketImpl -{ +public class SessionXAEndMessage extends PacketImpl { + private Xid xid; private boolean failed; - public SessionXAEndMessage(final Xid xid, final boolean failed) - { + public SessionXAEndMessage(final Xid xid, final boolean failed) { super(SESS_XA_END); this.xid = xid; @@ -37,44 +36,37 @@ public class SessionXAEndMessage extends PacketImpl this.failed = failed; } - public SessionXAEndMessage() - { + public SessionXAEndMessage() { super(SESS_XA_END); } - public boolean isFailed() - { + public boolean isFailed() { return failed; } - public Xid getXid() - { + public Xid getXid() { return xid; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { XidCodecSupport.encodeXid(xid, buffer); buffer.writeBoolean(failed); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { xid = XidCodecSupport.decodeXid(buffer); failed = buffer.readBoolean(); } @Override - public String toString() - { + public String toString() { return getParentString() + ", xid=" + xid + ", failed=" + failed + "]"; } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + (failed ? 1231 : 1237); @@ -83,19 +75,17 @@ public class SessionXAEndMessage 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 SessionXAEndMessage)) return false; - SessionXAEndMessage other = (SessionXAEndMessage)obj; + SessionXAEndMessage other = (SessionXAEndMessage) obj; if (failed != other.failed) return false; - if (xid == null) - { + if (xid == null) { if (other.xid != 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/SessionXAForgetMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java index 41d14f3..2f88745 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAForgetMessage.java @@ -22,42 +22,36 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; import org.apache.activemq.artemis.utils.XidCodecSupport; -public class SessionXAForgetMessage extends PacketImpl -{ +public class SessionXAForgetMessage extends PacketImpl { private Xid xid; - public SessionXAForgetMessage(final Xid xid) - { + + public SessionXAForgetMessage(final Xid xid) { super(SESS_XA_FORGET); this.xid = xid; } - public SessionXAForgetMessage() - { + public SessionXAForgetMessage() { super(SESS_XA_FORGET); } - public Xid getXid() - { + public Xid getXid() { return xid; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { XidCodecSupport.encodeXid(xid, buffer); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { xid = XidCodecSupport.decodeXid(buffer); } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + ((xid == null) ? 0 : xid.hashCode()); @@ -65,17 +59,15 @@ public class SessionXAForgetMessage 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 SessionXAForgetMessage)) return false; - SessionXAForgetMessage other = (SessionXAForgetMessage)obj; - if (xid == null) - { + SessionXAForgetMessage other = (SessionXAForgetMessage) obj; + if (xid == null) { if (other.xid != 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/SessionXAGetInDoubtXidsResponseMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java index 1d18d6d..92260b1 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java @@ -25,51 +25,43 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; import org.apache.activemq.artemis.utils.XidCodecSupport; -public class SessionXAGetInDoubtXidsResponseMessage extends PacketImpl -{ +public class SessionXAGetInDoubtXidsResponseMessage extends PacketImpl { + private List xids; - public SessionXAGetInDoubtXidsResponseMessage(final List xids) - { + public SessionXAGetInDoubtXidsResponseMessage(final List xids) { super(SESS_XA_INDOUBT_XIDS_RESP); this.xids = xids; } - public SessionXAGetInDoubtXidsResponseMessage() - { + public SessionXAGetInDoubtXidsResponseMessage() { super(SESS_XA_INDOUBT_XIDS_RESP); } @Override - public boolean isResponse() - { + public boolean isResponse() { return true; } - public List getXids() - { + public List getXids() { return xids; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeInt(xids.size()); - for (Xid xid : xids) - { + for (Xid xid : xids) { XidCodecSupport.encodeXid(xid, buffer); } } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { int len = buffer.readInt(); xids = new ArrayList(len); - for (int i = 0; i < len; i++) - { + for (int i = 0; i < len; i++) { Xid xid = XidCodecSupport.decodeXid(buffer); xids.add(xid); @@ -77,8 +69,7 @@ public class SessionXAGetInDoubtXidsResponseMessage extends PacketImpl } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + ((xids == null) ? 0 : xids.hashCode()); @@ -86,17 +77,15 @@ public class SessionXAGetInDoubtXidsResponseMessage 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 SessionXAGetInDoubtXidsResponseMessage)) return false; - SessionXAGetInDoubtXidsResponseMessage other = (SessionXAGetInDoubtXidsResponseMessage)obj; - if (xids == null) - { + SessionXAGetInDoubtXidsResponseMessage other = (SessionXAGetInDoubtXidsResponseMessage) obj; + if (xids == null) { if (other.xids != 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/SessionXAGetTimeoutResponseMessage.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java index f0537ff..7f12ec6 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAGetTimeoutResponseMessage.java @@ -19,48 +19,41 @@ 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 SessionXAGetTimeoutResponseMessage extends PacketImpl -{ +public class SessionXAGetTimeoutResponseMessage extends PacketImpl { + private int timeoutSeconds; - public SessionXAGetTimeoutResponseMessage(final int timeoutSeconds) - { + public SessionXAGetTimeoutResponseMessage(final int timeoutSeconds) { super(SESS_XA_GET_TIMEOUT_RESP); this.timeoutSeconds = timeoutSeconds; } - public SessionXAGetTimeoutResponseMessage() - { + public SessionXAGetTimeoutResponseMessage() { super(SESS_XA_GET_TIMEOUT_RESP); } @Override - public boolean isResponse() - { + public boolean isResponse() { return true; } - public int getTimeoutSeconds() - { + public int getTimeoutSeconds() { return timeoutSeconds; } @Override - public void encodeRest(final ActiveMQBuffer buffer) - { + public void encodeRest(final ActiveMQBuffer buffer) { buffer.writeInt(timeoutSeconds); } @Override - public void decodeRest(final ActiveMQBuffer buffer) - { + public void decodeRest(final ActiveMQBuffer buffer) { timeoutSeconds = buffer.readInt(); } @Override - public int hashCode() - { + public int hashCode() { final int prime = 31; int result = super.hashCode(); result = prime * result + timeoutSeconds; @@ -68,15 +61,14 @@ public class SessionXAGetTimeoutResponseMessage 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 SessionXAGetTimeoutResponseMessage)) return false; - SessionXAGetTimeoutResponseMessage other = (SessionXAGetTimeoutResponseMessage)obj; + SessionXAGetTimeoutResponseMessage other = (SessionXAGetTimeoutResponseMessage) obj; if (timeoutSeconds != other.timeoutSeconds) return false; return true;