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 D401ECCCA for ; Fri, 19 Jul 2013 18:45:18 +0000 (UTC) Received: (qmail 37339 invoked by uid 500); 19 Jul 2013 18:45:18 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 37315 invoked by uid 500); 19 Jul 2013 18:45:18 -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 37308 invoked by uid 99); 19 Jul 2013 18:45:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Jul 2013 18:45:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Jul 2013 18:45:14 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3B1ED2388ABA; Fri, 19 Jul 2013 18:44:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1504961 [6/11] - in /activemq/activemq-blaze/trunk: ./ src/main/java/org/apache/activeblaze/ src/main/java/org/apache/activeblaze/cluster/ src/main/java/org/apache/activeblaze/group/ src/main/java/org/apache/activeblaze/impl/destination/ s... Date: Fri, 19 Jul 2013 18:44:24 -0000 To: commits@activemq.apache.org From: rajdavies@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130719184430.3B1ED2388ABA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsConnectionMetaData.java URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsConnectionMetaData.java?rev=1504961&r1=1504960&r2=1504961&view=diff ============================================================================== --- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsConnectionMetaData.java (original) +++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsConnectionMetaData.java Fri Jul 19 18:44:21 2013 @@ -20,6 +20,7 @@ import java.util.Enumeration; import java.util.Vector; import java.util.regex.Matcher; import java.util.regex.Pattern; + import javax.jms.ConnectionMetaData; /** @@ -62,7 +63,7 @@ public final class BlazeJmsConnectionMet /** * Gets the JMS API version. - * + * * @return the JMS API version */ @@ -72,7 +73,7 @@ public final class BlazeJmsConnectionMet /** * Gets the JMS major version number. - * + * * @return the JMS API major version number */ @@ -82,7 +83,7 @@ public final class BlazeJmsConnectionMet /** * Gets the JMS minor version number. - * + * * @return the JMS API minor version number */ @@ -92,7 +93,7 @@ public final class BlazeJmsConnectionMet /** * Gets the JMS provider name. - * + * * @return the JMS provider name */ @@ -102,7 +103,7 @@ public final class BlazeJmsConnectionMet /** * Gets the JMS provider version. - * + * * @return the JMS provider version */ @@ -112,7 +113,7 @@ public final class BlazeJmsConnectionMet /** * Gets the JMS provider major version number. - * + * * @return the JMS provider major version number */ @@ -122,7 +123,7 @@ public final class BlazeJmsConnectionMet /** * Gets the JMS provider minor version number. - * + * * @return the JMS provider minor version number */ @@ -132,7 +133,7 @@ public final class BlazeJmsConnectionMet /** * Gets an enumeration of the JMSX property names. - * + * * @return an Enumeration of JMSX property names */ @@ -140,6 +141,6 @@ public final class BlazeJmsConnectionMet Vector jmxProperties = new Vector(); return jmxProperties.elements(); } - - + + } Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsDestination.java URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsDestination.java?rev=1504961&r1=1504960&r2=1504961&view=diff ============================================================================== --- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsDestination.java (original) +++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsDestination.java Fri Jul 19 18:44:21 2013 @@ -18,6 +18,7 @@ package org.apache.activeblaze.jms; import java.io.Externalizable; import java.util.Map; + import javax.jms.JMSException; import javax.jms.Queue; import javax.jms.TemporaryQueue; @@ -25,11 +26,11 @@ import javax.jms.TemporaryTopic; import javax.jms.Topic; import org.apache.activeblaze.Destination; import org.apache.activeblaze.jndi.JNDIStorable; -import org.apache.activemq.protobuf.Buffer; +import org.apache.activeblaze.wire.Buffer; + /** * Jms Destination - * */ public class BlazeJmsDestination extends JNDIStorable implements Externalizable, javax.jms.Destination, Comparable { @@ -44,8 +45,6 @@ public class BlazeJmsDestination extends /** * Constructor - * - * @param dest */ public BlazeJmsDestination(Destination dest) { this.destination = dest; @@ -53,8 +52,6 @@ public class BlazeJmsDestination extends /** * Constructor - * - * @param name */ public BlazeJmsDestination(String name) { this(); @@ -72,7 +69,7 @@ public class BlazeJmsDestination extends * @return name of destination */ public String getName() { - return this.destination.getName().toStringUtf8(); + return this.destination.getName().toString(); } /** @@ -97,34 +94,30 @@ public class BlazeJmsDestination extends } /** - * @param props * @see org.apache.activeblaze.jndi.JNDIStorable#buildFromProperties(java.util.Properties) */ @Override - protected void buildFromProperties(Map props) { - + protected void buildFromProperties(Map props) { + this.destination.setName(new Buffer(getProperty(props, "name", ""))); - Boolean bool = Boolean.valueOf(getProperty(props,"topic", Boolean.TRUE.toString())); + Boolean bool = Boolean.valueOf(getProperty(props, "topic", Boolean.TRUE.toString())); this.destination.setTopic(bool.booleanValue()); - bool = Boolean.valueOf(getProperty(props,"temporary", Boolean.FALSE.toString())); + bool = Boolean.valueOf(getProperty(props, "temporary", Boolean.FALSE.toString())); this.destination.setTemporary(bool.booleanValue()); } /** - * @param props * @see org.apache.activeblaze.jndi.JNDIStorable#populateProperties(java.util.Properties) */ @Override - protected void populateProperties(Map props) { - props.put("name", this.destination.getName().toStringUtf8()); + protected void populateProperties(Map props) { + props.put("name", this.destination.getName().toString()); props.put("topic", Boolean.toString(this.destination.isTopic())); props.put("temporary", Boolean.toString(this.destination.isTemporary())); } /** - * - * @param other - * the Object to be compared. + * @param other the Object to be compared. * @return a negative integer, zero, or a positive integer as this object is less than, equal to, or greater than * the specified object. * @see java.lang.Comparable#compareTo(java.lang.Object) @@ -132,7 +125,7 @@ public class BlazeJmsDestination extends public int compareTo(BlazeJmsDestination other) { if (other != null) { if (this.destination.isTemporary() == other.destination.isTemporary()) { - return this.destination.getName().toStringUtf8().compareTo(other.destination.getName().toStringUtf8()); + return this.destination.getName().compareTo(other.destination.getName()); } return -1; } @@ -141,10 +134,8 @@ public class BlazeJmsDestination extends /** * Transform a javax.jms.Destination to a BlazeJmsDestination - * - * @param dest + * * @return a BlazeJmsDestination - * @throws JMSException */ public static BlazeJmsDestination transform(javax.jms.Destination dest) throws JMSException { if (dest == null) { @@ -169,9 +160,7 @@ public class BlazeJmsDestination extends } /** - * @param dest * @return a JMS destination - * */ public static BlazeJmsDestination createJmsDestination(Destination dest) { if (dest.isTopic()) { Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsExceptionSupport.java URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsExceptionSupport.java?rev=1504961&r1=1504960&r2=1504961&view=diff ============================================================================== --- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsExceptionSupport.java (original) +++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsExceptionSupport.java Fri Jul 19 18:44:21 2013 @@ -22,7 +22,6 @@ import javax.jms.MessageFormatException; /** * Create those nice, old fashioned JMS Exceptions - * */ public final class BlazeJmsExceptionSupport { @@ -44,7 +43,7 @@ public final class BlazeJmsExceptionSupp public static JMSException create(Throwable cause) { if (cause instanceof JMSException) { - return (JMSException)cause; + return (JMSException) cause; } String msg = cause.getMessage(); if (msg == null || msg.length() == 0) { @@ -57,7 +56,7 @@ public final class BlazeJmsExceptionSupp public static JMSException create(Exception cause) { if (cause instanceof JMSException) { - return (JMSException)cause; + return (JMSException) cause; } String msg = cause.getMessage(); if (msg == null || msg.length() == 0) { Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsMessageConsumer.java URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsMessageConsumer.java?rev=1504961&r1=1504960&r2=1504961&view=diff ============================================================================== --- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsMessageConsumer.java (original) +++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsMessageConsumer.java Fri Jul 19 18:44:21 2013 @@ -16,25 +16,26 @@ */ package org.apache.activeblaze.jms; -import org.apache.activeblaze.BlazeMessage; -import org.apache.activeblaze.BlazeMessageListener; -import org.apache.activeblaze.Subscription; -import org.apache.activeblaze.jms.message.BlazeJmsMessage; -import org.apache.activeblaze.jms.message.BlazeJmsMessageTransformation; import java.util.ArrayList; import java.util.List; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; + import javax.jms.IllegalStateException; import javax.jms.JMSException; import javax.jms.Message; import javax.jms.MessageConsumer; import javax.jms.MessageListener; +import org.apache.activeblaze.BlazeMessage; +import org.apache.activeblaze.BlazeMessageListener; +import org.apache.activeblaze.Subscription; +import org.apache.activeblaze.wire.BlazeJmsMessage; +import org.apache.activeblaze.wire.BlazeJmsMessageTransformation; + /** * implementation of a Jms Message Consumer - * */ public class BlazeJmsMessageConsumer implements MessageConsumer, BlazeMessageListener { protected final BlazeJmsSession session; @@ -49,12 +50,11 @@ public class BlazeJmsMessageConsumer imp protected BlazeJmsMessageConsumer(BlazeJmsSession s, BlazeJmsDestination destination, int queueDepth) { this.session = s; this.destination = destination; - this.subscription.setDestination(this.destination.getDestination().getData()); + this.subscription.setDestination(this.destination.getDestination()); this.dispatchQueue = new LinkedBlockingQueue(queueDepth); } /** - * @throws JMSException * @see javax.jms.MessageConsumer#close() */ public void close() throws JMSException { @@ -68,7 +68,6 @@ public class BlazeJmsMessageConsumer imp /** * @return the MessageListener - * @throws JMSException * @see javax.jms.MessageConsumer#getMessageListener() */ public MessageListener getMessageListener() throws JMSException { @@ -78,7 +77,6 @@ public class BlazeJmsMessageConsumer imp /** * @return the Message Selector - * @throws JMSException * @see javax.jms.MessageConsumer#getMessageSelector() */ public String getMessageSelector() throws JMSException { @@ -88,7 +86,6 @@ public class BlazeJmsMessageConsumer imp /** * @return a Message or null if closed during the operation - * @throws JMSException * @see javax.jms.MessageConsumer#receive() */ public Message receive() throws JMSException { @@ -97,9 +94,7 @@ public class BlazeJmsMessageConsumer imp } /** - * @param timeout * @return a MEssage or null - * @throws JMSException * @see javax.jms.MessageConsumer#receive(long) */ public Message receive(long timeout) throws JMSException { @@ -113,7 +108,6 @@ public class BlazeJmsMessageConsumer imp /** * @return a Message or null - * @throws JMSException * @see javax.jms.MessageConsumer#receiveNoWait() */ public Message receiveNoWait() throws JMSException { @@ -126,8 +120,6 @@ public class BlazeJmsMessageConsumer imp } /** - * @param listener - * @throws JMSException * @see javax.jms.MessageConsumer#setMessageListener(javax.jms.MessageListener) */ public void setMessageListener(MessageListener listener) throws JMSException { @@ -149,9 +141,7 @@ public class BlazeJmsMessageConsumer imp } /** - * @param messageSelector - * the messageSelector to set - * @throws IllegalStateException + * @param messageSelector the messageSelector to set */ public void setMessageSelector(String messageSelector) throws IllegalStateException { checkClosed(); @@ -165,8 +155,8 @@ public class BlazeJmsMessageConsumer imp } /** + * * @param message - * @see org.apache.activeblaze.jms.BlazeJmsConsumer#onMessage(org.apache.activeblaze.jms.message.BlazeJmsMessage) */ public void onMessage(BlazeJmsMessage message) { this.lock.lock(); Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsMessageProducer.java URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsMessageProducer.java?rev=1504961&r1=1504960&r2=1504961&view=diff ============================================================================== --- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsMessageProducer.java (original) +++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsMessageProducer.java Fri Jul 19 18:44:21 2013 @@ -26,7 +26,6 @@ import javax.jms.MessageProducer; /** * Implementation of a Jms MessageProducer - * */ public class BlazeJmsMessageProducer implements MessageProducer { protected final BlazeJmsSession session; @@ -47,7 +46,7 @@ public class BlazeJmsMessageProducer imp /** * Close the producer - * + * * @see javax.jms.MessageProducer#close() */ public void close() { @@ -57,7 +56,6 @@ public class BlazeJmsMessageProducer imp /** * @return the delivery mode - * @throws JMSException * @see javax.jms.MessageProducer#getDeliveryMode() */ public int getDeliveryMode() throws JMSException { @@ -67,7 +65,6 @@ public class BlazeJmsMessageProducer imp /** * @return the destination - * @throws JMSException * @see javax.jms.MessageProducer#getDestination() */ public Destination getDestination() throws JMSException { @@ -77,7 +74,6 @@ public class BlazeJmsMessageProducer imp /** * @return true if disableIds is set - * @throws JMSException * @see javax.jms.MessageProducer#getDisableMessageID() */ public boolean getDisableMessageID() throws JMSException { @@ -87,7 +83,6 @@ public class BlazeJmsMessageProducer imp /** * @return true if disable timestamp is set - * @throws JMSException * @see javax.jms.MessageProducer#getDisableMessageTimestamp() */ public boolean getDisableMessageTimestamp() throws JMSException { @@ -97,7 +92,6 @@ public class BlazeJmsMessageProducer imp /** * @return the priority - * @throws JMSException * @see javax.jms.MessageProducer#getPriority() */ public int getPriority() throws JMSException { @@ -107,7 +101,6 @@ public class BlazeJmsMessageProducer imp /** * @return timeToLive - * @throws JMSException * @see javax.jms.MessageProducer#getTimeToLive() */ public long getTimeToLive() throws JMSException { @@ -116,8 +109,6 @@ public class BlazeJmsMessageProducer imp } /** - * @param message - * @throws JMSException * @see javax.jms.MessageProducer#send(javax.jms.Message) */ public void send(Message message) throws JMSException { @@ -125,9 +116,6 @@ public class BlazeJmsMessageProducer imp } /** - * @param destination - * @param message - * @throws JMSException * @see javax.jms.MessageProducer#send(javax.jms.Destination, javax.jms.Message) */ public void send(Destination destination, Message message) throws JMSException { @@ -135,11 +123,6 @@ public class BlazeJmsMessageProducer imp } /** - * @param message - * @param deliveryMode - * @param priority - * @param timeToLive - * @throws JMSException * @see javax.jms.MessageProducer#send(javax.jms.Message, int, int, long) */ public void send(Message message, int deliveryMode, int priority, long timeToLive) throws JMSException { @@ -147,12 +130,6 @@ public class BlazeJmsMessageProducer imp } /** - * @param destination - * @param message - * @param deliveryMode - * @param priority - * @param timeToLive - * @throws JMSException * @see javax.jms.MessageProducer#send(javax.jms.Destination, javax.jms.Message, int, int, long) */ public void send(Destination destination, Message message, int deliveryMode, int priority, long timeToLive) @@ -162,8 +139,6 @@ public class BlazeJmsMessageProducer imp } /** - * @param deliveryMode - * @throws JMSException * @see javax.jms.MessageProducer#setDeliveryMode(int) */ public void setDeliveryMode(int deliveryMode) throws JMSException { @@ -172,8 +147,6 @@ public class BlazeJmsMessageProducer imp } /** - * @param value - * @throws JMSException * @see javax.jms.MessageProducer#setDisableMessageID(boolean) */ public void setDisableMessageID(boolean value) throws JMSException { @@ -182,8 +155,6 @@ public class BlazeJmsMessageProducer imp } /** - * @param value - * @throws JMSException * @see javax.jms.MessageProducer#setDisableMessageTimestamp(boolean) */ public void setDisableMessageTimestamp(boolean value) throws JMSException { @@ -192,8 +163,6 @@ public class BlazeJmsMessageProducer imp } /** - * @param defaultPriority - * @throws JMSException * @see javax.jms.MessageProducer#setPriority(int) */ public void setPriority(int defaultPriority) throws JMSException { @@ -202,8 +171,6 @@ public class BlazeJmsMessageProducer imp } /** - * @param timeToLive - * @throws JMSException * @see javax.jms.MessageProducer#setTimeToLive(long) */ public void setTimeToLive(long timeToLive) throws JMSException { @@ -212,10 +179,7 @@ public class BlazeJmsMessageProducer imp } /** - * @param dest - * the destination to set - * @throws JMSException - * @throws InvalidDestinationException + * @param dest the destination to set */ public void setDestination(Destination dest) throws JMSException { BlazeJmsDestination destination = BlazeJmsDestination.transform(dest); Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueue.java URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueue.java?rev=1504961&r1=1504960&r2=1504961&view=diff ============================================================================== --- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueue.java (original) +++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueue.java Fri Jul 19 18:44:21 2013 @@ -21,29 +21,26 @@ import org.apache.activeblaze.Destinatio /** * Queue implementation - * */ public class BlazeJmsQueue extends BlazeJmsDestination implements Queue { /** * Constructor */ - public BlazeJmsQueue(){ + public BlazeJmsQueue() { this(""); } - + /** * Constructor - * @param dest */ public BlazeJmsQueue(Destination dest) { super(dest); } - + /** * Constructor - * @param name */ - public BlazeJmsQueue(String name){ + public BlazeJmsQueue(String name) { super(name); this.destination.setTopic(false); } Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueueReceiver.java URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueueReceiver.java?rev=1504961&r1=1504960&r2=1504961&view=diff ============================================================================== --- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueueReceiver.java (original) +++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueueReceiver.java Fri Jul 19 18:44:21 2013 @@ -22,25 +22,22 @@ import javax.jms.QueueReceiver; /** * Implementation of a Jms QueueReceiver - * */ public class BlazeJmsQueueReceiver extends BlazeJmsMessageConsumer implements QueueReceiver { /** * Constructor - * @param s */ - protected BlazeJmsQueueReceiver(BlazeJmsSession s,BlazeJmsDestination d,int queueDepth) { - super(s,d,queueDepth); + protected BlazeJmsQueueReceiver(BlazeJmsSession s, BlazeJmsDestination d, int queueDepth) { + super(s, d, queueDepth); } /** * @return the Queue - * @throws IllegalStateException * @see javax.jms.QueueReceiver#getQueue() */ public Queue getQueue() throws IllegalStateException { checkClosed(); - return (Queue) this.destination; + return (Queue) this.destination; } } Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueueSender.java URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueueSender.java?rev=1504961&r1=1504960&r2=1504961&view=diff ============================================================================== --- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueueSender.java (original) +++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueueSender.java Fri Jul 19 18:44:21 2013 @@ -24,14 +24,10 @@ import javax.jms.QueueSender; /** * Implementation of a Queue Sender - * */ public class BlazeJmsQueueSender extends BlazeJmsMessageProducer implements QueueSender { /** * Constructor - * - * @param s - * @param dest */ protected BlazeJmsQueueSender(BlazeJmsSession s, BlazeJmsDestination dest) { super(s, dest); @@ -39,7 +35,6 @@ public class BlazeJmsQueueSender extends /** * @return the Queue - * @throws IllegalStateException * @see javax.jms.QueueSender#getQueue() */ public Queue getQueue() throws IllegalStateException { @@ -48,9 +43,6 @@ public class BlazeJmsQueueSender extends } /** - * @param queue - * @param message - * @throws JMSException * @see javax.jms.QueueSender#send(javax.jms.Queue, javax.jms.Message) */ public void send(Queue queue, Message message) throws JMSException { @@ -58,12 +50,6 @@ public class BlazeJmsQueueSender extends } /** - * @param queue - * @param message - * @param deliveryMode - * @param priority - * @param timeToLive - * @throws JMSException * @see javax.jms.QueueSender#send(javax.jms.Queue, javax.jms.Message, int, int, long) */ public void send(Queue queue, Message message, int deliveryMode, int priority, long timeToLive) throws JMSException { Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueueSession.java URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueueSession.java?rev=1504961&r1=1504960&r2=1504961&view=diff ============================================================================== --- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueueSession.java (original) +++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsQueueSession.java Fri Jul 19 18:44:21 2013 @@ -28,13 +28,10 @@ import javax.jms.TopicSubscriber; /** * Jms QueueSession implementation - * */ public class BlazeJmsQueueSession extends BlazeJmsSession { /** * Constructor - * @param connection - * @param acknowledgementMode */ protected BlazeJmsQueueSession(BlazeJmsConnection connection, int acknowledgementMode) { super(connection, acknowledgementMode); @@ -48,10 +45,6 @@ public class BlazeJmsQueueSession extend } /** - * @param destination - * @param messageSelector - * @return - * @throws JMSException * @see javax.jms.Session#createConsumer(javax.jms.Destination, java.lang.String) */ public MessageConsumer createConsumer(Destination destination, String messageSelector) throws JMSException { @@ -62,11 +55,6 @@ public class BlazeJmsQueueSession extend } /** - * @param destination - * @param messageSelector - * @param NoLocal - * @return - * @throws JMSException * @see javax.jms.Session#createConsumer(javax.jms.Destination, java.lang.String, boolean) */ public MessageConsumer createConsumer(Destination destination, String messageSelector, boolean NoLocal) @@ -75,10 +63,6 @@ public class BlazeJmsQueueSession extend } /** - * @param topic - * @param name - * @return - * @throws JMSException * @see javax.jms.Session#createDurableSubscriber(javax.jms.Topic, java.lang.String) */ public TopicSubscriber createDurableSubscriber(Topic topic, String name) throws JMSException { @@ -86,13 +70,6 @@ public class BlazeJmsQueueSession extend } /** - * @param topic - * @param name - * @param messageSelector - * @param noLocal - * @return - * @throws IllegalStateException - * @throws JMSException * @see javax.jms.Session#createDurableSubscriber(javax.jms.Topic, java.lang.String, java.lang.String, boolean) */ public TopicSubscriber createDurableSubscriber(Topic topic, String name, String messageSelector, boolean noLocal) @@ -101,9 +78,6 @@ public class BlazeJmsQueueSession extend } /** - * @param destination - * @return - * @throws JMSException * @see javax.jms.Session#createProducer(javax.jms.Destination) */ public MessageProducer createProducer(Destination destination) throws JMSException { @@ -114,8 +88,6 @@ public class BlazeJmsQueueSession extend } /** - * @return - * @throws JMSException * @see javax.jms.Session#createTemporaryTopic() */ public TemporaryTopic createTemporaryTopic() throws JMSException { @@ -123,9 +95,6 @@ public class BlazeJmsQueueSession extend } /** - * @param topicName - * @return - * @throws JMSException * @see javax.jms.Session#createTopic(java.lang.String) */ public Topic createTopic(String topicName) throws JMSException { @@ -133,8 +102,6 @@ public class BlazeJmsQueueSession extend } /** - * @param name - * @throws JMSException * @see javax.jms.Session#unsubscribe(java.lang.String) */ public void unsubscribe(String name) throws JMSException { @@ -142,9 +109,6 @@ public class BlazeJmsQueueSession extend } /** - * @param topic - * @return - * @throws JMSException * @see javax.jms.TopicSession#createPublisher(javax.jms.Topic) */ public TopicPublisher createPublisher(Topic topic) throws JMSException { @@ -152,9 +116,6 @@ public class BlazeJmsQueueSession extend } /** - * @param topic - * @return - * @throws JMSException * @see javax.jms.TopicSession#createSubscriber(javax.jms.Topic) */ public TopicSubscriber createSubscriber(Topic topic) throws JMSException { @@ -162,11 +123,6 @@ public class BlazeJmsQueueSession extend } /** - * @param topic - * @param messageSelector - * @param noLocal - * @return - * @throws JMSException * @see javax.jms.TopicSession#createSubscriber(javax.jms.Topic, java.lang.String, boolean) */ public TopicSubscriber createSubscriber(Topic topic, String messageSelector, boolean noLocal) throws JMSException { Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsSession.java URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsSession.java?rev=1504961&r1=1504960&r2=1504961&view=diff ============================================================================== --- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsSession.java (original) +++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsSession.java Fri Jul 19 18:44:21 2013 @@ -19,42 +19,19 @@ package org.apache.activeblaze.jms; import java.io.Serializable; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import javax.jms.BytesMessage; -import javax.jms.Destination; -import javax.jms.ExceptionListener; + +import javax.jms.*; import javax.jms.IllegalStateException; -import javax.jms.JMSException; -import javax.jms.MapMessage; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageListener; -import javax.jms.MessageProducer; -import javax.jms.ObjectMessage; -import javax.jms.Queue; -import javax.jms.QueueBrowser; -import javax.jms.QueueReceiver; -import javax.jms.QueueSender; -import javax.jms.QueueSession; -import javax.jms.Session; -import javax.jms.StreamMessage; -import javax.jms.TemporaryQueue; -import javax.jms.TemporaryTopic; -import javax.jms.TextMessage; -import javax.jms.Topic; -import javax.jms.TopicPublisher; -import javax.jms.TopicSession; -import javax.jms.TopicSubscriber; -import org.apache.activeblaze.jms.message.BlazeJmsBytesMessage; -import org.apache.activeblaze.jms.message.BlazeJmsMapMessage; -import org.apache.activeblaze.jms.message.BlazeJmsMessage; -import org.apache.activeblaze.jms.message.BlazeJmsMessageTransformation; -import org.apache.activeblaze.jms.message.BlazeJmsObjectMessage; -import org.apache.activeblaze.jms.message.BlazeJmsStreamMessage; -import org.apache.activeblaze.jms.message.BlazeJmsTextMessage; +import org.apache.activeblaze.wire.BlazeJmsBytesMessage; +import org.apache.activeblaze.wire.BlazeJmsMapMessage; +import org.apache.activeblaze.wire.BlazeJmsMessage; +import org.apache.activeblaze.wire.BlazeJmsMessageTransformation; +import org.apache.activeblaze.wire.BlazeJmsObjectMessage; +import org.apache.activeblaze.wire.BlazeJmsStreamMessage; +import org.apache.activeblaze.wire.BlazeJmsTextMessage; /** * JMS Session implementation - * */ public class BlazeJmsSession implements Session, QueueSession, TopicSession { private final BlazeJmsConnection connection; @@ -66,9 +43,6 @@ public class BlazeJmsSession implements /** * Constructor - * - * @param connection - * @param acknowledgementMode */ protected BlazeJmsSession(BlazeJmsConnection connection, int acknowledgementMode) { this.connection = connection; @@ -76,7 +50,6 @@ public class BlazeJmsSession implements } /** - * @throws JMSException * @see javax.jms.Session#close() */ public void close() throws JMSException { @@ -89,7 +62,6 @@ public class BlazeJmsSession implements } /** - * @throws JMSException * @see javax.jms.Session#commit() */ public void commit() throws JMSException { @@ -97,9 +69,7 @@ public class BlazeJmsSession implements } /** - * @param queue * @return QueueBrowser - * @throws JMSException * @see javax.jms.Session#createBrowser(javax.jms.Queue) */ public QueueBrowser createBrowser(Queue queue) throws JMSException { @@ -108,10 +78,7 @@ public class BlazeJmsSession implements } /** - * @param queue - * @param messageSelector * @return QueueBrowser - * @throws JMSException * @see javax.jms.Session#createBrowser(javax.jms.Queue, java.lang.String) */ public QueueBrowser createBrowser(Queue queue, String messageSelector) throws JMSException { @@ -121,7 +88,6 @@ public class BlazeJmsSession implements /** * @return BytesMessage - * @throws IllegalStateException * @see javax.jms.Session#createBytesMessage() */ public BytesMessage createBytesMessage() throws IllegalStateException { @@ -130,80 +96,63 @@ public class BlazeJmsSession implements } /** - * @param destination * @return a MessageConsumer - * @throws JMSException * @see javax.jms.Session#createConsumer(javax.jms.Destination) */ public MessageConsumer createConsumer(Destination destination) throws JMSException { checkClosed(); BlazeJmsDestination dest = BlazeJmsDestination.transform(destination); int queueDepth = this.connection.getConsumerMaxDispatchQueueDepth(); - BlazeJmsMessageConsumer result = new BlazeJmsMessageConsumer(this,dest,queueDepth ); + BlazeJmsMessageConsumer result = new BlazeJmsMessageConsumer(this, dest, queueDepth); add(result); return result; } /** - * @param destination - * @param messageSelector * @return MessageConsumer - * @throws JMSException * @see javax.jms.Session#createConsumer(javax.jms.Destination, java.lang.String) */ public MessageConsumer createConsumer(Destination destination, String messageSelector) throws JMSException { checkClosed(); BlazeJmsDestination dest = BlazeJmsDestination.transform(destination); int queueDepth = this.connection.getConsumerMaxDispatchQueueDepth(); - BlazeJmsMessageConsumer result = new BlazeJmsMessageConsumer(this, dest,queueDepth); + BlazeJmsMessageConsumer result = new BlazeJmsMessageConsumer(this, dest, queueDepth); result.setMessageSelector(messageSelector); add(result); return result; } /** - * @param destination - * @param messageSelector - * @param NoLocal * @return the MessageConsumer - * @throws JMSException * @see javax.jms.Session#createConsumer(javax.jms.Destination, java.lang.String, boolean) */ public MessageConsumer createConsumer(Destination destination, String messageSelector, boolean NoLocal) throws JMSException { checkClosed(); BlazeJmsDestination dest = BlazeJmsDestination.transform(destination); - + int queueDepth = this.connection.getConsumerMaxDispatchQueueDepth(); - BlazeJmsTopicSubscriber result = new BlazeJmsTopicSubscriber(this, dest, "", false, NoLocal,queueDepth); + BlazeJmsTopicSubscriber result = new BlazeJmsTopicSubscriber(this, dest, "", false, NoLocal, queueDepth); result.setMessageSelector(messageSelector); add(result); return result; } /** - * @param topic - * @param name * @return a TopicSubscriber - * @throws JMSException * @see javax.jms.Session#createDurableSubscriber(javax.jms.Topic, java.lang.String) */ public TopicSubscriber createDurableSubscriber(Topic topic, String name) throws JMSException { checkClosed(); BlazeJmsDestination dest = BlazeJmsDestination.transform(topic); int queueDepth = this.connection.getConsumerMaxDispatchQueueDepth(); - BlazeJmsTopicSubscriber result = new BlazeJmsTopicSubscriber(this, dest, "", true, false,queueDepth); + BlazeJmsTopicSubscriber result = new BlazeJmsTopicSubscriber(this, dest, "", true, false, queueDepth); add(result); return result; } /** - * @param topic - * @param name - * @param messageSelector - * @param noLocal * @return TopicSubscriber - * @throws JMSException * @see javax.jms.Session#createDurableSubscriber(javax.jms.Topic, java.lang.String, java.lang.String, boolean) */ public TopicSubscriber createDurableSubscriber(Topic topic, String name, String messageSelector, boolean noLocal) @@ -211,7 +160,7 @@ public class BlazeJmsSession implements checkClosed(); BlazeJmsDestination dest = BlazeJmsDestination.transform(topic); int queueDepth = this.connection.getConsumerMaxDispatchQueueDepth(); - BlazeJmsTopicSubscriber result = new BlazeJmsTopicSubscriber(this, dest, "", true, noLocal,queueDepth); + BlazeJmsTopicSubscriber result = new BlazeJmsTopicSubscriber(this, dest, "", true, noLocal, queueDepth); result.setMessageSelector(messageSelector); add(result); return result; @@ -219,7 +168,6 @@ public class BlazeJmsSession implements /** * @return MapMessage - * @throws IllegalStateException * @see javax.jms.Session#createMapMessage() */ public MapMessage createMapMessage() throws IllegalStateException { @@ -229,7 +177,6 @@ public class BlazeJmsSession implements /** * @return Message - * @throws IllegalStateException * @see javax.jms.Session#createMessage() */ public Message createMessage() throws IllegalStateException { @@ -239,7 +186,6 @@ public class BlazeJmsSession implements /** * @return ObjectMessage - * @throws IllegalStateException * @see javax.jms.Session#createObjectMessage() */ public ObjectMessage createObjectMessage() throws IllegalStateException { @@ -248,9 +194,7 @@ public class BlazeJmsSession implements } /** - * @param object * @return ObjectMessage - * @throws JMSException * @see javax.jms.Session#createObjectMessage(java.io.Serializable) */ public ObjectMessage createObjectMessage(Serializable object) throws JMSException { @@ -261,9 +205,7 @@ public class BlazeJmsSession implements } /** - * @param destination * @return MessageProducer - * @throws JMSException * @see javax.jms.Session#createProducer(javax.jms.Destination) */ public MessageProducer createProducer(Destination destination) throws JMSException { @@ -275,9 +217,7 @@ public class BlazeJmsSession implements } /** - * @param queueName * @return Queue - * @throws JMSException * @see javax.jms.Session#createQueue(java.lang.String) */ public Queue createQueue(String queueName) throws JMSException { @@ -287,7 +227,6 @@ public class BlazeJmsSession implements /** * @return StreamMessage - * @throws JMSException * @see javax.jms.Session#createStreamMessage() */ public StreamMessage createStreamMessage() throws JMSException { @@ -297,7 +236,6 @@ public class BlazeJmsSession implements /** * @return TemporaryQueue - * @throws JMSException * @see javax.jms.Session#createTemporaryQueue() */ public TemporaryQueue createTemporaryQueue() throws JMSException { @@ -307,7 +245,6 @@ public class BlazeJmsSession implements /** * @return TemporaryTopic - * @throws JMSException * @see javax.jms.Session#createTemporaryTopic() */ public TemporaryTopic createTemporaryTopic() throws JMSException { @@ -317,7 +254,6 @@ public class BlazeJmsSession implements /** * @return TextMessage - * @throws JMSException * @see javax.jms.Session#createTextMessage() */ public TextMessage createTextMessage() throws JMSException { @@ -326,9 +262,7 @@ public class BlazeJmsSession implements } /** - * @param text * @return TextMessage - * @throws JMSException * @see javax.jms.Session#createTextMessage(java.lang.String) */ public TextMessage createTextMessage(String text) throws JMSException { @@ -339,9 +273,7 @@ public class BlazeJmsSession implements } /** - * @param topicName * @return Topic - * @throws JMSException * @see javax.jms.Session#createTopic(java.lang.String) */ public Topic createTopic(String topicName) throws JMSException { @@ -351,7 +283,6 @@ public class BlazeJmsSession implements /** * @return acknowledgeMode - * @throws JMSException * @see javax.jms.Session#getAcknowledgeMode() */ public int getAcknowledgeMode() throws JMSException { @@ -360,8 +291,6 @@ public class BlazeJmsSession implements } /** - * @return - * @throws JMSException * @see javax.jms.Session#getMessageListener() */ public MessageListener getMessageListener() throws JMSException { @@ -370,8 +299,6 @@ public class BlazeJmsSession implements } /** - * @return - * @throws JMSException * @see javax.jms.Session#getTransacted() */ public boolean getTransacted() throws JMSException { @@ -380,7 +307,6 @@ public class BlazeJmsSession implements } /** - * @throws JMSException * @see javax.jms.Session#recover() */ public void recover() throws JMSException { @@ -388,7 +314,6 @@ public class BlazeJmsSession implements } /** - * @throws JMSException * @see javax.jms.Session#rollback() */ public void rollback() throws JMSException { @@ -396,7 +321,6 @@ public class BlazeJmsSession implements } /** - * * @see javax.jms.Session#run() */ public void run() { @@ -404,8 +328,6 @@ public class BlazeJmsSession implements } /** - * @param listener - * @throws JMSException * @see javax.jms.Session#setMessageListener(javax.jms.MessageListener) */ public void setMessageListener(MessageListener listener) throws JMSException { @@ -414,8 +336,6 @@ public class BlazeJmsSession implements } /** - * @param name - * @throws JMSException * @see javax.jms.Session#unsubscribe(java.lang.String) */ public void unsubscribe(String name) throws JMSException { @@ -423,41 +343,34 @@ public class BlazeJmsSession implements } /** - * @param queue * @return QueueRecevier - * @throws JMSException * @see javax.jms.QueueSession#createReceiver(javax.jms.Queue) */ public QueueReceiver createReceiver(Queue queue) throws JMSException { checkClosed(); BlazeJmsDestination dest = BlazeJmsDestination.transform(queue); int queueDepth = this.connection.getConsumerMaxDispatchQueueDepth(); - BlazeJmsQueueReceiver result = new BlazeJmsQueueReceiver(this, dest,queueDepth); + BlazeJmsQueueReceiver result = new BlazeJmsQueueReceiver(this, dest, queueDepth); add(result); return result; } /** - * @param queue - * @param messageSelector * @return QueueReceiver - * @throws JMSException * @see javax.jms.QueueSession#createReceiver(javax.jms.Queue, java.lang.String) */ public QueueReceiver createReceiver(Queue queue, String messageSelector) throws JMSException { checkClosed(); BlazeJmsDestination dest = BlazeJmsDestination.transform(queue); int queueDepth = this.connection.getConsumerMaxDispatchQueueDepth(); - BlazeJmsQueueReceiver result = new BlazeJmsQueueReceiver(this, dest,queueDepth); + BlazeJmsQueueReceiver result = new BlazeJmsQueueReceiver(this, dest, queueDepth); result.setMessageSelector(messageSelector); add(result); return result; } /** - * @param queue * @return QueueSender - * @throws JMSException * @see javax.jms.QueueSession#createSender(javax.jms.Queue) */ public QueueSender createSender(Queue queue) throws JMSException { @@ -468,9 +381,7 @@ public class BlazeJmsSession implements } /** - * @param topic * @return TopicPublisher - * @throws JMSException * @see javax.jms.TopicSession#createPublisher(javax.jms.Topic) */ public TopicPublisher createPublisher(Topic topic) throws JMSException { @@ -482,37 +393,31 @@ public class BlazeJmsSession implements } /** - * @param topic * @return TopicSubscriber - * @throws JMSException * @see javax.jms.TopicSession#createSubscriber(javax.jms.Topic) */ public TopicSubscriber createSubscriber(Topic topic) throws JMSException { checkClosed(); BlazeJmsDestination dest = BlazeJmsDestination.transform(topic); int queueDepth = this.connection.getConsumerMaxDispatchQueueDepth(); - BlazeJmsTopicSubscriber result = new BlazeJmsTopicSubscriber(this, dest, "", false, false,queueDepth); + BlazeJmsTopicSubscriber result = new BlazeJmsTopicSubscriber(this, dest, "", false, false, queueDepth); add(result); return result; } /** - * @param topic - * @param messageSelector - * @param noLocal * @return TopicSubscriber - * @throws JMSException * @see javax.jms.TopicSession#createSubscriber(javax.jms.Topic, java.lang.String, boolean) */ public TopicSubscriber createSubscriber(Topic topic, String messageSelector, boolean noLocal) throws JMSException { checkClosed(); BlazeJmsDestination dest = BlazeJmsDestination.transform(topic); int queueDepth = this.connection.getConsumerMaxDispatchQueueDepth(); - BlazeJmsTopicSubscriber result = new BlazeJmsTopicSubscriber(this, dest, "", false, noLocal,queueDepth); + BlazeJmsTopicSubscriber result = new BlazeJmsTopicSubscriber(this, dest, "", false, noLocal, queueDepth); result.setMessageSelector(messageSelector); return result; } - + protected void add(BlazeJmsMessageConsumer consumer) throws JMSException { this.consumers.add(consumer); this.connection.addMesssageDispatcher(consumer, consumer.getSubscription()); @@ -526,22 +431,21 @@ public class BlazeJmsSession implements protected void add(MessageProducer producer) { this.producers.add(producer); } - + protected void remove(MessageProducer producer) { this.producers.remove(producer); } - + protected void onException(Exception ex) { this.connection.onException(ex); - } - - /** - * @param ex - * @see org.apache.activeblaze.ExceptionListener#onException(java.lang.Exception) - */ - protected void onException(JMSException ex) { - this.connection.onException(ex); - } + } + + /** + * @see org.apache.activeblaze.ExceptionListener#onException(java.lang.Exception) + */ + protected void onException(JMSException ex) { + this.connection.onException(ex); + } protected void send(Destination dest, Message msg, int deliveryMode, int priority, long timeToLive) throws JMSException { @@ -551,7 +455,7 @@ public class BlazeJmsSession implements } private void send(BlazeJmsDestination destination, BlazeJmsMessage message, int deliveryMode, int priority, - long timeToLive) throws JMSException { + long timeToLive) throws JMSException { message.setJMSDestination(destination); message.setJMSDeliveryMode(deliveryMode); message.setJMSPriority(priority); Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTempDestination.java URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTempDestination.java?rev=1504961&r1=1504960&r2=1504961&view=diff ============================================================================== --- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTempDestination.java (original) +++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTempDestination.java Fri Jul 19 18:44:21 2013 @@ -20,30 +20,27 @@ import org.apache.activeblaze.Destinatio /** * Temporary Destination - * */ -public class BlazeJmsTempDestination extends BlazeJmsDestination{ - +public class BlazeJmsTempDestination extends BlazeJmsDestination { + /** * Constructor */ - public BlazeJmsTempDestination(){ + public BlazeJmsTempDestination() { this(""); } - + /** * Constructor - * @param dest */ public BlazeJmsTempDestination(Destination dest) { super(dest); } - + /** * Constructor - * @param name */ - public BlazeJmsTempDestination(String name){ + public BlazeJmsTempDestination(String name) { super(name); this.destination.setTemporary(true); } Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTempQueue.java URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTempQueue.java?rev=1504961&r1=1504960&r2=1504961&view=diff ============================================================================== --- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTempQueue.java (original) +++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTempQueue.java Fri Jul 19 18:44:21 2013 @@ -16,35 +16,31 @@ */ package org.apache.activeblaze.jms; -import javax.jms.JMSException; import javax.jms.TemporaryQueue; import org.apache.activeblaze.Destination; /** * TemporaryQueue - * */ public class BlazeJmsTempQueue extends BlazeJmsTempDestination implements TemporaryQueue { /** * Constructor */ - public BlazeJmsTempQueue(){ + public BlazeJmsTempQueue() { this(""); } - + /** * Constructor - * @param dest */ public BlazeJmsTempQueue(Destination dest) { super(dest); } - + /** * Constructor - * @param name */ - public BlazeJmsTempQueue(String name){ + public BlazeJmsTempQueue(String name) { super(name); this.destination.setTopic(false); } @@ -54,7 +50,7 @@ public class BlazeJmsTempQueue extends B */ public void delete() { // TODO Auto-generated method stub - + } /** Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTempTopic.java URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTempTopic.java?rev=1504961&r1=1504960&r2=1504961&view=diff ============================================================================== --- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTempTopic.java (original) +++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTempTopic.java Fri Jul 19 18:44:21 2013 @@ -16,35 +16,31 @@ */ package org.apache.activeblaze.jms; -import javax.jms.JMSException; import javax.jms.TemporaryTopic; import org.apache.activeblaze.Destination; /** * Temporary Topic - * */ -public class BlazeJmsTempTopic extends BlazeJmsTempDestination implements TemporaryTopic{ +public class BlazeJmsTempTopic extends BlazeJmsTempDestination implements TemporaryTopic { /** * Constructor */ - public BlazeJmsTempTopic(){ + public BlazeJmsTempTopic() { this(""); } - + /** * Constructor - * @param dest */ public BlazeJmsTempTopic(Destination dest) { super(dest); } - + /** * Constructor - * @param name */ - public BlazeJmsTempTopic(String name){ + public BlazeJmsTempTopic(String name) { super(name); this.destination.setTopic(true); } @@ -54,7 +50,7 @@ public class BlazeJmsTempTopic extends */ public void delete() { // TODO Auto-generated method stub - + } /** @@ -62,6 +58,6 @@ public class BlazeJmsTempTopic extends * @see javax.jms.Topic#getTopicName() */ public String getTopicName() { - return getName(); + return getName(); } } Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTopic.java URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTopic.java?rev=1504961&r1=1504960&r2=1504961&view=diff ============================================================================== --- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTopic.java (original) +++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTopic.java Fri Jul 19 18:44:21 2013 @@ -21,29 +21,26 @@ import org.apache.activeblaze.Destinatio /** * TemporaryQueue - * */ public class BlazeJmsTopic extends BlazeJmsDestination implements Topic { /** * Constructor */ - public BlazeJmsTopic(){ + public BlazeJmsTopic() { this(""); } - + /** * Constructor - * @param dest */ public BlazeJmsTopic(Destination dest) { super(dest); } - + /** * Constructor - * @param name */ - public BlazeJmsTopic(String name){ + public BlazeJmsTopic(String name) { super(name); this.destination.setTopic(true); } @@ -53,6 +50,6 @@ public class BlazeJmsTopic extends Blaze * @see javax.jms.Topic#getTopicName() */ public String getTopicName() { - return getName(); + return getName(); } } Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTopicPublisher.java URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTopicPublisher.java?rev=1504961&r1=1504960&r2=1504961&view=diff ============================================================================== --- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTopicPublisher.java (original) +++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTopicPublisher.java Fri Jul 19 18:44:21 2013 @@ -24,14 +24,11 @@ import javax.jms.TopicPublisher; /** * Implementation of a TopicPublisher - * */ public class BlazeJmsTopicPublisher extends BlazeJmsMessageProducer implements TopicPublisher { /** * Constructor - * @param s - * @param destination */ protected BlazeJmsTopicPublisher(BlazeJmsSession s, BlazeJmsDestination destination) { super(s, destination); @@ -39,7 +36,6 @@ public class BlazeJmsTopicPublisher exte /** * @return the Topic - * @throws IllegalStateException * @see javax.jms.TopicPublisher#getTopic() */ public Topic getTopic() throws IllegalStateException { @@ -48,53 +44,37 @@ public class BlazeJmsTopicPublisher exte } /** - * @param message - * @throws JMSException * @see javax.jms.TopicPublisher#publish(javax.jms.Message) */ public void publish(Message message) throws JMSException { super.send(message); - + } /** - * @param topic - * @param message - * @throws JMSException * @see javax.jms.TopicPublisher#publish(javax.jms.Topic, javax.jms.Message) */ public void publish(Topic topic, Message message) throws JMSException { - super.send(topic,message); - + super.send(topic, message); + } /** - * @param message - * @param deliveryMode - * @param priority - * @param timeToLive - * @throws JMSException * @see javax.jms.TopicPublisher#publish(javax.jms.Message, int, int, long) */ public void publish(Message message, int deliveryMode, int priority, long timeToLive) throws JMSException { - super.send(message, deliveryMode, priority, timeToLive); - + super.send(message, deliveryMode, priority, timeToLive); + } /** - * @param topic - * @param message - * @param deliveryMode - * @param priority - * @param timeToLive - * @throws JMSException * @see javax.jms.TopicPublisher#publish(javax.jms.Topic, javax.jms.Message, int, int, long) */ public void publish(Topic topic, Message message, int deliveryMode, int priority, long timeToLive) throws JMSException { super.send(topic, message, deliveryMode, priority, timeToLive); - + } - + } Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTopicSession.java URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTopicSession.java?rev=1504961&r1=1504960&r2=1504961&view=diff ============================================================================== --- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTopicSession.java (original) +++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTopicSession.java Fri Jul 19 18:44:21 2013 @@ -16,35 +16,21 @@ */ package org.apache.activeblaze.jms; -import javax.jms.Destination; +import javax.jms.*; import javax.jms.IllegalStateException; -import javax.jms.JMSException; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Queue; -import javax.jms.QueueBrowser; -import javax.jms.QueueReceiver; -import javax.jms.QueueSender; -import javax.jms.TemporaryQueue; /** * Implementation of a TopicSession - * */ public class BlazeJmsTopicSession extends BlazeJmsSession { /** * Constructor - * @param connection - * @param acknowledgementMode */ protected BlazeJmsTopicSession(BlazeJmsConnection connection, int acknowledgementMode) { super(connection, acknowledgementMode); } /** - * @param queue - * @return - * @throws JMSException * @see javax.jms.Session#createBrowser(javax.jms.Queue) */ public QueueBrowser createBrowser(Queue queue) throws JMSException { @@ -52,10 +38,6 @@ public class BlazeJmsTopicSession extend } /** - * @param queue - * @param messageSelector - * @return - * @throws JMSException * @see javax.jms.Session#createBrowser(javax.jms.Queue, java.lang.String) */ public QueueBrowser createBrowser(Queue queue, String messageSelector) throws JMSException { @@ -63,9 +45,6 @@ public class BlazeJmsTopicSession extend } /** - * @param destination - * @return - * @throws JMSException * @see javax.jms.Session#createConsumer(javax.jms.Destination) */ public MessageConsumer createConsumer(Destination destination) throws JMSException { @@ -76,10 +55,6 @@ public class BlazeJmsTopicSession extend } /** - * @param destination - * @param messageSelector - * @return - * @throws JMSException * @see javax.jms.Session#createConsumer(javax.jms.Destination, java.lang.String) */ public MessageConsumer createConsumer(Destination destination, String messageSelector) throws JMSException { @@ -90,9 +65,6 @@ public class BlazeJmsTopicSession extend } /** - * @param destination - * @return - * @throws JMSException * @see javax.jms.Session#createProducer(javax.jms.Destination) */ public MessageProducer createProducer(Destination destination) throws JMSException { @@ -103,9 +75,6 @@ public class BlazeJmsTopicSession extend } /** - * @param queueName - * @return - * @throws JMSException * @see javax.jms.Session#createQueue(java.lang.String) */ public Queue createQueue(String queueName) throws JMSException { @@ -113,8 +82,6 @@ public class BlazeJmsTopicSession extend } /** - * @return - * @throws JMSException * @see javax.jms.Session#createTemporaryQueue() */ public TemporaryQueue createTemporaryQueue() throws JMSException { @@ -122,9 +89,6 @@ public class BlazeJmsTopicSession extend } /** - * @param queue - * @return - * @throws JMSException * @see javax.jms.QueueSession#createReceiver(javax.jms.Queue) */ public QueueReceiver createReceiver(Queue queue) throws JMSException { @@ -132,10 +96,6 @@ public class BlazeJmsTopicSession extend } /** - * @param queue - * @param messageSelector - * @return - * @throws JMSException * @see javax.jms.QueueSession#createReceiver(javax.jms.Queue, java.lang.String) */ public QueueReceiver createReceiver(Queue queue, String messageSelector) throws JMSException { @@ -143,9 +103,6 @@ public class BlazeJmsTopicSession extend } /** - * @param queue - * @return - * @throws JMSException * @see javax.jms.QueueSession#createSender(javax.jms.Queue) */ public QueueSender createSender(Queue queue) throws JMSException { Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTopicSubscriber.java URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTopicSubscriber.java?rev=1504961&r1=1504960&r2=1504961&view=diff ============================================================================== --- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTopicSubscriber.java (original) +++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jms/BlazeJmsTopicSubscriber.java Fri Jul 19 18:44:21 2013 @@ -22,18 +22,14 @@ import javax.jms.TopicSubscriber; /** * Implementation of a TopicSubscriber - * */ public class BlazeJmsTopicSubscriber extends BlazeJmsMessageConsumer implements TopicSubscriber { /** * Constructor - * - * @param s - * @param destination */ protected BlazeJmsTopicSubscriber(BlazeJmsSession s, BlazeJmsDestination destination, String name, boolean durable, - boolean noLocal,int queueDepth) { - super(s, destination,queueDepth); + boolean noLocal, int queueDepth) { + super(s, destination, queueDepth); getSubscription().setSubscriberName(name); getSubscription().setDurable(durable); getSubscription().setNoLocal(noLocal); @@ -41,7 +37,6 @@ public class BlazeJmsTopicSubscriber ext /** * @return noLocak flag - * @throws IllegalStateException * @see javax.jms.TopicSubscriber#getNoLocal() */ public boolean getNoLocal() throws IllegalStateException { @@ -51,7 +46,6 @@ public class BlazeJmsTopicSubscriber ext /** * @return the Topic - * @throws IllegalStateException * @see javax.jms.TopicSubscriber#getTopic() */ public Topic getTopic() throws IllegalStateException { @@ -61,7 +55,6 @@ public class BlazeJmsTopicSubscriber ext /** * @return the durable - * @throws IllegalStateException */ public boolean isDurable() throws IllegalStateException { checkClosed(); @@ -70,7 +63,6 @@ public class BlazeJmsTopicSubscriber ext /** * @return the name - * @throws IllegalStateException */ public String getName() throws IllegalStateException { checkClosed(); Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jndi/JNDIReferenceFactory.java URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jndi/JNDIReferenceFactory.java?rev=1504961&r1=1504960&r2=1504961&view=diff ============================================================================== --- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jndi/JNDIReferenceFactory.java (original) +++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jndi/JNDIReferenceFactory.java Fri Jul 19 18:44:21 2013 @@ -20,6 +20,7 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.Hashtable; import java.util.Map; + import javax.naming.Context; import javax.naming.Name; import javax.naming.NamingException; @@ -39,18 +40,13 @@ public class JNDIReferenceFactory implem /** * This will be called by a JNDIprovider when a Reference is retrieved from a JNDI store - and generates the orignal * instance - * - * @param object - * the Reference object - * @param name - * the JNDI name - * @param nameCtx - * the context - * @param environment - * the environment settings used by JNDI + * + * @param object the Reference object + * @param name the JNDI name + * @param nameCtx the context + * @param environment the environment settings used by JNDI * @return the instance built from the Reference object - * @throws Exception - * if building the instance from Reference fails (usually class not found) + * @throws Exception if building the instance from Reference fails (usually class not found) */ public Object getObjectInstance(Object object, Name name, Context nameCtx, Hashtable environment) throws Exception { @@ -64,7 +60,7 @@ public class JNDIReferenceFactory implem if (JNDIStorable.class.isAssignableFrom(theClass)) { JNDIStorable store = (JNDIStorable) theClass.newInstance(); Map properties = new HashMap(); - for (Enumeration iter = reference.getAll(); iter.hasMoreElements();) { + for (Enumeration iter = reference.getAll(); iter.hasMoreElements(); ) { StringRefAddr addr = (StringRefAddr) iter.nextElement(); properties.put(addr.getType(), (addr.getContent() == null) ? "" : addr.getContent().toString()); } @@ -80,11 +76,8 @@ public class JNDIReferenceFactory implem /** * Create a Reference instance from a JNDIStorable object - * - * @param instanceClassName - * @param po + * * @return Reference - * @throws NamingException */ public static Reference createReference(String instanceClassName, JNDIStorable po) throws NamingException { if (log.isTraceEnabled()) { @@ -106,11 +99,8 @@ public class JNDIReferenceFactory implem /** * Retrieve the class loader for a named class - * - * @param thisObj - * @param className + * * @return the class - * @throws ClassNotFoundException */ public static Class loadClass(Object thisObj, String className) throws ClassNotFoundException { // try local ClassLoader first. Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jndi/JNDIStorable.java URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jndi/JNDIStorable.java?rev=1504961&r1=1504960&r2=1504961&view=diff ============================================================================== --- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jndi/JNDIStorable.java (original) +++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/jndi/JNDIStorable.java Fri Jul 19 18:44:21 2013 @@ -22,6 +22,7 @@ import java.io.ObjectInput; import java.io.ObjectOutput; import java.util.HashMap; import java.util.Map; + import javax.naming.NamingException; import javax.naming.Reference; import javax.naming.Referenceable; @@ -32,43 +33,37 @@ import javax.naming.Referenceable; public abstract class JNDIStorable implements Referenceable, Externalizable { - private Map properties; + private Map properties; /** * Set the properties that will represent the instance in JNDI - * - * @param props */ - protected abstract void buildFromProperties(Map props); + protected abstract void buildFromProperties(Map props); /** * Initialize the instance from properties stored in JNDI - * - * @param props */ - protected abstract void populateProperties(Map props); + protected abstract void populateProperties(Map props); /** * set the properties for this instance as retrieved from JNDI - * - * @param props */ - public synchronized void setProperties(Map props) { + public synchronized void setProperties(Map props) { this.properties = props; buildFromProperties(props); } /** * Get the properties from this instance for storing in JNDI - * + * * @return the properties */ - public synchronized Map getProperties() { + public synchronized Map getProperties() { if (this.properties == null) { - this.properties = new HashMap(); + this.properties = new HashMap(); } populateProperties(this.properties); return this.properties; @@ -76,7 +71,7 @@ public abstract class JNDIStorable imple /** * Retrive a Reference for this instance to store in JNDI - * + * * @return the built Reference * @throws NamingException if error on building Reference */ @@ -85,13 +80,10 @@ public abstract class JNDIStorable imple } /** - * @param in - * @throws IOException - * @throws ClassNotFoundException * @see java.io.Externalizable#readExternal(java.io.ObjectInput) */ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - Map props = (Map)in.readObject(); + Map props = (Map) in.readObject(); if (props != null) { setProperties(props); } @@ -99,16 +91,14 @@ public abstract class JNDIStorable imple } /** - * @param out - * @throws IOException * @see java.io.Externalizable#writeExternal(java.io.ObjectOutput) */ public void writeExternal(ObjectOutput out) throws IOException { out.writeObject(getProperties()); } - - protected String getProperty(Mapmap,String key, String defaultValue) { + + protected String getProperty(Map map, String key, String defaultValue) { String value = map.get(key); if (value != null) { return value; Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/AsyncGroupRequest.java URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/AsyncGroupRequest.java?rev=1504961&r1=1504960&r2=1504961&view=diff ============================================================================== --- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/AsyncGroupRequest.java (original) +++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/AsyncGroupRequest.java Fri Jul 19 18:44:21 2013 @@ -18,32 +18,24 @@ package org.apache.activeblaze.util; import java.util.HashSet; import java.util.Set; -import org.apache.activemq.protobuf.Buffer; /** * keep track of multiple requests - * */ public class AsyncGroupRequest implements RequestCallback { private final Object mutex = new Object(); - private Set requests = new HashSet(); + private Set requests = new HashSet(); /** * Add a request - * - * @param id - * @param request */ - public void add(Buffer id, SendRequest request) { + public void add(String id, SendRequest request) { request.setCallback(this); this.requests.add(id); } /** * Wait for requests - * - * @param timeout - * @return */ public boolean isSuccess(long timeout) { if (!this.requests.isEmpty()) { @@ -57,7 +49,7 @@ public class AsyncGroupRequest implement return this.requests.isEmpty(); } - public void finished(Buffer id) { + public void finished(String id) { synchronized (this.mutex) { this.requests.remove(id); if (this.requests.isEmpty()) { Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/BitArray.java URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/BitArray.java?rev=1504961&r1=1504960&r2=1504961&view=diff ============================================================================== --- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/BitArray.java (original) +++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/BitArray.java Fri Jul 19 18:44:21 2013 @@ -24,7 +24,7 @@ import java.io.IOException; * Simple BitArray to enable setting multiple boolean values efficently Used * instead of BitSet because BitSet does not allow for efficent serialization. * Will store up to 64 boolean values - * + * * @version $Revision: 1.1.1.1 $ */ public class BitArray { @@ -33,27 +33,27 @@ public class BitArray { static final int SHORT_SIZE = 16; static final int BYTE_SIZE = 8; private static final long[] BIT_VALUES = {0x0000000000000001L, 0x0000000000000002L, 0x0000000000000004L, - 0x0000000000000008L, 0x0000000000000010L, 0x0000000000000020L, - 0x0000000000000040L, 0x0000000000000080L, 0x0000000000000100L, - 0x0000000000000200L, 0x0000000000000400L, 0x0000000000000800L, - 0x0000000000001000L, 0x0000000000002000L, 0x0000000000004000L, - 0x0000000000008000L, 0x0000000000010000L, 0x0000000000020000L, - 0x0000000000040000L, 0x0000000000080000L, 0x0000000000100000L, - 0x0000000000200000L, 0x0000000000400000L, 0x0000000000800000L, - 0x0000000001000000L, 0x0000000002000000L, 0x0000000004000000L, - 0x0000000008000000L, 0x0000000010000000L, 0x0000000020000000L, - 0x0000000040000000L, 0x0000000080000000L, 0x0000000100000000L, - 0x0000000200000000L, 0x0000000400000000L, 0x0000000800000000L, - 0x0000001000000000L, 0x0000002000000000L, 0x0000004000000000L, - 0x0000008000000000L, 0x0000010000000000L, 0x0000020000000000L, - 0x0000040000000000L, 0x0000080000000000L, 0x0000100000000000L, - 0x0000200000000000L, 0x0000400000000000L, 0x0000800000000000L, - 0x0001000000000000L, 0x0002000000000000L, 0x0004000000000000L, - 0x0008000000000000L, 0x0010000000000000L, 0x0020000000000000L, - 0x0040000000000000L, 0x0080000000000000L, 0x0100000000000000L, - 0x0200000000000000L, 0x0400000000000000L, 0x0800000000000000L, - 0x1000000000000000L, 0x2000000000000000L, 0x4000000000000000L, - 0x8000000000000000L}; + 0x0000000000000008L, 0x0000000000000010L, 0x0000000000000020L, + 0x0000000000000040L, 0x0000000000000080L, 0x0000000000000100L, + 0x0000000000000200L, 0x0000000000000400L, 0x0000000000000800L, + 0x0000000000001000L, 0x0000000000002000L, 0x0000000000004000L, + 0x0000000000008000L, 0x0000000000010000L, 0x0000000000020000L, + 0x0000000000040000L, 0x0000000000080000L, 0x0000000000100000L, + 0x0000000000200000L, 0x0000000000400000L, 0x0000000000800000L, + 0x0000000001000000L, 0x0000000002000000L, 0x0000000004000000L, + 0x0000000008000000L, 0x0000000010000000L, 0x0000000020000000L, + 0x0000000040000000L, 0x0000000080000000L, 0x0000000100000000L, + 0x0000000200000000L, 0x0000000400000000L, 0x0000000800000000L, + 0x0000001000000000L, 0x0000002000000000L, 0x0000004000000000L, + 0x0000008000000000L, 0x0000010000000000L, 0x0000020000000000L, + 0x0000040000000000L, 0x0000080000000000L, 0x0000100000000000L, + 0x0000200000000000L, 0x0000400000000000L, 0x0000800000000000L, + 0x0001000000000000L, 0x0002000000000000L, 0x0004000000000000L, + 0x0008000000000000L, 0x0010000000000000L, 0x0020000000000000L, + 0x0040000000000000L, 0x0080000000000000L, 0x0100000000000000L, + 0x0200000000000000L, 0x0400000000000000L, 0x0800000000000000L, + 0x1000000000000000L, 0x2000000000000000L, 0x4000000000000000L, + 0x8000000000000000L}; private long bits; private int length; @@ -73,9 +73,7 @@ public class BitArray { /** * set the boolean value at the index - * - * @param index - * @param flag + * * @return the old value held at this index */ public boolean set(int index, boolean flag) { @@ -90,7 +88,6 @@ public class BitArray { } /** - * @param index * @return the boolean value at this index */ public boolean get(int index) { @@ -106,8 +103,6 @@ public class BitArray { /** * reset all the bits to the value supplied - * - * @param bits */ public void reset(long bits) { this.bits = bits; @@ -115,18 +110,15 @@ public class BitArray { /** * write the bits to an output stream - * - * @param dataOut - * @throws IOException */ public void writeToStream(DataOutput dataOut) throws IOException { dataOut.writeByte(this.length); if (this.length <= BYTE_SIZE) { - dataOut.writeByte((int)this.bits); + dataOut.writeByte((int) this.bits); } else if (this.length <= SHORT_SIZE) { - dataOut.writeShort((short)this.bits); + dataOut.writeShort((short) this.bits); } else if (this.length <= INT_SIZE) { - dataOut.writeInt((int)this.bits); + dataOut.writeInt((int) this.bits); } else { dataOut.writeLong(this.bits); } @@ -134,9 +126,6 @@ public class BitArray { /** * read the bits from an input stream - * - * @param dataIn - * @throws IOException */ public void readFromStream(DataInput dataIn) throws IOException { this.length = dataIn.readByte(); Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/BitArrayBin.java URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/BitArrayBin.java?rev=1504961&r1=1504960&r2=1504961&view=diff ============================================================================== --- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/BitArrayBin.java (original) +++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/BitArrayBin.java Fri Jul 19 18:44:21 2013 @@ -20,7 +20,7 @@ import java.util.LinkedList; /** * Holder for many bitArrays - used for message audit - * + * * @version $Revision: 1.1.1.1 $ */ public class BitArrayBin { @@ -28,13 +28,11 @@ public class BitArrayBin { private LinkedList list; private int maxNumberOfArrays; private int firstIndex = -1; - private long lastInOrderBit=-1; + private long lastInOrderBit = -1; /** * Create a BitArrayBin to a certain window size (number of messages to * keep) - * - * @param windowSize */ public BitArrayBin(int windowSize) { this.maxNumberOfArrays = ((windowSize + 1) / BitArray.LONG_SIZE) + 1; @@ -47,9 +45,7 @@ public class BitArrayBin { /** * Set a bit - * - * @param index - * @param value + * * @return true if set */ public boolean setBit(long index, boolean value) { @@ -63,10 +59,10 @@ public class BitArrayBin { } return answer; } - + /** * Test if in order - * @param index + * * @return true if next message is in order */ public boolean isInOrder(long index) { @@ -83,8 +79,7 @@ public class BitArrayBin { /** * Get the boolean value at the index - * - * @param index + * * @return true/false */ public boolean getBit(long index) { @@ -105,8 +100,7 @@ public class BitArrayBin { /** * Get the BitArray for the index - * - * @param index + * * @return BitArray */ private BitArray getBitArray(long index) { @@ -121,7 +115,7 @@ public class BitArrayBin { this.list.add(new BitArray()); overShoot--; } - + bin = this.maxNumberOfArrays - 1; } answer = this.list.get(bin); @@ -135,8 +129,7 @@ public class BitArrayBin { /** * Get the index of the bin from the total index - * - * @param index + * * @return the index of the bin */ private int getBin(long index) { @@ -144,21 +137,20 @@ public class BitArrayBin { if (this.firstIndex < 0) { this.firstIndex = (int) (index - (index % BitArray.LONG_SIZE)); } else if (this.firstIndex >= 0) { - answer = (int)((index - this.firstIndex) / BitArray.LONG_SIZE); + answer = (int) ((index - this.firstIndex) / BitArray.LONG_SIZE); } return answer; } /** * Get the offset into a bin from the total index - * - * @param index + * * @return the relative offset into a bin */ private int getOffset(long index) { int answer = 0; if (firstIndex >= 0) { - answer = (int)((index - firstIndex) - (BitArray.LONG_SIZE * getBin(index))); + answer = (int) ((index - firstIndex) - (BitArray.LONG_SIZE * getBin(index))); } return answer; } Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/Callback.java URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/Callback.java?rev=1504961&r1=1504960&r2=1504961&view=diff ============================================================================== --- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/Callback.java (original) +++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/Callback.java Fri Jul 19 18:44:21 2013 @@ -19,16 +19,14 @@ package org.apache.activeblaze.util; import org.apache.activeblaze.BlazeRuntimeException; /** - * A simple callback object + * A simple callback object + * * @version $Revision: 1.2 $ - * @param */ public interface Callback { /** - * Executes some piece of code - * @param t - * @throws BlazeRuntimeException + * Executes some piece of code */ void execute(T t) throws BlazeRuntimeException; } Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/ClassLoadingAwareObjectInputStream.java URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/ClassLoadingAwareObjectInputStream.java?rev=1504961&r1=1504960&r2=1504961&view=diff ============================================================================== --- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/ClassLoadingAwareObjectInputStream.java (original) +++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/ClassLoadingAwareObjectInputStream.java Fri Jul 19 18:44:21 2013 @@ -26,8 +26,11 @@ import java.util.HashMap; public class ClassLoadingAwareObjectInputStream extends ObjectInputStream { private static final ClassLoader FALLBACK_CLASS_LOADER = ClassLoadingAwareObjectInputStream.class.getClassLoader(); - /**

Maps primitive type names to corresponding class objects.

*/ + /** + *

Maps primitive type names to corresponding class objects.

+ */ private static final HashMap primClasses = new HashMap(8, 1.0F); + public ClassLoadingAwareObjectInputStream(InputStream in) throws IOException { super(in); } @@ -64,9 +67,8 @@ public class ClassLoadingAwareObjectInpu } } } - - - + + static { primClasses.put("boolean", boolean.class); primClasses.put("byte", byte.class); Modified: activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/IdGenerator.java URL: http://svn.apache.org/viewvc/activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/IdGenerator.java?rev=1504961&r1=1504960&r2=1504961&view=diff ============================================================================== --- activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/IdGenerator.java (original) +++ activemq/activemq-blaze/trunk/src/main/java/org/apache/activeblaze/util/IdGenerator.java Fri Jul 19 18:44:21 2013 @@ -65,7 +65,6 @@ public class IdGenerator { /** * Construct an IdGenerator - * @param prefix */ public IdGenerator(String prefix) { synchronized (UNIQUE_STUB) { @@ -83,7 +82,7 @@ public class IdGenerator { /** * As we have to find the hostname as a side-affect of generating a unique * stub, we allow it's easy retrevial here - * + * * @return the local host name */ @@ -94,7 +93,7 @@ public class IdGenerator { /** * Generate a unqiue id - * + * * @return a unique id */ @@ -106,7 +105,7 @@ public class IdGenerator { /** * Generate a unique ID - that is friendly for a URL or file system - * + * * @return a unique id */ public String generateSanitizedId() { @@ -119,7 +118,7 @@ public class IdGenerator { /** * From a generated id - return the seed (i.e. minus the count) - * + * * @param id the generated identifer * @return the seed */ @@ -136,8 +135,7 @@ public class IdGenerator { /** * From a generated id - return the generator count - * - * @param id + * * @return the count */ public static long getSequenceFromId(String id) { @@ -155,9 +153,7 @@ public class IdGenerator { /** * Does a proper compare on the ids - * - * @param id1 - * @param id2 + * * @return 0 if equal else a positive if id1 is > id2 ... */ @@ -170,7 +166,7 @@ public class IdGenerator { if (result == 0) { long count1 = IdGenerator.getSequenceFromId(id1); long count2 = IdGenerator.getSequenceFromId(id2); - result = (int)(count1 - count2); + result = (int) (count1 - count2); } } return result;