You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2015/10/08 18:52:45 UTC
[1/3] qpid-jms git commit: NO-JIRA Fix and update javadocs
Repository: qpid-jms
Updated Branches:
refs/heads/master 7bdd5361a -> 197d12273
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageBuilderTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageBuilderTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageBuilderTest.java
index 48686da..2ebff2b 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageBuilderTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageBuilderTest.java
@@ -75,6 +75,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase {
* Test that a message with the {@value AmqpMessageSupport#JMS_MSG_TYPE}
* annotation set to {@value AmqpMessageSupport#JMS_MESSAGE} is
* treated as a generic {@link JmsMessage} with {@link AmqpJmsMessageFacade}
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(expected = IOException.class)
public void testCreateMessageFromUnknownMessageTypeAnnotationValueThrows() throws Exception {
@@ -93,6 +95,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase {
* Test that a message with the {@value AmqpMessageSupport#JMS_MSG_TYPE}
* annotation set to {@value AmqpMessageSupport#JMS_MESSAGE} is
* treated as a generic {@link JmsMessage} with {@link AmqpJmsMessageFacade}
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testCreateGenericMessageFromMessageTypeAnnotation() throws Exception {
@@ -117,6 +121,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase {
* Test that a message with the {@value AmqpMessageSupport#JMS_MSG_TYPE}
* annotation set to {@value AmqpMessageSupport#JMS_BYTES_MESSAGE} is
* treated as a {@link JmsBytesMessage} with {@link AmqpJmsBytesMessageFacade}
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testCreateBytesMessageFromMessageTypeAnnotation() throws Exception {
@@ -141,6 +147,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase {
* Test that a message with the {@value AmqpMessageSupport#JMS_MSG_TYPE}
* annotation set to {@value AmqpMessageSupport#JMS_BYTES_MESSAGE} is
* treated as a {@link JmsTextMessage} with {@link AmqpJmsTextMessageFacade}
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testCreateTextMessageFromMessageTypeAnnotation() throws Exception {
@@ -167,6 +175,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase {
* content-type set to {@value AmqpMessageSupport#OCTET_STREAM_CONTENT_TYPE} is
* treated as a {@link JmsObjectMessage} with {@link AmqpJmsObjectMessageFacade}
* containing a {@link AmqpSerializedObjectDelegate}.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testCreateObjectMessageFromMessageTypeAnnotation() throws Exception {
@@ -178,6 +188,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase {
* annotation set to {@value AmqpMessageSupport#JMS_OBJECT_MESSAGE} and
* content-type not set is treated as a {@link JmsObjectMessage} with
* {@link AmqpJmsObjectMessageFacade} containing a {@link AmqpTypedObjectDelegate}.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testCreateObjectMessageFromMessageTypeAnnotationAnd() throws Exception {
@@ -217,6 +229,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase {
* Test that a message with the {@value AmqpMessageSupport#JMS_MSG_TYPE}
* annotation set to {@value AmqpMessageSupport#JMS_STREAM_MESSAGE} is
* treated as a {@link JmsStreamMessage} with {@link AmqpJmsStreamMessageFacade}
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testCreateStreamMessageFromMessageTypeAnnotation() throws Exception {
@@ -246,6 +260,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase {
* Test that a message with no body section, but with the content type set to
* {@value AmqpMessageSupport#OCTET_STREAM_CONTENT_TYPE} results in a BytesMessage
* when not otherwise annotated to indicate the type of JMS message it is.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testCreateBytesMessageFromNoBodySectionAndContentType() throws Exception {
@@ -264,6 +280,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase {
/**
* Test that a message with no body section, and no content-type results in a BytesMessage
* when not otherwise annotated to indicate the type of JMS message it is.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testCreateBytesMessageFromNoBodySectionAndNoContentType() throws Exception {
@@ -284,6 +302,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase {
* Test that a message with no body section, but with the content type set to
* {@value AmqpMessageSupport#SERIALIZED_JAVA_OBJECT_CONTENT_TYPE} results in an ObjectMessage
* when not otherwise annotated to indicate the type of JMS message it is.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testCreateObjectMessageFromNoBodySectionAndContentType() throws Exception {
@@ -320,6 +340,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase {
* Test that a message with no body section, and with the content type set to
* an unknown value results in a plain Message when not otherwise annotated to
* indicate the type of JMS message it is.
+ *
+ * @throws Exception if an error occurs during the test.
*/
public void testCreateGenericMessageFromNoBodySectionAndUnknownContentType() throws Exception {
Message message = Proton.message();
@@ -340,6 +362,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase {
* Test that a data body containing nothing, but with the content type set to
* {@value AmqpMessageSupport#OCTET_STREAM_CONTENT_TYPE} results in a BytesMessage when not
* otherwise annotated to indicate the type of JMS message it is.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testCreateBytesMessageFromDataWithEmptyBinaryAndContentType() throws Exception {
@@ -361,6 +385,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase {
* Test that a message with an empty data body section, and with the content type
* set to an unknown value results in a BytesMessage when not otherwise annotated
* to indicate the type of JMS message it is.
+ *
+ * @throws Exception if an error occurs during the test.
*/
public void testCreateBytesMessageFromDataWithUnknownContentType() throws Exception {
Message message = Proton.message();
@@ -381,6 +407,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase {
* Test that a receiving a data body containing nothing and no content type being set
* results in a BytesMessage when not otherwise annotated to indicate the type of
* JMS message it is.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testCreateBytesMessageFromDataWithEmptyBinaryAndNoContentType() throws Exception {
@@ -403,6 +431,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase {
* Test that receiving a data body containing nothing, but with the content type set to
* {@value AmqpMessageSupport#SERIALIZED_JAVA_OBJECT_CONTENT_TYPE} results in an ObjectMessage
* when not otherwise annotated to indicate the type of JMS message it is.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testCreateObjectMessageFromDataWithContentTypeAndEmptyBinary() throws Exception {
@@ -427,6 +457,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase {
* Test that receiving a Data body section with the content type set to
* 'text/plain' results in a TextMessage when not otherwise annotated to
* indicate the type of JMS message it is.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testCreateTextMessageFromDataWithContentTypeTextPlain() throws Exception {
@@ -539,6 +571,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase {
/**
* Test that an amqp-value body containing a string results in a TextMessage
* when not otherwise annotated to indicate the type of JMS message it is.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testCreateTextMessageFromAmqpValueWithString() throws Exception {
@@ -557,6 +591,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase {
/**
* Test that an amqp-value body containing a null results in an TextMessage
* when not otherwise annotated to indicate the type of JMS message it is.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testCreateTextMessageFromAmqpValueWithNull() throws Exception {
@@ -575,6 +611,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase {
/**
* Test that an amqp-value body containing a map results in an ObjectMessage
* when not otherwise annotated to indicate the type of JMS message it is.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testCreateAmqpObjectMessageFromAmqpValueWithMap() throws Exception {
@@ -597,6 +635,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase {
/**
* Test that an amqp-value body containing a list results in an ObjectMessage
* when not otherwise annotated to indicate the type of JMS message it is.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testCreateAmqpObjectMessageFromAmqpValueWithList() throws Exception {
@@ -619,6 +659,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase {
/**
* Test that an amqp-value body containing a binary value results in BytesMessage
* when not otherwise annotated to indicate the type of JMS message it is.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testCreateAmqpBytesMessageFromAmqpValueWithBinary() throws Exception {
@@ -638,6 +680,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase {
/**
* Test that an amqp-value body containing a value which can't be categorised results in
* an ObjectMessage when not otherwise annotated to indicate the type of JMS message it is.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testCreateObjectMessageFromAmqpValueWithUncategorisedContent() throws Exception {
@@ -661,6 +705,8 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase {
/**
* Test that an amqp-sequence body containing a binary value results in an ObjectMessage
* when not otherwise annotated to indicate the type of JMS message it is.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testCreateObjectMessageMessageFromAmqpSequence() throws Exception
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
index 690e407..0cd1d50 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
@@ -525,6 +525,8 @@ public class AmqpJmsMessageFacadeTest extends AmqpJmsMessageTypesTestCase {
* Check that setting GroupId null on a new message does not cause creation of the underlying properties
* section. New messages lack the properties section section,
* as tested by {@link #testNewMessageHasNoUnderlyingPropertiesSection()}.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetGroupIdNullOnNewMessageDoesNotCreatePropertiesSection() throws Exception {
@@ -539,6 +541,8 @@ public class AmqpJmsMessageFacadeTest extends AmqpJmsMessageTypesTestCase {
* Check that setting GroupId on the message causes creation of the underlying properties
* section with the expected value. New messages lack the properties section section,
* as tested by {@link #testNewMessageHasNoUnderlyingPropertiesSection()}.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetGroupIdOnNewMessage() throws Exception {
@@ -555,6 +559,8 @@ public class AmqpJmsMessageFacadeTest extends AmqpJmsMessageTypesTestCase {
/**
* Check that setting UserId null on the message causes any existing value to be cleared
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetGroupIdNullOnMessageWithExistingGroupId() throws Exception {
@@ -598,6 +604,8 @@ public class AmqpJmsMessageFacadeTest extends AmqpJmsMessageTypesTestCase {
* Check that setting ReplyToGroupId null on a new message does not cause creation of the
* underlying properties section. New messages lack the properties section,
* as tested by {@link #testNewMessageHasNoUnderlyingPropertiesSection()}.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetReplyToGroupIdNullOnNewMessageDoesNotCreatePropertiesSection() throws Exception {
@@ -1388,6 +1396,8 @@ public class AmqpJmsMessageFacadeTest extends AmqpJmsMessageTypesTestCase {
* Check that setting UserId on the message causes creation of the underlying properties
* section with the expected value. New messages lack the properties section section,
* as tested by {@link #testNewMessageHasNoUnderlyingPropertiesSection()}.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetUserIdOnNewMessage() throws Exception {
@@ -1404,6 +1414,8 @@ public class AmqpJmsMessageFacadeTest extends AmqpJmsMessageTypesTestCase {
/**
* Check that setting UserId null on the message causes any existing value to be cleared
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetUserIdNullOnMessageWithExistingUserId() throws Exception {
@@ -1603,6 +1615,8 @@ public class AmqpJmsMessageFacadeTest extends AmqpJmsMessageTypesTestCase {
/**
* Test that {@link AmqpJmsMessageFacade#getType()} returns the expected value
* for a message received with the message Subject set.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testGetJMSTypeWithReceivedMessage() throws Exception {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacadeTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacadeTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacadeTest.java
index 439957e..b4a5161 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacadeTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacadeTest.java
@@ -113,6 +113,8 @@ public class AmqpJmsObjectMessageFacadeTest extends AmqpJmsMessageTypesTestCase
/**
* Test that setting an object on a new message results in the expected
* content in the body section of the underlying message.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetObjectOnNewMessage() throws Exception {
@@ -140,6 +142,8 @@ public class AmqpJmsObjectMessageFacadeTest extends AmqpJmsMessageTypesTestCase
/**
* Test that setting an object on a new message results in the expected
* content in the body section of the underlying message.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetObjectOnNewAmqpTypedMessage() throws Exception {
@@ -158,9 +162,11 @@ public class AmqpJmsObjectMessageFacadeTest extends AmqpJmsMessageTypesTestCase
}
/**
- * Test that setting a null object on a message results in the underlying body
- * section being set with the null object body, ensuring getObject returns null.
- */
+ * Test that setting a null object on a message results in the underlying body
+ * section being set with the null object body, ensuring getObject returns null.
+ *
+ * @throws Exception if an error occurs during the test.
+ */
@Test
public void testSetObjectWithNullClearsExistingBodySection() throws Exception {
Message protonMessage = Message.Factory.create();
@@ -176,9 +182,11 @@ public class AmqpJmsObjectMessageFacadeTest extends AmqpJmsMessageTypesTestCase
}
/**
- * Test that clearing the body on a message results in the underlying body
- * section being set with the null object body, ensuring getObject returns null.
- */
+ * Test that clearing the body on a message results in the underlying body
+ * section being set with the null object body, ensuring getObject returns null.
+ *
+ * @throws Exception if an error occurs during the test.
+ */
@Test
public void testClearBodyWithExistingSerializedBodySection() throws Exception {
Message protonMessage = Message.Factory.create();
@@ -194,9 +202,11 @@ public class AmqpJmsObjectMessageFacadeTest extends AmqpJmsMessageTypesTestCase
}
/**
- * Test that setting an object on a new message and later getting the value, returns an
- * equal but different object that does not pick up intermediate changes to the set object.
- */
+ * Test that setting an object on a new message and later getting the value, returns an
+ * equal but different object that does not pick up intermediate changes to the set object.
+ *
+ * @throws Exception if an error occurs during the test.
+ */
@Test
public void testSetThenGetObjectOnSerializedMessageReturnsSnapshot() throws Exception {
HashMap<String, String> origMap = new HashMap<String, String>();
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpMessageIdHelperTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpMessageIdHelperTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpMessageIdHelperTest.java
index ecb0eff..d9648a9 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpMessageIdHelperTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpMessageIdHelperTest.java
@@ -20,12 +20,16 @@
*/
package org.apache.qpid.jms.provider.amqp.message;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.UUID;
import org.apache.qpid.jms.exceptions.IdConversionException;
-import org.apache.qpid.jms.provider.amqp.message.AmqpMessageIdHelper;
import org.apache.qpid.jms.test.QpidJmsTestCase;
import org.apache.qpid.proton.amqp.Binary;
import org.apache.qpid.proton.amqp.UnsignedLong;
@@ -287,6 +291,8 @@ public class AmqpMessageIdHelperTest extends QpidJmsTestCase {
/**
* Test that {@link AmqpMessageIdHelper#toIdObject(String)} returns an
* UnsignedLong when given a string indicating an encoded AMQP ulong id.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testToIdObjectWithEncodedUlong() throws Exception {
@@ -301,6 +307,8 @@ public class AmqpMessageIdHelperTest extends QpidJmsTestCase {
/**
* Test that {@link AmqpMessageIdHelper#toIdObject(String)} returns a Binary
* when given a string indicating an encoded AMQP binary id, using upper case hex characters
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testToIdObjectWithEncodedBinaryUppercaseHexString() throws Exception {
@@ -317,6 +325,8 @@ public class AmqpMessageIdHelperTest extends QpidJmsTestCase {
/**
* Test that {@link AmqpMessageIdHelper#toIdObject(String)} returns null
* when given null.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testToIdObjectWithNull() throws Exception {
@@ -326,6 +336,8 @@ public class AmqpMessageIdHelperTest extends QpidJmsTestCase {
/**
* Test that {@link AmqpMessageIdHelper#toIdObject(String)} returns a Binary
* when given a string indicating an encoded AMQP binary id, using lower case hex characters.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testToIdObjectWithEncodedBinaryLowercaseHexString() throws Exception {
@@ -342,6 +354,8 @@ public class AmqpMessageIdHelperTest extends QpidJmsTestCase {
/**
* Test that {@link AmqpMessageIdHelper#toIdObject(String)} returns a UUID
* when given a string indicating an encoded AMQP uuid id.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testToIdObjectWithEncodedUuid() throws Exception {
@@ -356,6 +370,8 @@ public class AmqpMessageIdHelperTest extends QpidJmsTestCase {
/**
* Test that {@link AmqpMessageIdHelper#toIdObject(String)} returns a string
* when given a string without any type encoding prefix.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testToIdObjectWithStringContainingNoEncodingPrefix() throws Exception {
@@ -369,6 +385,8 @@ public class AmqpMessageIdHelperTest extends QpidJmsTestCase {
/**
* Test that {@link AmqpMessageIdHelper#toIdObject(String)} returns the remainder of the
* provided string after removing the {@link AmqpMessageIdHelper#AMQP_STRING_PREFIX} prefix.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testToIdObjectWithStringContainingStringEncodingPrefix() throws Exception {
@@ -385,6 +403,8 @@ public class AmqpMessageIdHelperTest extends QpidJmsTestCase {
* and then additionally the {@link AmqpMessageIdHelper#AMQP_UUID_PREFIX}, the
* {@link AmqpMessageIdHelper#toIdObject(String)} method returns the remainder of the provided string
* after removing the {@link AmqpMessageIdHelper#AMQP_STRING_PREFIX} prefix.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testToIdObjectWithStringContainingStringEncodingPrefixAndThenUuidPrefix() throws Exception {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/selector/SelectorParserTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/selector/SelectorParserTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/selector/SelectorParserTest.java
index 1fd2afc..3c7db87 100755
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/selector/SelectorParserTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/selector/SelectorParserTest.java
@@ -20,7 +20,6 @@ import java.util.HashMap;
import junit.framework.TestCase;
-import org.apache.qpid.jms.selector.SelectorParser;
import org.apache.qpid.jms.selector.filter.BooleanExpression;
import org.apache.qpid.jms.selector.filter.ComparisonExpression;
import org.apache.qpid.jms.selector.filter.Expression;
@@ -235,6 +234,8 @@ public class SelectorParserTest extends TestCase {
/**
* Test cases from Mats Henricson
+ *
+ * @throws Exception if an error occurs during the test.
*/
public void testMatsHenricsonUseCases() throws Exception {
MockMessage message = createMessage();
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/session/JmsQueueSessionTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/session/JmsQueueSessionTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/session/JmsQueueSessionTest.java
index de9998c..d7c5bfb 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/session/JmsQueueSessionTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/session/JmsQueueSessionTest.java
@@ -121,6 +121,8 @@ public class JmsQueueSessionTest extends JmsConnectionTestSupport {
* (see JMS 1.1 specs, table 4-1).
*
* @since JMS 1.1
+ *
+ * @throws JMSException if an error occurs during the test.
*/
@Test(timeout = 30000, expected=IllegalStateException.class)
public void testCreateDurableSubscriberOnQueueSession() throws JMSException {
@@ -139,6 +141,8 @@ public class JmsQueueSessionTest extends JmsConnectionTestSupport {
* (see JMS 1.1 specs, table 4-1).
*
* @since JMS 1.1
+ *
+ * @throws JMSException if an error occurs during the test.
*/
@Test(timeout = 30000, expected=IllegalStateException.class)
public void testCreateTemporaryTopicOnQueueSession() throws JMSException {
@@ -152,6 +156,8 @@ public class JmsQueueSessionTest extends JmsConnectionTestSupport {
* (see JMS 1.1 specs, table 4-1).
*
* @since JMS 1.1
+ *
+ * @throws JMSException if an error occurs during the test.
*/
@Test(timeout = 30000, expected=IllegalStateException.class)
public void testCreateTopicOnQueueSession() throws JMSException {
@@ -165,6 +171,8 @@ public class JmsQueueSessionTest extends JmsConnectionTestSupport {
* (see JMS 1.1 specs, table 4-1).
*
* @since JMS 1.1
+ *
+ * @throws JMSException if an error occurs during the test.
*/
@Test(timeout = 30000, expected=IllegalStateException.class)
public void testUnsubscribeOnQueueSession() throws JMSException {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/session/JmsTopicSessionTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/session/JmsTopicSessionTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/session/JmsTopicSessionTest.java
index 11940e4..2ace0e9 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/session/JmsTopicSessionTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/session/JmsTopicSessionTest.java
@@ -57,6 +57,8 @@ public class JmsTopicSessionTest extends JmsConnectionTestSupport {
* (see JMS 1.1 specs, table 4-1).
*
* @since JMS 1.1
+ *
+ * @throws JMSException if an error occurs during the test.
*/
@Test(timeout = 30000, expected=IllegalStateException.class)
public void testCreateBrowserOnTopicSession() throws JMSException {
@@ -115,6 +117,8 @@ public class JmsTopicSessionTest extends JmsConnectionTestSupport {
* (see JMS 1.1 specs, table 4-1).
*
* @since JMS 1.1
+ *
+ * @throws JMSException if an error occurs during the test.
*/
@Test(timeout = 30000, expected=IllegalStateException.class)
public void testCreateQueueOnTopicSession() throws JMSException {
@@ -128,6 +132,8 @@ public class JmsTopicSessionTest extends JmsConnectionTestSupport {
* (see JMS 1.1 specs, table 4-1).
*
* @since JMS 1.1
+ *
+ * @throws JMSException if an error occurs during the test.
*/
@Test(timeout = 30000, expected=IllegalStateException.class)
public void testCreateTemporaryQueueOnTopicSession() throws JMSException {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
index 45c840c..40bab4e 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
@@ -548,6 +548,9 @@ public class TestAmqpPeer implements AutoCloseable
* Expect a connection that does not use a SASL layer, but proceeds straight
* to the AMQP connection (useful to skip a stage for connections that don't
* require SASL, e.g. because of anonymous or client certificate authentication).
+ *
+ * @param maxFrameSizeMatcher
+ * The Matcher used to validate the maxFrameSize setting.
*/
public void expectSaslLayerDisabledConnect(Matcher<?> maxFrameSizeMatcher)
{
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/sections/AbstractMessageSectionMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/sections/AbstractMessageSectionMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/sections/AbstractMessageSectionMatcher.java
index 133a452..42161f7 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/sections/AbstractMessageSectionMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/sections/AbstractMessageSectionMatcher.java
@@ -66,7 +66,11 @@ public abstract class AbstractMessageSectionMatcher
}
/**
+ * @param receivedBinary
+ * The received Binary value that should be validated.
+ *
* @return the number of bytes consumed from the provided Binary
+ *
* @throws RuntimeException if the provided Binary does not match expectation in some way
*/
public int verify(Binary receivedBinary) throws RuntimeException
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-discovery/src/main/java/org/apache/qpid/jms/provider/discovery/DiscoveryProvider.java
----------------------------------------------------------------------
diff --git a/qpid-jms-discovery/src/main/java/org/apache/qpid/jms/provider/discovery/DiscoveryProvider.java b/qpid-jms-discovery/src/main/java/org/apache/qpid/jms/provider/discovery/DiscoveryProvider.java
index d0f678a..c6b6ba9 100644
--- a/qpid-jms-discovery/src/main/java/org/apache/qpid/jms/provider/discovery/DiscoveryProvider.java
+++ b/qpid-jms-discovery/src/main/java/org/apache/qpid/jms/provider/discovery/DiscoveryProvider.java
@@ -52,7 +52,9 @@ public class DiscoveryProvider extends ProviderWrapper<FailoverProvider> impleme
* connections to the discovered peers.
*
* @param discoveryUri
+ * The URI that configures the discovery provider.
* @param next
+ * The FailoverProvider that will be used to manage connections.
*/
public DiscoveryProvider(URI discoveryUri, FailoverProvider next) {
super(next);
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsAutoAckTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsAutoAckTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsAutoAckTest.java
index a82edb0..480f02b 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsAutoAckTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsAutoAckTest.java
@@ -38,9 +38,6 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- *
- */
public class JmsAutoAckTest extends AmqpTestSupport {
protected static final Logger LOG = LoggerFactory.getLogger(JmsAutoAckTest.class);
@@ -113,7 +110,7 @@ public class JmsAutoAckTest extends AmqpTestSupport {
* message and expect to see it again, ensure the third message is not seen
* until after this.
*
- * @throws Exception
+ * @throws Exception on error during test.
*/
@Test(timeout = 60000)
public void testRecoverInOnMessage() throws Exception {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java
index 58b29dd..3b16306 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java
@@ -449,7 +449,7 @@ public class JmsClientAckTest extends AmqpTestSupport {
* message and expect to see both again, ensure the third message is not seen
* until after this.
*
- * @throws Exception
+ * @throws Exception on error during test
*/
@Test(timeout = 60000)
public void testRecoverInOnMessage() throws Exception {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsDupsOkTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsDupsOkTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsDupsOkTest.java
index 6c38a20..b5fbe83 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsDupsOkTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsDupsOkTest.java
@@ -35,9 +35,6 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- *
- */
public class JmsDupsOkTest extends AmqpTestSupport {
protected static final Logger LOG = LoggerFactory.getLogger(JmsDupsOkTest.class);
@@ -52,7 +49,7 @@ public class JmsDupsOkTest extends AmqpTestSupport {
* message and expect to see it again, ensure the third message is not seen
* until after this.
*
- * @throws Exception
+ * @throws Exception on error during test.
*/
@Test(timeout = 60000)
public void testRecoverInOnMessage() throws Exception {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerTest.java
index 06d9307..257c113 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerTest.java
@@ -178,7 +178,7 @@ public class JmsMessageConsumerTest extends AmqpTestSupport {
* want to test the short poll and retry case here since that's not what we are
* testing.
*
- * @throws Exception
+ * @throws Exception on error found during test run.
*/
@Test(timeout=60000)
public void testConsumerReceiveBeforeMessageDispatched() throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/3] qpid-jms git commit: NO-JIRA Fix and update javadocs
Posted by ta...@apache.org.
NO-JIRA Fix and update javadocs
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/197d1227
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/197d1227
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/197d1227
Branch: refs/heads/master
Commit: 197d1227320270acb8b9786d86c914bcdce9b2e9
Parents: 7bdd536
Author: Timothy Bish <ta...@gmail.com>
Authored: Thu Oct 8 12:52:29 2015 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Thu Oct 8 12:52:29 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/qpid/jms/JmsConnection.java | 91 +------------------
.../apache/qpid/jms/JmsConnectionFactory.java | 41 +--------
.../qpid/jms/JmsDurableTopicSubscriber.java | 11 ---
.../org/apache/qpid/jms/JmsMessageConsumer.java | 37 +-------
.../org/apache/qpid/jms/JmsMessageProducer.java | 96 +-------------------
.../org/apache/qpid/jms/JmsQueueReceiver.java | 2 -
.../org/apache/qpid/jms/JmsQueueSender.java | 18 ----
.../org/apache/qpid/jms/JmsQueueSession.java | 58 ++----------
.../java/org/apache/qpid/jms/JmsSession.java | 93 +++----------------
.../org/apache/qpid/jms/JmsTopicPublisher.java | 24 -----
.../org/apache/qpid/jms/JmsTopicSession.java | 46 +---------
.../org/apache/qpid/jms/JmsTopicSubscriber.java | 26 +-----
.../apache/qpid/jms/JmsTransactionContext.java | 9 ++
.../qpid/jms/jndi/JNDIReferenceFactory.java | 17 +++-
.../org/apache/qpid/jms/jndi/JNDIStorable.java | 7 +-
.../org/apache/qpid/jms/message/JmsMessage.java | 3 +-
.../jms/message/JmsMessageTransformation.java | 15 +--
.../jms/message/facade/JmsMapMessageFacade.java | 3 +
.../jms/message/facade/JmsMessageFacade.java | 7 ++
.../org/apache/qpid/jms/provider/Provider.java | 3 +-
.../provider/ProviderRedirectedException.java | 3 -
.../qpid/jms/provider/ProviderWrapper.java | 2 +
.../qpid/jms/provider/WrappedAsyncResult.java | 3 +
.../jms/provider/amqp/AmqpAbstractResource.java | 3 +
.../qpid/jms/provider/amqp/AmqpConsumer.java | 6 ++
.../provider/amqp/AmqpSaslAuthenticator.java | 6 +-
.../amqp/builders/AmqpResourceBuilder.java | 5 +
.../amqp/message/AmqpDestinationHelper.java | 12 +++
.../amqp/message/AmqpJmsMessageFacade.java | 5 +-
.../AmqpJmsMessagePropertyIntercepter.java | 3 +
.../jms/provider/failover/FailoverProvider.java | 3 -
.../qpid/jms/transports/TransportSupport.java | 2 +
.../org/apache/qpid/jms/util/FactoryFinder.java | 4 +
.../org/apache/qpid/jms/util/IdGenerator.java | 12 ++-
.../apache/qpid/jms/util/InetAddressUtil.java | 4 +-
.../java/org/apache/qpid/jms/util/LRUCache.java | 12 ++-
.../org/apache/qpid/jms/util/MessageQueue.java | 3 +
.../org/apache/qpid/jms/util/PropertyUtil.java | 10 +-
.../apache/qpid/jms/util/ThreadPoolUtils.java | 8 ++
.../org/apache/qpid/jms/util/URISupport.java | 15 ++-
.../qpid/jms/JmsConnectionFactoryTest.java | 6 ++
.../apache/qpid/jms/JmsQueueConnectionTest.java | 4 +-
.../BytesMessageIntegrationTest.java | 4 +
.../integration/ConsumerIntegrationTest.java | 6 ++
.../ForeignMessageIntegrationTest.java | 4 +-
.../integration/MapMessageIntegrationTest.java | 2 +
.../jms/integration/MessageIntegrationTest.java | 86 ++++++++++++++++++
.../integration/ProducerIntegrationTest.java | 14 +++
.../jms/integration/SaslIntegrationTest.java | 2 +
.../StreamMessageIntegrationTest.java | 2 +
.../qpid/jms/message/JmsBytesMessageTest.java | 28 ++++++
.../qpid/jms/message/JmsMapMessageTest.java | 60 ++++++++++++
.../apache/qpid/jms/message/JmsMessageTest.java | 28 ++++++
.../qpid/jms/message/JmsObjectMessageTest.java | 23 +++--
.../qpid/jms/message/JmsStreamMessageTest.java | 51 ++++++++++-
.../message/AmqpJmsBytesMessageFacadeTest.java | 6 ++
.../amqp/message/AmqpJmsMessageBuilderTest.java | 46 ++++++++++
.../amqp/message/AmqpJmsMessageFacadeTest.java | 14 +++
.../message/AmqpJmsObjectMessageFacadeTest.java | 28 ++++--
.../amqp/message/AmqpMessageIdHelperTest.java | 24 ++++-
.../qpid/jms/selector/SelectorParserTest.java | 3 +-
.../qpid/jms/session/JmsQueueSessionTest.java | 8 ++
.../qpid/jms/session/JmsTopicSessionTest.java | 6 ++
.../qpid/jms/test/testpeer/TestAmqpPeer.java | 3 +
.../sections/AbstractMessageSectionMatcher.java | 4 +
.../provider/discovery/DiscoveryProvider.java | 2 +
.../qpid/jms/consumer/JmsAutoAckTest.java | 5 +-
.../qpid/jms/consumer/JmsClientAckTest.java | 2 +-
.../apache/qpid/jms/consumer/JmsDupsOkTest.java | 5 +-
.../jms/consumer/JmsMessageConsumerTest.java | 2 +-
70 files changed, 623 insertions(+), 583 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
index ac02544..5e83302 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
@@ -141,10 +141,6 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
this.connectionInfo = new JmsConnectionInfo(new JmsConnectionId(connectionId));
}
- /**
- * @throws JMSException
- * @see javax.jms.Connection#close()
- */
@Override
public void close() throws JMSException {
boolean interrupted = Thread.interrupted();
@@ -244,13 +240,6 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
connected.set(false);
}
- /**
- * @param transacted
- * @param acknowledgeMode
- * @return Session
- * @throws JMSException
- * @see javax.jms.Connection#createSession(boolean, int)
- */
@Override
public Session createSession(boolean transacted, int acknowledgeMode) throws JMSException {
checkClosedOrFailed();
@@ -264,31 +253,18 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
return result;
}
- /**
- * @return clientId
- * @see javax.jms.Connection#getClientID()
- */
@Override
public synchronized String getClientID() throws JMSException {
checkClosedOrFailed();
return this.connectionInfo.getClientId();
}
- /**
- * @return connectionInfoData
- * @see javax.jms.Connection#getMetaData()
- */
@Override
public ConnectionMetaData getMetaData() throws JMSException {
checkClosedOrFailed();
return JmsConnectionMetaData.INSTANCE;
}
- /**
- * @param clientID
- * @throws JMSException
- * @see javax.jms.Connection#setClientID(java.lang.String)
- */
@Override
public synchronized void setClientID(String clientID) throws JMSException {
checkClosedOrFailed();
@@ -311,10 +287,6 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
connect();
}
- /**
- * @throws JMSException
- * @see javax.jms.Connection#start()
- */
@Override
public void start() throws JMSException {
checkClosedOrFailed();
@@ -330,16 +302,15 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
}
}
- /**
- * @throws JMSException
- * @see javax.jms.Connection#stop()
- */
@Override
public void stop() throws JMSException {
doStop(true);
}
/**
+ * Performs the actual connection stop with the option to disable the close check in cases
+ * where we don't want an exception.
+ *
* @see #stop()
* @param checkClosed <tt>true</tt> to check for already closed and throw
* {@link java.lang.IllegalStateException} if already closed,
@@ -359,18 +330,6 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
}
}
- /**
- * @param topic
- * @param subscriptionName
- * @param messageSelector
- * @param sessionPool
- * @param maxMessages
- * @return ConnectionConsumer
- * @throws JMSException
- *
- * @see javax.jms.Connection#createDurableConnectionConsumer(javax.jms.Topic,
- * java.lang.String, java.lang.String, javax.jms.ServerSessionPool, int)
- */
@Override
public ConnectionConsumer createDurableConnectionConsumer(Topic topic, String subscriptionName,
String messageSelector, ServerSessionPool sessionPool, int maxMessages) throws JMSException {
@@ -379,16 +338,6 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
throw new JMSException("Not supported");
}
- /**
- * @param destination
- * @param messageSelector
- * @param sessionPool
- * @param maxMessages
- * @return ConnectionConsumer
- * @throws JMSException
- * @see javax.jms.Connection#createConnectionConsumer(javax.jms.Destination,
- * java.lang.String, javax.jms.ServerSessionPool, int)
- */
@Override
public ConnectionConsumer createConnectionConsumer(Destination destination, String messageSelector,
ServerSessionPool sessionPool, int maxMessages) throws JMSException {
@@ -397,16 +346,6 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
throw new JMSException("Not supported");
}
- /**
- * @param topic
- * @param messageSelector
- * @param sessionPool
- * @param maxMessages
- * @return ConnectionConsumer
- * @throws JMSException
- * @see javax.jms.TopicConnection#createConnectionConsumer(javax.jms.Topic,
- * java.lang.String, javax.jms.ServerSessionPool, int)
- */
@Override
public ConnectionConsumer createConnectionConsumer(Topic topic, String messageSelector,
ServerSessionPool sessionPool, int maxMessages) throws JMSException {
@@ -415,16 +354,6 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
throw new JMSException("Not supported");
}
- /**
- * @param queue
- * @param messageSelector
- * @param sessionPool
- * @param maxMessages
- * @return ConnectionConsumer
- * @throws JMSException
- * @see javax.jms.QueueConnection#createConnectionConsumer(javax.jms.Queue,
- * java.lang.String, javax.jms.ServerSessionPool, int)
- */
@Override
public ConnectionConsumer createConnectionConsumer(Queue queue, String messageSelector,
ServerSessionPool sessionPool, int maxMessages) throws JMSException {
@@ -433,13 +362,6 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
throw new JMSException("Not supported");
}
- /**
- * @param transacted
- * @param acknowledgeMode
- * @return TopicSession
- * @throws JMSException
- * @see javax.jms.TopicConnection#createTopicSession(boolean, int)
- */
@Override
public TopicSession createTopicSession(boolean transacted, int acknowledgeMode) throws JMSException {
checkClosedOrFailed();
@@ -453,13 +375,6 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
return result;
}
- /**
- * @param transacted
- * @param acknowledgeMode
- * @return QueueSession
- * @throws JMSException
- * @see javax.jms.QueueConnection#createQueueSession(boolean, int)
- */
@Override
public QueueSession createQueueSession(boolean transacted, int acknowledgeMode) throws JMSException {
checkClosedOrFailed();
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java
index 2067e17..3b90b18 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java
@@ -132,24 +132,11 @@ public class JmsConnectionFactory extends JNDIStorable implements ConnectionFact
}
}
- /**
- * @return a TopicConnection
- * @throws JMSException
- * @see javax.jms.TopicConnectionFactory#createTopicConnection()
- */
@Override
public TopicConnection createTopicConnection() throws JMSException {
return createTopicConnection(getUsername(), getPassword());
}
- /**
- * @param username
- * @param password
- * @return a TopicConnection
- * @throws JMSException
- * @see javax.jms.TopicConnectionFactory#createTopicConnection(java.lang.String,
- * java.lang.String)
- */
@Override
public TopicConnection createTopicConnection(String username, String password) throws JMSException {
try {
@@ -162,23 +149,11 @@ public class JmsConnectionFactory extends JNDIStorable implements ConnectionFact
}
}
- /**
- * @return a Connection
- * @throws JMSException
- * @see javax.jms.ConnectionFactory#createConnection()
- */
@Override
public Connection createConnection() throws JMSException {
return createConnection(getUsername(), getPassword());
}
- /**
- * @param username
- * @param password
- * @return Connection
- * @throws JMSException
- * @see javax.jms.ConnectionFactory#createConnection(java.lang.String, java.lang.String)
- */
@Override
public Connection createConnection(String username, String password) throws JMSException {
try {
@@ -191,24 +166,11 @@ public class JmsConnectionFactory extends JNDIStorable implements ConnectionFact
}
}
- /**
- * @return a QueueConnection
- * @throws JMSException
- * @see javax.jms.QueueConnectionFactory#createQueueConnection()
- */
@Override
public QueueConnection createQueueConnection() throws JMSException {
return createQueueConnection(getUsername(), getPassword());
}
- /**
- * @param username
- * @param password
- * @return a QueueConnection
- * @throws JMSException
- * @see javax.jms.QueueConnectionFactory#createQueueConnection(java.lang.String,
- * java.lang.String)
- */
@Override
public QueueConnection createQueueConnection(String username, String password) throws JMSException {
try {
@@ -574,6 +536,9 @@ public class JmsConnectionFactory extends JNDIStorable implements ConnectionFact
* It is possible to set the clientID on the Connection itself immediately after
* creation if no value has been set via the factory that created it, which will
* allow the factory to create multiple open connections at a time.
+ *
+ * @param clientID
+ * The clientID to assign when creating a new connection.
*/
public void setClientID(String clientID) {
this.clientID = clientID;
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsDurableTopicSubscriber.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsDurableTopicSubscriber.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsDurableTopicSubscriber.java
index b7ae1b9..3a45736 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsDurableTopicSubscriber.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsDurableTopicSubscriber.java
@@ -25,17 +25,6 @@ import org.apache.qpid.jms.meta.JmsConsumerId;
*/
public class JmsDurableTopicSubscriber extends JmsTopicSubscriber {
- /**
- * Creates a durable TopicSubscriber
- *
- * @param id
- * @param s
- * @param destination
- * @param name
- * @param noLocal
- * @param selector
- * @throws JMSException
- */
public JmsDurableTopicSubscriber(JmsConsumerId id, JmsSession s, JmsDestination destination, String name, boolean noLocal, String selector) throws JMSException {
super(id, s, destination, name, noLocal, selector);
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java
index 80ae995..e90c6c8 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java
@@ -139,10 +139,6 @@ public class JmsMessageConsumer implements MessageConsumer, JmsMessageAvailableC
}
}
- /**
- * @throws JMSException
- * @see javax.jms.MessageConsumer#close()
- */
@Override
public void close() throws JMSException {
if (!closed.get()) {
@@ -187,7 +183,7 @@ public class JmsMessageConsumer implements MessageConsumer, JmsMessageAvailableC
* to be sent to the remote peer. This is most commonly needed when the parent
* Session is closing.
*
- * @throws JMSException
+ * @throws JMSException if an error occurs during shutdown.
*/
protected void shutdown() throws JMSException {
shutdown(null);
@@ -201,22 +197,11 @@ public class JmsMessageConsumer implements MessageConsumer, JmsMessageAvailableC
}
}
- /**
- * @return a Message or null if closed during the operation
- * @throws JMSException
- * @see javax.jms.MessageConsumer#receive()
- */
@Override
public Message receive() throws JMSException {
return receive(0);
}
- /**
- * @param timeout
- * @return a Message or null
- * @throws JMSException
- * @see javax.jms.MessageConsumer#receive(long)
- */
@Override
public Message receive(long timeout) throws JMSException {
checkClosed();
@@ -230,11 +215,6 @@ public class JmsMessageConsumer implements MessageConsumer, JmsMessageAvailableC
return copy(ackFromReceive(dequeue(timeout, connection.isReceiveLocalOnly())));
}
- /**
- * @return a Message or null
- * @throws JMSException
- * @see javax.jms.MessageConsumer#receiveNoWait()
- */
@Override
public Message receiveNoWait() throws JMSException {
checkClosed();
@@ -253,10 +233,13 @@ public class JmsMessageConsumer implements MessageConsumer, JmsMessageAvailableC
*
* This method may consume messages that are expired or exceed a configured
* delivery count value but will continue to wait for the configured timeout.
+ *
* @param localCheckOnly
* if false, try pulling a message if a >= 0 timeout expires with no message arriving
- * @throws JMSException
+ *
* @return null if we timeout or if the consumer is closed concurrently.
+ *
+ * @throws JMSException if an error occurs during the dequeue.
*/
private JmsInboundMessageDispatch dequeue(long timeout, boolean localCheckOnly) throws JMSException {
boolean pullConsumer = isPullConsumer();
@@ -577,11 +560,6 @@ public class JmsMessageConsumer implements MessageConsumer, JmsMessageAvailableC
return this.messageListener;
}
- /**
- * @param listener
- * @throws JMSException
- * @see javax.jms.MessageConsumer#setMessageListener(javax.jms.MessageListener)
- */
@Override
public void setMessageListener(MessageListener listener) throws JMSException {
checkClosed();
@@ -593,11 +571,6 @@ public class JmsMessageConsumer implements MessageConsumer, JmsMessageAvailableC
drainMessageQueueToListener();
}
- /**
- * @return the Message Selector
- * @throws JMSException
- * @see javax.jms.MessageConsumer#getMessageSelector()
- */
@Override
public String getMessageSelector() throws JMSException {
checkClosed();
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageProducer.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageProducer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageProducer.java
index 71752f1..a830760 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageProducer.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageProducer.java
@@ -60,13 +60,6 @@ public class JmsMessageProducer implements MessageProducer {
session.getConnection().createResource(producerInfo);
}
- /**
- * Close the producer
- *
- * @throws JMSException
- *
- * @see javax.jms.MessageProducer#close()
- */
@Override
public void close() throws JMSException {
if (!closed.get()) {
@@ -78,7 +71,7 @@ public class JmsMessageProducer implements MessageProducer {
* Called to initiate shutdown of Producer resources and request that the remote
* peer remove the registered producer.
*
- * @throws JMSException
+ * @throws JMSException if an internal error occurs during the close operation.
*/
protected void doClose() throws JMSException {
shutdown();
@@ -90,7 +83,7 @@ public class JmsMessageProducer implements MessageProducer {
* to be sent to the remote peer. This is most commonly needed when the parent
* Session is closing.
*
- * @throws JMSException
+ * @throws JMSException if an internal error occurs during the shutdown operation.
*/
protected void shutdown() throws JMSException {
shutdown(null);
@@ -103,90 +96,47 @@ public class JmsMessageProducer implements MessageProducer {
}
}
- /**
- * @return the delivery mode
- * @throws JMSException
- * @see javax.jms.MessageProducer#getDeliveryMode()
- */
@Override
public int getDeliveryMode() throws JMSException {
checkClosed();
return this.deliveryMode;
}
- /**
- * @return the destination
- * @throws JMSException
- * @see javax.jms.MessageProducer#getDestination()
- */
@Override
public Destination getDestination() throws JMSException {
checkClosed();
return this.producerInfo.getDestination();
}
- /**
- * @return true if disableIds is set
- * @throws JMSException
- * @see javax.jms.MessageProducer#getDisableMessageID()
- */
@Override
public boolean getDisableMessageID() throws JMSException {
checkClosed();
return this.disableMessageId;
}
- /**
- * @return true if disable timestamp is set
- * @throws JMSException
- * @see javax.jms.MessageProducer#getDisableMessageTimestamp()
- */
@Override
public boolean getDisableMessageTimestamp() throws JMSException {
checkClosed();
return this.disableTimestamp;
}
- /**
- * @return the priority
- * @throws JMSException
- * @see javax.jms.MessageProducer#getPriority()
- */
@Override
public int getPriority() throws JMSException {
checkClosed();
return this.priority;
}
- /**
- * @return timeToLive
- * @throws JMSException
- * @see javax.jms.MessageProducer#getTimeToLive()
- */
@Override
public long getTimeToLive() throws JMSException {
checkClosed();
return this.timeToLive;
}
- /**
- * @param message
- * @throws JMSException
- * @see javax.jms.MessageProducer#send(javax.jms.Message)
- */
@Override
public void send(Message message) throws JMSException {
send(message, this.deliveryMode, this.priority, this.timeToLive);
}
- /**
- * @param message
- * @param deliveryMode
- * @param priority
- * @param timeToLive
- * @throws JMSException
- * @see javax.jms.MessageProducer#send(javax.jms.Message, int, int, long)
- */
@Override
public void send(Message message, int deliveryMode, int priority, long timeToLive) throws JMSException {
checkClosed();
@@ -198,28 +148,11 @@ public class JmsMessageProducer implements MessageProducer {
sendMessage(producerInfo.getDestination(), message, deliveryMode, priority, timeToLive);
}
- /**
- * @param destination
- * @param message
- * @throws JMSException
- * @see javax.jms.MessageProducer#send(javax.jms.Destination,
- * javax.jms.Message)
- */
@Override
public void send(Destination destination, Message message) throws JMSException {
send(destination, message, this.deliveryMode, this.priority, this.timeToLive);
}
- /**
- * @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)
- */
@Override
public void send(Destination destination, Message message, int deliveryMode, int priority, long timeToLive) throws JMSException {
checkClosed();
@@ -239,55 +172,30 @@ public class JmsMessageProducer implements MessageProducer {
this.session.send(this, destination, message, deliveryMode, priority, timeToLive, disableMessageId, disableTimestamp);
}
- /**
- * @param deliveryMode
- * @throws JMSException
- * @see javax.jms.MessageProducer#setDeliveryMode(int)
- */
@Override
public void setDeliveryMode(int deliveryMode) throws JMSException {
checkClosed();
this.deliveryMode = deliveryMode;
}
- /**
- * @param value
- * @throws JMSException
- * @see javax.jms.MessageProducer#setDisableMessageID(boolean)
- */
@Override
public void setDisableMessageID(boolean value) throws JMSException {
checkClosed();
this.disableMessageId = value;
}
- /**
- * @param value
- * @throws JMSException
- * @see javax.jms.MessageProducer#setDisableMessageTimestamp(boolean)
- */
@Override
public void setDisableMessageTimestamp(boolean value) throws JMSException {
checkClosed();
this.disableTimestamp = value;
}
- /**
- * @param defaultPriority
- * @throws JMSException
- * @see javax.jms.MessageProducer#setPriority(int)
- */
@Override
public void setPriority(int defaultPriority) throws JMSException {
checkClosed();
this.priority = defaultPriority;
}
- /**
- * @param timeToLive
- * @throws JMSException
- * @see javax.jms.MessageProducer#setTimeToLive(long)
- */
@Override
public void setTimeToLive(long timeToLive) throws JMSException {
checkClosed();
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueReceiver.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueReceiver.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueReceiver.java
index aa1da65..59c0b0b 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueReceiver.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueReceiver.java
@@ -47,8 +47,6 @@ public class JmsQueueReceiver extends JmsMessageConsumer implements QueueReceive
}
/**
- * @return the Queue
- * @throws IllegalStateException
* @see javax.jms.QueueReceiver#getQueue()
*/
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueSender.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueSender.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueSender.java
index c2276c8..11b65f0 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueSender.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueSender.java
@@ -29,20 +29,11 @@ import org.apache.qpid.jms.meta.JmsProducerId;
*/
public class JmsQueueSender extends JmsMessageProducer implements QueueSender {
- /**
- * Constructor
- *
- * @param id
- * @param session
- * @param destination
- */
protected JmsQueueSender(JmsProducerId id, JmsSession session, JmsDestination destination) throws JMSException {
super(id, session, destination);
}
/**
- * @return the Queue
- * @throws IllegalStateException
* @see javax.jms.QueueSender#getQueue()
*/
@Override
@@ -52,9 +43,6 @@ public class JmsQueueSender extends JmsMessageProducer implements QueueSender {
}
/**
- * @param queue
- * @param message
- * @throws JMSException
* @see javax.jms.QueueSender#send(javax.jms.Queue, javax.jms.Message)
*/
@Override
@@ -63,12 +51,6 @@ public class JmsQueueSender extends JmsMessageProducer implements QueueSender {
}
/**
- * @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)
*/
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueSession.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueSession.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueSession.java
index ed7ad1d..c7063a1 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueSession.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueSession.java
@@ -37,6 +37,9 @@ public class JmsQueueSession extends JmsSession {
super(connection, sessionId, acknowledgementMode);
}
+ /**
+ * @see javax.jms.Session#createConsumer(javax.jms.Destination)
+ */
@Override
public MessageConsumer createConsumer(Destination destination) throws JMSException {
if (destination instanceof Topic) {
@@ -46,12 +49,7 @@ public class JmsQueueSession extends JmsSession {
}
/**
- * @param destination
- * @param messageSelector
- * @return the MessageConsumer
- * @throws JMSException
- * @see javax.jms.Session#createConsumer(javax.jms.Destination,
- * java.lang.String)
+ * @see javax.jms.Session#createConsumer(javax.jms.Destination, java.lang.String)
*/
@Override
public MessageConsumer createConsumer(Destination destination, String messageSelector) throws JMSException {
@@ -62,13 +60,7 @@ public class JmsQueueSession extends JmsSession {
}
/**
- * @param destination
- * @param messageSelector
- * @param noLocal
- * @return the MessageConsumer
- * @throws JMSException
- * @see javax.jms.Session#createConsumer(javax.jms.Destination,
- * java.lang.String, boolean)
+ * @see javax.jms.Session#createConsumer(javax.jms.Destination, java.lang.String, boolean)
*/
@Override
public MessageConsumer createConsumer(Destination destination, String messageSelector, boolean noLocal) throws JMSException {
@@ -79,12 +71,7 @@ public class JmsQueueSession extends JmsSession {
}
/**
- * @param topic
- * @param name
- * @return the durable TopicSubscriber
- * @throws JMSException
- * @see javax.jms.Session#createDurableSubscriber(javax.jms.Topic,
- * java.lang.String)
+ * @see javax.jms.Session#createDurableSubscriber(javax.jms.Topic, java.lang.String)
*/
@Override
public TopicSubscriber createDurableSubscriber(Topic topic, String name) throws JMSException {
@@ -92,14 +79,7 @@ public class JmsQueueSession extends JmsSession {
}
/**
- * @param topic
- * @param name
- * @param messageSelector
- * @param noLocal
- * @return the durable TopicSubscriber
- * @throws JMSException
- * @see javax.jms.Session#createDurableSubscriber(javax.jms.Topic,
- * java.lang.String, java.lang.String, boolean)
+ * @see javax.jms.Session#createDurableSubscriber(javax.jms.Topic, java.lang.String, java.lang.String, boolean)
*/
@Override
public TopicSubscriber createDurableSubscriber(Topic topic, String name, String messageSelector, boolean noLocal) throws JMSException {
@@ -107,9 +87,6 @@ public class JmsQueueSession extends JmsSession {
}
/**
- * @param destination
- * @return the MessageProducer
- * @throws JMSException
* @see javax.jms.Session#createProducer(javax.jms.Destination)
*/
@Override
@@ -121,8 +98,6 @@ public class JmsQueueSession extends JmsSession {
}
/**
- * @return the TemporaryTopic object
- * @throws JMSException
* @see javax.jms.Session#createTemporaryTopic()
*/
@Override
@@ -131,9 +106,6 @@ public class JmsQueueSession extends JmsSession {
}
/**
- * @param topicName
- * @return the Topic object
- * @throws JMSException
* @see javax.jms.Session#createTopic(java.lang.String)
*/
@Override
@@ -142,8 +114,6 @@ public class JmsQueueSession extends JmsSession {
}
/**
- * @param name
- * @throws JMSException
* @see javax.jms.Session#unsubscribe(java.lang.String)
*/
@Override
@@ -152,9 +122,6 @@ public class JmsQueueSession extends JmsSession {
}
/**
- * @param topic
- * @return the TopicPublisher
- * @throws JMSException
* @see javax.jms.TopicSession#createPublisher(javax.jms.Topic)
*/
@Override
@@ -163,9 +130,6 @@ public class JmsQueueSession extends JmsSession {
}
/**
- * @param topic
- * @return the TopicSubscriber
- * @throws JMSException
* @see javax.jms.TopicSession#createSubscriber(javax.jms.Topic)
*/
@Override
@@ -174,13 +138,7 @@ public class JmsQueueSession extends JmsSession {
}
/**
- * @param topic
- * @param messageSelector
- * @param noLocal
- * @return the TopicSubscriber
- * @throws JMSException
- * @see javax.jms.TopicSession#createSubscriber(javax.jms.Topic,
- * java.lang.String, boolean)
+ * @see javax.jms.TopicSession#createSubscriber(javax.jms.Topic, java.lang.String, boolean)
*/
@Override
public TopicSubscriber createSubscriber(Topic topic, String messageSelector, boolean noLocal) throws JMSException {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java
index a6765a0..fd35190 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java
@@ -221,7 +221,7 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
* Shutdown the Session and release all resources. Once completed the Session can
* request that the Provider destroy the Session and it's child resources.
*
- * @throws JMSException
+ * @throws JMSException if an internal error occurs during the close operation.
*/
protected void doClose() throws JMSException {
boolean interrupted = Thread.interrupted();
@@ -306,9 +306,6 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
//////////////////////////////////////////////////////////////////////////
/**
- * @param destination
- * @return a MessageConsumer
- * @throws JMSException
* @see javax.jms.Session#createConsumer(javax.jms.Destination)
*/
@Override
@@ -317,12 +314,7 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
}
/**
- * @param destination
- * @param messageSelector
- * @return MessageConsumer
- * @throws JMSException
- * @see javax.jms.Session#createConsumer(javax.jms.Destination,
- * java.lang.String)
+ * @see javax.jms.Session#createConsumer(javax.jms.Destination, java.lang.String)
*/
@Override
public MessageConsumer createConsumer(Destination destination, String messageSelector) throws JMSException {
@@ -330,13 +322,7 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
}
/**
- * @param destination
- * @param messageSelector
- * @param noLocal
- * @return the MessageConsumer
- * @throws JMSException
- * @see javax.jms.Session#createConsumer(javax.jms.Destination,
- * java.lang.String, boolean)
+ * @see javax.jms.Session#createConsumer(javax.jms.Destination, java.lang.String, boolean)
*/
@Override
public MessageConsumer createConsumer(Destination destination, String messageSelector, boolean noLocal) throws JMSException {
@@ -350,9 +336,6 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
}
/**
- * @param queue
- * @return QueueRecevier
- * @throws JMSException
* @see javax.jms.QueueSession#createReceiver(javax.jms.Queue)
*/
@Override
@@ -366,12 +349,7 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
}
/**
- * @param queue
- * @param messageSelector
- * @return QueueReceiver
- * @throws JMSException
- * @see javax.jms.QueueSession#createReceiver(javax.jms.Queue,
- * java.lang.String)
+ * @see javax.jms.QueueSession#createReceiver(javax.jms.Queue, java.lang.String)
*/
@Override
public QueueReceiver createReceiver(Queue queue, String messageSelector) throws JMSException {
@@ -385,9 +363,6 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
}
/**
- * @param destination
- * @return QueueBrowser
- * @throws JMSException
* @see javax.jms.Session#createBrowser(javax.jms.Queue)
*/
@Override
@@ -396,10 +371,6 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
}
/**
- * @param destination
- * @param messageSelector
- * @return QueueBrowser
- * @throws JMSException
* @see javax.jms.Session#createBrowser(javax.jms.Queue, java.lang.String)
*/
@Override
@@ -413,9 +384,6 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
}
/**
- * @param topic
- * @return TopicSubscriber
- * @throws JMSException
* @see javax.jms.TopicSession#createSubscriber(javax.jms.Topic)
*/
@Override
@@ -424,13 +392,7 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
}
/**
- * @param topic
- * @param messageSelector
- * @param noLocal
- * @return TopicSubscriber
- * @throws JMSException
- * @see javax.jms.TopicSession#createSubscriber(javax.jms.Topic,
- * java.lang.String, boolean)
+ * @see javax.jms.TopicSession#createSubscriber(javax.jms.Topic, java.lang.String, boolean)
*/
@Override
public TopicSubscriber createSubscriber(Topic topic, String messageSelector, boolean noLocal) throws JMSException {
@@ -444,12 +406,7 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
}
/**
- * @param topic
- * @param name
- * @return a TopicSubscriber
- * @throws JMSException
- * @see javax.jms.Session#createDurableSubscriber(javax.jms.Topic,
- * java.lang.String)
+ * @see javax.jms.Session#createDurableSubscriber(javax.jms.Topic, java.lang.String)
*/
@Override
public TopicSubscriber createDurableSubscriber(Topic topic, String name) throws JMSException {
@@ -457,14 +414,7 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
}
/**
- * @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)
+ * @see javax.jms.Session#createDurableSubscriber(javax.jms.Topic, java.lang.String, java.lang.String, boolean)
*/
@Override
public TopicSubscriber createDurableSubscriber(Topic topic, String name, String messageSelector, boolean noLocal) throws JMSException {
@@ -485,8 +435,6 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
}
/**
- * @param name
- * @throws JMSException
* @see javax.jms.Session#unsubscribe(java.lang.String)
*/
@Override
@@ -500,9 +448,6 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
//////////////////////////////////////////////////////////////////////////
/**
- * @param destination
- * @return MessageProducer
- * @throws JMSException
* @see javax.jms.Session#createProducer(javax.jms.Destination)
*/
@Override
@@ -515,9 +460,6 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
}
/**
- * @param queue
- * @return QueueSender
- * @throws JMSException
* @see javax.jms.QueueSession#createSender(javax.jms.Queue)
*/
@Override
@@ -530,9 +472,6 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
}
/**
- * @param topic
- * @return TopicPublisher
- * @throws JMSException
* @see javax.jms.TopicSession#createPublisher(javax.jms.Topic)
*/
@Override
@@ -601,9 +540,6 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
//////////////////////////////////////////////////////////////////////////
/**
- * @param queueName
- * @return Queue
- * @throws JMSException
* @see javax.jms.Session#createQueue(java.lang.String)
*/
@Override
@@ -613,9 +549,6 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
}
/**
- * @param topicName
- * @return Topic
- * @throws JMSException
* @see javax.jms.Session#createTopic(java.lang.String)
*/
@Override
@@ -625,8 +558,6 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
}
/**
- * @return TemporaryQueue
- * @throws JMSException
* @see javax.jms.Session#createTemporaryQueue()
*/
@Override
@@ -636,8 +567,6 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
}
/**
- * @return TemporaryTopic
- * @throws JMSException
* @see javax.jms.Session#createTemporaryTopic()
*/
@Override
@@ -779,7 +708,7 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
/**
* Checks whether the session uses transactions.
*
- * @return true - if the session uses transactions.
+ * @return true if the session uses transactions.
*/
public boolean isTransacted() {
return acknowledgementMode == Session.SESSION_TRANSACTED;
@@ -788,7 +717,7 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
/**
* Checks whether the session used client acknowledgment.
*
- * @return true - if the session uses client acknowledgment.
+ * @return true if the session uses client acknowledgment.
*/
public boolean isClientAcknowledge() {
return acknowledgementMode == Session.CLIENT_ACKNOWLEDGE;
@@ -797,7 +726,7 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
/**
* Checks whether the session used auto acknowledgment.
*
- * @return true - if the session uses client acknowledgment.
+ * @return true if the session uses client acknowledgment.
*/
public boolean isAutoAcknowledge() {
return acknowledgementMode == Session.AUTO_ACKNOWLEDGE;
@@ -806,7 +735,7 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
/**
* Checks whether the session used dup ok acknowledgment.
*
- * @return true - if the session uses client acknowledgment.
+ * @return true if the session uses client acknowledgment.
*/
public boolean isDupsOkAcknowledge() {
return acknowledgementMode == Session.DUPS_OK_ACKNOWLEDGE;
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsTopicPublisher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsTopicPublisher.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsTopicPublisher.java
index a68ff00..2aba406 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsTopicPublisher.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsTopicPublisher.java
@@ -29,19 +29,11 @@ import org.apache.qpid.jms.meta.JmsProducerId;
*/
public class JmsTopicPublisher extends JmsMessageProducer implements TopicPublisher {
- /**
- * Constructor
- *
- * @param session
- * @param destination
- */
protected JmsTopicPublisher(JmsProducerId id, JmsSession session, JmsDestination destination) throws JMSException {
super(id, session, destination);
}
/**
- * @return the Topic
- * @throws IllegalStateException
* @see javax.jms.TopicPublisher#getTopic()
*/
@Override
@@ -51,8 +43,6 @@ public class JmsTopicPublisher extends JmsMessageProducer implements TopicPublis
}
/**
- * @param message
- * @throws JMSException
* @see javax.jms.TopicPublisher#publish(javax.jms.Message)
*/
@Override
@@ -61,9 +51,6 @@ public class JmsTopicPublisher extends JmsMessageProducer implements TopicPublis
}
/**
- * @param topic
- * @param message
- * @throws JMSException
* @see javax.jms.TopicPublisher#publish(javax.jms.Topic, javax.jms.Message)
*/
@Override
@@ -72,11 +59,6 @@ public class JmsTopicPublisher extends JmsMessageProducer implements TopicPublis
}
/**
- * @param message
- * @param deliveryMode
- * @param priority
- * @param timeToLive
- * @throws JMSException
* @see javax.jms.TopicPublisher#publish(javax.jms.Message, int, int, long)
*/
@Override
@@ -85,12 +67,6 @@ public class JmsTopicPublisher extends JmsMessageProducer implements TopicPublis
}
/**
- * @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)
*/
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsTopicSession.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsTopicSession.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsTopicSession.java
index 7b90b2f..b9d3505 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsTopicSession.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsTopicSession.java
@@ -39,9 +39,6 @@ public class JmsTopicSession extends JmsSession {
}
/**
- * @param queue
- * @return the QueueBrowser
- * @throws JMSException
* @see javax.jms.Session#createBrowser(javax.jms.Queue)
*/
@Override
@@ -50,10 +47,6 @@ public class JmsTopicSession extends JmsSession {
}
/**
- * @param queue
- * @param messageSelector
- * @return the QueueBrowser
- * @throws JMSException
* @see javax.jms.Session#createBrowser(javax.jms.Queue, java.lang.String)
*/
@Override
@@ -62,9 +55,6 @@ public class JmsTopicSession extends JmsSession {
}
/**
- * @param destination
- * @return the MessageConsumer
- * @throws JMSException
* @see javax.jms.Session#createConsumer(javax.jms.Destination)
*/
@Override
@@ -76,12 +66,7 @@ public class JmsTopicSession extends JmsSession {
}
/**
- * @param destination
- * @param messageSelector
- * @return the MessageConsumer
- * @throws JMSException
- * @see javax.jms.Session#createConsumer(javax.jms.Destination,
- * java.lang.String)
+ * @see javax.jms.Session#createConsumer(javax.jms.Destination, java.lang.String)
*/
@Override
public MessageConsumer createConsumer(Destination destination, String messageSelector) throws JMSException {
@@ -92,13 +77,7 @@ public class JmsTopicSession extends JmsSession {
}
/**
- * @param destination
- * @param messageSelector
- * @param noLocal
- * @return the MessageConsumer
- * @throws JMSException
- * @see javax.jms.Session#createConsumer(javax.jms.Destination,
- * java.lang.String)
+ * @see javax.jms.Session#createConsumer(javax.jms.Destination, java.lang.String)
*/
@Override
public MessageConsumer createConsumer(Destination destination, String messageSelector, boolean noLocal) throws JMSException {
@@ -109,9 +88,6 @@ public class JmsTopicSession extends JmsSession {
}
/**
- * @param destination
- * @return the MessageProducer
- * @throws JMSException
* @see javax.jms.Session#createProducer(javax.jms.Destination)
*/
@Override
@@ -123,9 +99,6 @@ public class JmsTopicSession extends JmsSession {
}
/**
- * @param queueName
- * @return the Queue object
- * @throws JMSException
* @see javax.jms.Session#createQueue(java.lang.String)
*/
@Override
@@ -134,8 +107,6 @@ public class JmsTopicSession extends JmsSession {
}
/**
- * @return the TemporaryQueue object
- * @throws JMSException
* @see javax.jms.Session#createTemporaryQueue()
*/
@Override
@@ -144,9 +115,6 @@ public class JmsTopicSession extends JmsSession {
}
/**
- * @param queue
- * @return the QueueReceiver
- * @throws JMSException
* @see javax.jms.QueueSession#createReceiver(javax.jms.Queue)
*/
@Override
@@ -155,12 +123,7 @@ public class JmsTopicSession extends JmsSession {
}
/**
- * @param queue
- * @param messageSelector
- * @return the QueueReceiver
- * @throws JMSException
- * @see javax.jms.QueueSession#createReceiver(javax.jms.Queue,
- * java.lang.String)
+ * @see javax.jms.QueueSession#createReceiver(javax.jms.Queue, java.lang.String)
*/
@Override
public QueueReceiver createReceiver(Queue queue, String messageSelector) throws JMSException {
@@ -168,9 +131,6 @@ public class JmsTopicSession extends JmsSession {
}
/**
- * @param queue
- * @return the QueueSender
- * @throws JMSException
* @see javax.jms.QueueSession#createSender(javax.jms.Queue)
*/
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsTopicSubscriber.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsTopicSubscriber.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsTopicSubscriber.java
index efcd731..73fadf0 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsTopicSubscriber.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsTopicSubscriber.java
@@ -28,38 +28,15 @@ import org.apache.qpid.jms.meta.JmsConsumerId;
*/
public class JmsTopicSubscriber extends JmsMessageConsumer implements TopicSubscriber {
- /**
- * Creates a non-durable TopicSubscriber
- *
- * @param id
- * @param s
- * @param destination
- * @param noLocal
- * @param selector
- * @throws JMSException
- */
JmsTopicSubscriber(JmsConsumerId id, JmsSession s, JmsDestination destination, boolean noLocal, String selector) throws JMSException {
super(id, s, destination, selector, noLocal);
}
- /**
- * Creates a TopicSubscriber that is durable.
- *
- * @param id
- * @param s
- * @param destination
- * @param name
- * @param noLocal
- * @param selector
- * @throws JMSException
- */
JmsTopicSubscriber(JmsConsumerId id, JmsSession s, JmsDestination destination, String name, boolean noLocal, String selector) throws JMSException {
super(id, s, destination, name, selector, noLocal);
}
/**
- * @return the Topic
- * @throws IllegalStateException
* @see javax.jms.TopicSubscriber#getTopic()
*/
@Override
@@ -68,6 +45,9 @@ public class JmsTopicSubscriber extends JmsMessageConsumer implements TopicSubsc
return (Topic) this.getDestination();
}
+ /**
+ * @see javax.jms.TopicSubscriber#getNoLocal()
+ */
@Override
public boolean getNoLocal() throws JMSException {
checkClosed();
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsTransactionContext.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsTransactionContext.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsTransactionContext.java
index d83c92e..be487e1 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsTransactionContext.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsTransactionContext.java
@@ -130,12 +130,21 @@ public interface JmsTransactionContext {
*/
boolean isInTransaction();
+ /**
+ * Signals that the connection that was previously established has been lost and the
+ * listener should alter its state to reflect the fact that there is no active connection.
+ */
void onConnectionInterrupted();
/**
* Called when the connection to the remote peer has been lost and then a new
* connection established. The context should perform any necessary processing
* recover and reset its internal state.
+ *
+ * @param provider
+ * A reference to the provider that manages the new connection.
+ *
+ * @throws Exception if an error occurs while rebuilding against the new provider.
*/
void onConnectionRecovery(Provider provider) throws Exception;
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JNDIReferenceFactory.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JNDIReferenceFactory.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JNDIReferenceFactory.java
index 5d0d04a..693e2e1 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JNDIReferenceFactory.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JNDIReferenceFactory.java
@@ -53,8 +53,7 @@ public class JNDIReferenceFactory implements ObjectFactory {
* @return the instance built from the Reference object
*
* @throws Exception
- * if building the instance from Reference fails (usually class not
- * found)
+ * if building the instance from Reference fails (usually class not found)
*/
@Override
public Object getObjectInstance(Object object, Name name, Context nameCtx, Hashtable<?, ?> environment)
@@ -83,9 +82,13 @@ public class JNDIReferenceFactory implements ObjectFactory {
* Create a Reference instance from a JNDIStorable object
*
* @param instanceClassName
+ * The name of the class that is being created.
* @param po
+ * The properties object to use when configuring the new instance.
+ *
* @return Reference
- * @throws NamingException
+ *
+ * @throws NamingException if an error occurs while creating the new instance.
*/
public static Reference createReference(String instanceClassName, JNDIStorable po) throws NamingException {
Reference result = new Reference(instanceClassName, JNDIReferenceFactory.class.getName(), null);
@@ -105,9 +108,13 @@ public class JNDIReferenceFactory implements ObjectFactory {
* Retrieve the class loader for a named class
*
* @param thisObj
+ * Local object to use when doing the lookup.
* @param className
- * @return the class
- * @throws ClassNotFoundException
+ * The name of the class being loaded.
+ *
+ * @return the class that was requested.
+ *
+ * @throws ClassNotFoundException if a matching class cannot be created.
*/
public static Class<?> loadClass(Object thisObj, String className) throws ClassNotFoundException {
// try local ClassLoader first.
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JNDIStorable.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JNDIStorable.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JNDIStorable.java
index 8753fcc..20edd95 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JNDIStorable.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/jndi/JNDIStorable.java
@@ -53,6 +53,8 @@ public abstract class JNDIStorable implements Referenceable, Externalizable {
* set the properties for this instance as retrieved from JNDI
*
* @param props
+ * The properties to apply to this instance.
+ *
* @return a new, unmodifiable, map containing any unused properties, or empty if none were.
*/
public synchronized Map<String, String> setProperties(Map<String, String> props) {
@@ -83,9 +85,6 @@ public abstract class JNDIStorable implements Referenceable, Externalizable {
}
/**
- * @param in
- * @throws IOException
- * @throws ClassNotFoundException
* @see java.io.Externalizable#readExternal(java.io.ObjectInput)
*/
@SuppressWarnings("unchecked")
@@ -98,8 +97,6 @@ public abstract class JNDIStorable implements Referenceable, Externalizable {
}
/**
- * @param out
- * @throws IOException
* @see java.io.Externalizable#writeExternal(java.io.ObjectOutput)
*/
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java
index af58312..4fb1df9 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java
@@ -286,7 +286,8 @@ public class JmsMessage implements javax.jms.Message {
* properties
*
* @return Enumeration of all property names on this message
- * @throws JMSException
+ *
+ * @throws JMSException if an error occurs while reading the properties from the Message.
*/
public Enumeration<?> getAllPropertyNames() throws JMSException {
Set<String> result = new HashSet<String>();
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageTransformation.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageTransformation.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageTransformation.java
index 1beae38..4563f85 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageTransformation.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageTransformation.java
@@ -51,13 +51,14 @@ public final class JmsMessageTransformation {
/**
* Creates a an available JMS message from another provider.
*
+ * @param connection
+ * The Connection instance that is requesting the transformation.
* @param destination
- * - Destination to be converted into Jms's implementation.
- * @return JmsDestination - Jms's implementation of the
- * destination.
- * @throws JMSException
- * @throws JMSException
- * if an error occurs
+ * Destination to be converted into Jms's implementation.
+ *
+ * @return JmsDestination - Jms's implementation of the destination.
+ *
+ * @throws JMSException if an error occurs during the transformation.
*/
public static JmsDestination transformDestination(JmsConnection connection, Destination destination) throws JMSException {
JmsDestination result = null;
@@ -178,6 +179,8 @@ public final class JmsMessageTransformation {
* specific to the foreign message may be lost if not returned directly via
* the <code>propertyNames</code> method.
*
+ * @param connection
+ * The Connection instance that is requesting the transformation.
* @param source
* the message to take the properties from
* @param target
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/JmsMapMessageFacade.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/JmsMapMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/JmsMapMessageFacade.java
index a062984..d9650ab 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/JmsMapMessageFacade.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/JmsMapMessageFacade.java
@@ -45,6 +45,9 @@ public interface JmsMapMessageFacade extends JmsMessageFacade {
/**
* Determines whether an item exists in this Map based message.
*
+ * @param key
+ * The entry key that is being searched for.
+ *
* @return true if the item exists in the Map, false otherwise.
*/
boolean itemExists(String key);
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/JmsMessageFacade.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/JmsMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/JmsMessageFacade.java
index aead344..15bde3c 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/JmsMessageFacade.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/facade/JmsMessageFacade.java
@@ -48,6 +48,9 @@ public interface JmsMessageFacade {
public Set<String> getPropertyNames() throws JMSException;
/**
+ * @param key
+ * The property name that is being searched for.
+ *
* @return true if the given property exists within the message.
*
* @throws JMSException if an error occurs while accessing the Message properties.
@@ -60,6 +63,8 @@ public interface JmsMessageFacade {
* @param key
* the key used to access the given property.
*
+ * @return the object that is stored under the given key or null if none found.
+ *
* @throws JMSException if an error occurs while accessing the Message properties.
*/
Object getProperty(String key) throws JMSException;
@@ -116,6 +121,8 @@ public interface JmsMessageFacade {
* Create a new instance and perform a deep copy of this object's
* contents.
*
+ * @return a copy of this JmsMessageFacade instance.
+ *
* @throws JMSException if an error occurs while copying the message.
*/
JmsMessageFacade copy() throws JMSException;
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/Provider.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/Provider.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/Provider.java
index ea82390..ad5993f 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/Provider.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/Provider.java
@@ -288,7 +288,8 @@ public interface Provider {
* {@literal timeout > 0} then it should remain open for timeout amount of time.
*
* The timeout value when positive is given in milliseconds.
- *
+ * @param consumerId
+ * the ID of the Consumer instance that is attempt to pull a message from the remote.
* @param timeout
* the amount of time to tell the remote peer to keep this pull request valid.
* @param request
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderRedirectedException.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderRedirectedException.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderRedirectedException.java
index f521a38..667f96a 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderRedirectedException.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderRedirectedException.java
@@ -30,9 +30,6 @@ public class ProviderRedirectedException extends IOException {
private final String networkHost;
private final int port;
- /**
- * @param reason
- */
public ProviderRedirectedException(String reason, String hostname, String networkHost, int port) {
super(reason);
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderWrapper.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderWrapper.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderWrapper.java
index c138b47..c053c22 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderWrapper.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderWrapper.java
@@ -36,6 +36,8 @@ import org.apache.qpid.jms.provider.ProviderConstants.ACK_TYPE;
* This wrapper is meant primarily for Providers that are adding some additional feature
* on-top of an existing provider such as a discovery based provider that only needs to
* pass along discovered remote peer information.
+ *
+ * @param <E> the Type of the Provider instance being wrapped.
*/
public class ProviderWrapper<E extends Provider> implements Provider, ProviderListener {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/WrappedAsyncResult.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/WrappedAsyncResult.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/WrappedAsyncResult.java
index c487f48..83fcb4e 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/WrappedAsyncResult.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/WrappedAsyncResult.java
@@ -25,6 +25,9 @@ public abstract class WrappedAsyncResult implements AsyncResult {
/**
* Create a new WrappedAsyncResult for the target AsyncResult
+ *
+ * @param wrapped
+ * The AsyncResult to be wrapped by this AsyncResult instance.
*/
public WrappedAsyncResult(AsyncResult wrapped) {
this.wrapped = wrapped;
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java
index 91d220a..5474d75 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpAbstractResource.java
@@ -32,6 +32,9 @@ import org.slf4j.LoggerFactory;
* This abstract class wraps up the basic state management bits so that the concrete
* object don't have to reproduce it. Provides hooks for the subclasses to initialize
* and shutdown.
+ *
+ * @param <R> The JmsResource type that describe this resource.
+ * @param <E> The AMQP Endpoint that this resource encapsulates.
*/
public abstract class AmqpAbstractResource<R extends JmsResource, E extends Endpoint> implements AmqpResource {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
index 69ffcdf..d2df866 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
@@ -79,6 +79,9 @@ public class AmqpConsumer extends AmqpAbstractResource<JmsConsumerInfo, Receiver
/**
* Starts the consumer by setting the link credit to the given prefetch value.
+ *
+ * @param request
+ * The request that awaits completion of the consumer start.
*/
public void start(AsyncResult request) {
sendFlowIfNeeded();
@@ -87,6 +90,9 @@ public class AmqpConsumer extends AmqpAbstractResource<JmsConsumerInfo, Receiver
/**
* Stops the consumer, using all link credit and waiting for in-flight messages to arrive.
+ *
+ * @param request
+ * The request that awaits completion of the consumer stop.
*/
public void stop(AsyncResult request) {
Receiver receiver = getEndpoint();
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSaslAuthenticator.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSaslAuthenticator.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSaslAuthenticator.java
index 0376197..ee12f5f 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSaslAuthenticator.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpSaslAuthenticator.java
@@ -36,7 +36,7 @@ public class AmqpSaslAuthenticator {
private final Sasl sasl;
private final JmsConnectionInfo info;
private Mechanism mechanism;
- private Principal localPrincipal;
+ private final Principal localPrincipal;
private Set<String> mechanismsRestriction;
/**
@@ -77,7 +77,9 @@ public class AmqpSaslAuthenticator {
* successful authentication or a JMSSecurityException is thrown indicating that the
* handshake failed.
*
- * @throws JMSSecurityException
+ * @return true if the SASL handshake completes successfully.
+ *
+ * @throws JMSSecurityException if a security violation is detected during the handshake.
*/
public boolean authenticate() throws JMSSecurityException {
switch (sasl.getState()) {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/builders/AmqpResourceBuilder.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/builders/AmqpResourceBuilder.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/builders/AmqpResourceBuilder.java
index 6a678ad..a6618e7 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/builders/AmqpResourceBuilder.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/builders/AmqpResourceBuilder.java
@@ -31,6 +31,11 @@ import org.slf4j.LoggerFactory;
/**
* Base for all AmqpResource builders.
+ *
+ * @param <TARGET> The Type of resource that will be created.
+ * @param <PARENT> The Type of this resource's parent.
+ * @param <INFO> The Type of JmsResource used to describe the target resource.
+ * @param <ENDPOINT> The AMQP Endpoint that the target resource encapsulates.
*/
public abstract class AmqpResourceBuilder<TARGET extends AmqpResource, PARENT extends AmqpResourceParent, INFO extends JmsResource, ENDPOINT extends Endpoint> implements AmqpEventSink {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpDestinationHelper.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpDestinationHelper.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpDestinationHelper.java
index 140616e..06ac95f 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpDestinationHelper.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpDestinationHelper.java
@@ -58,6 +58,13 @@ public class AmqpDestinationHelper {
* If the address is null then the consumer destination is returned, unless
* the useConsumerDestForTypeOnly flag is true, in which case null will be
* returned.
+ *
+ * @param message
+ * The message that holds the addressing information.
+ * @param consumerDestination
+ * The destination that the consumer is subscribed to.
+ *
+ * @return a Destination object that describe the original address the message was sent to.
*/
public JmsDestination getJmsDestination(AmqpJmsMessageFacade message, JmsDestination consumerDestination) {
String to = message.getToAddress();
@@ -295,6 +302,11 @@ public class AmqpDestinationHelper {
}
/**
+ * Return the appropriate type capability to describe the given Destination.
+ *
+ * @param destination
+ * The Destination to examine for the destination type capability.
+ *
* @return the type capability, or null if the supplied destination is null or can't be classified
*/
public Symbol toTypeCapability(JmsDestination destination) {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
index 07eed51..4aa31f3 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
@@ -48,9 +48,6 @@ import org.apache.qpid.proton.amqp.messaging.MessageAnnotations;
import org.apache.qpid.proton.amqp.messaging.Properties;
import org.apache.qpid.proton.message.Message;
-/**
- *
- */
public class AmqpJmsMessageFacade implements JmsMessageFacade {
private static final int DEFAULT_PRIORITY = javax.jms.Message.DEFAULT_PRIORITY;
@@ -606,7 +603,7 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade {
* @param ttl
* the value to use, in range {@literal 0 <= x <= 2^32 - 1}
*
- * @throws MessageFormatException
+ * @throws MessageFormatException if the TTL value is not in the allowed range.
*/
public void setAmqpTimeToLiveOverride(Long ttl) throws MessageFormatException {
if (ttl != null) {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java
index 35c5af5..90b4854 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java
@@ -279,6 +279,9 @@ public class AmqpJmsMessagePropertyIntercepter {
* manipulated by the receiver without impacting the facade, and an empty set
* will be returned if there are no matching properties.
*
+ * @param message
+ * The message being enumerated.
+ *
* @return a {@code Set<String>} containing the names of all intercepted properties with a value.
*/
public static Set<String> getPropertyNames(AmqpJmsMessageFacade message) {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
index d7fc1d3..6d73058 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
@@ -1032,9 +1032,6 @@ public class FailoverProvider extends DefaultProviderListener implements Provide
*/
protected abstract class CreateConnectionRequest extends FailoverRequest {
- /**
- * @param watcher
- */
public CreateConnectionRequest(AsyncResult watcher) {
super(watcher);
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TransportSupport.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TransportSupport.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TransportSupport.java
index 3c876c1..ca9220f 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TransportSupport.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/transports/TransportSupport.java
@@ -55,6 +55,8 @@ public class TransportSupport {
* Creates a Netty SslHandler instance for use in Transports that require
* an SSL encoder / decoder.
*
+ * @param remote
+ * The URI of the remote peer that the SslHandler will be used against.
* @param options
* The SSL options object to build the SslHandler instance from.
*
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/FactoryFinder.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/FactoryFinder.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/FactoryFinder.java
index de4a3ef..8d013dc 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/FactoryFinder.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/FactoryFinder.java
@@ -26,6 +26,8 @@ import java.util.concurrent.ConcurrentHashMap;
* A Factory finding helper class used to locate objects that serve as Factories for
* other Object types. The search an instantiate mechanism is configurable so that
* in a non-stand-alone environment such as OSGI the finder and be configured to work.
+ *
+ * @param <T> The type of the object Factory to locate.
*/
public class FactoryFinder<T extends Object> {
@@ -68,6 +70,8 @@ public class FactoryFinder<T extends Object> {
/**
* Creates a new instance of the FactoryFinder using the given search path.
*
+ * @param factoryType
+ * The Class that defines what this finder is searching for.
* @param path
* The path to use when searching for the factory definitions.
*/
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/IdGenerator.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/IdGenerator.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/IdGenerator.java
index 5d7453e..28beb9f 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/IdGenerator.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/IdGenerator.java
@@ -98,6 +98,9 @@ public class IdGenerator {
/**
* Construct an IdGenerator
+ *
+ * @param prefix
+ * The prefix value that is applied to all generated IDs.
*/
public IdGenerator(String prefix) {
synchronized (UNIQUE_STUB) {
@@ -189,7 +192,9 @@ public class IdGenerator {
* From a generated id - return the generator count
*
* @param id
- * @return the count
+ * The ID that will be parsed for a sequence number.
+ *
+ * @return the sequence value parsed from the given ID.
*/
public static long getSequenceFromId(String id) {
long result = -1;
@@ -207,8 +212,9 @@ public class IdGenerator {
/**
* Does a proper compare on the Id's
*
- * @param id1
- * @param id2
+ * @param id1 the lhs of the comparison.
+ * @param id2 the rhs of the comparison.
+ *
* @return 0 if equal else a positive if {@literal id1 > id2} ...
*/
public static int compare(String id1, String id2) {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/InetAddressUtil.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/InetAddressUtil.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/InetAddressUtil.java
index b97d665..c7f2324 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/InetAddressUtil.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/InetAddressUtil.java
@@ -36,7 +36,9 @@ public class InetAddressUtil {
* from the exception, only then is the <tt>UnknownHostException</tt> thrown.
*
* @return The hostname
- * @throws UnknownHostException
+ *
+ * @throws UnknownHostException if the given host cannot be looked up.
+ *
* @see java.net.InetAddress#getLocalHost()
* @see java.net.InetAddress#getHostName()
*/
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/LRUCache.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/LRUCache.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/LRUCache.java
index 76b130e..91ae967 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/LRUCache.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/LRUCache.java
@@ -22,8 +22,8 @@ import java.util.Map;
/**
* A Simple LRU Cache based on a LinkedHashMap.
*
- * @param <K>
- * @param <V>
+ * @param <K> The type of the map key.
+ * @param <V> The type of the map value.
*/
public class LRUCache<K, V> extends LinkedHashMap<K, V> {
@@ -41,6 +41,7 @@ public class LRUCache<K, V> extends LinkedHashMap<K, V> {
* Constructs a LRUCache with a maximum capacity
*
* @param maximumCacheSize
+ * The maximum number of elements to keep in the Cache before eviction starts.
*/
public LRUCache(int maximumCacheSize) {
this(0, maximumCacheSize, 0.75f, true);
@@ -50,9 +51,12 @@ public class LRUCache<K, V> extends LinkedHashMap<K, V> {
* Constructs an empty <tt>LRUCache</tt> instance with the specified
* initial capacity, maximumCacheSize,load factor and ordering mode.
*
- * @param initialCapacity the initial capacity.
+ * @param initialCapacity
+ * The initial capacity.
* @param maximumCacheSize
- * @param loadFactor the load factor.
+ * The maximum number of elements to keep in the Cache before eviction starts.
+ * @param loadFactor
+ * The load factor to configure on the underlying map.
* @param accessOrder the ordering mode - <tt>true</tt> for access-order,
* <tt>false</tt> for insertion-order.
*
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/MessageQueue.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/MessageQueue.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/MessageQueue.java
index bdd99d0..fd35a0a 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/MessageQueue.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/MessageQueue.java
@@ -61,6 +61,9 @@ public interface MessageQueue {
* blocks up to timeout amount of time. Expired messages will consumed by
* this method.
*
+ * @param timeout
+ * The amount of time to wait for an entry to be added before returning null.
+ *
* @return null if we timeout or if the consumer is closed.
*
* @throws InterruptedException if the wait is interrupted.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/3] qpid-jms git commit: NO-JIRA Fix and update javadocs
Posted by ta...@apache.org.
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/PropertyUtil.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/PropertyUtil.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/PropertyUtil.java
index 1f061c4..35f1cf3 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/PropertyUtil.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/PropertyUtil.java
@@ -52,7 +52,7 @@ public class PropertyUtil {
* @return a new URI that matches the original one but has its query options replaced with
* the given ones.
*
- * @throws URISyntaxException
+ * @throws URISyntaxException if the given URI is invalid.
*/
public static URI replaceQuery(URI originalURI, Map<String, String> params) throws URISyntaxException {
String s = createQueryString(params);
@@ -71,7 +71,8 @@ public class PropertyUtil {
* The new URI query string that should be appended to the given URI.
*
* @return a new URI that is a combination of the original URI and the given query string.
- * @throws URISyntaxException
+ *
+ * @throws URISyntaxException if the given URI is invalid.
*/
public static URI replaceQuery(URI uri, String query) throws URISyntaxException {
String schemeSpecificPart = uri.getRawSchemeSpecificPart();
@@ -97,7 +98,8 @@ public class PropertyUtil {
* The source URI whose existing query is replaced with the newly supplied one.
*
* @return a new URI that is a combination of the original URI and the given query string.
- * @throws URISyntaxException
+ *
+ * @throws URISyntaxException if the given URI is invalid.
*/
public static URI eraseQuery(URI uri) throws URISyntaxException {
return replaceQuery(uri, (String) null);
@@ -112,7 +114,7 @@ public class PropertyUtil {
*
* @return a URI formatted query string.
*
- * @throws URISyntaxException
+ * @throws URISyntaxException if the given URI is invalid.
*/
public static String createQueryString(Map<String, ? extends Object> options) throws URISyntaxException {
try {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/ThreadPoolUtils.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/ThreadPoolUtils.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/ThreadPoolUtils.java
index acf823d..47e1a56 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/ThreadPoolUtils.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/ThreadPoolUtils.java
@@ -36,6 +36,9 @@ public final class ThreadPoolUtils {
/**
* Shutdown the given executor service only (ie not graceful shutdown).
*
+ * @param executorService
+ * The ExecutorService that is being shutdown.
+ *
* @see java.util.concurrent.ExecutorService#shutdown()
*/
public static void shutdown(ExecutorService executorService) {
@@ -47,7 +50,9 @@ public final class ThreadPoolUtils {
*
* @param executorService
* the executor service to shutdown now
+ *
* @return list of tasks that never commenced execution
+ *
* @see java.util.concurrent.ExecutorService#shutdownNow()
*/
public static List<Runnable> shutdownNow(ExecutorService executorService) {
@@ -77,6 +82,9 @@ public final class ThreadPoolUtils {
* This implementation invokes the
* {@link #shutdownGraceful(java.util.concurrent.ExecutorService, long)} with a timeout
* value of {@link #DEFAULT_SHUTDOWN_AWAIT_TERMINATION} millis.
+ *
+ * @param executorService
+ * The ExecutorService that is being shutdown.
*/
public static void shutdownGraceful(ExecutorService executorService) {
doShutdown(executorService, DEFAULT_SHUTDOWN_AWAIT_TERMINATION);
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/URISupport.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/URISupport.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/URISupport.java
index 1335398..959f4f0 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/URISupport.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/util/URISupport.java
@@ -110,7 +110,8 @@ public class URISupport {
* The target URI that should be parsed.
*
* @return a new CompsiteData instance representing the parsed composite URI.
- * @throws URISyntaxException
+ *
+ * @throws URISyntaxException if the given URI is invalid.
*/
public static CompositeData parseComposite(URI uri) throws URISyntaxException {
@@ -336,7 +337,8 @@ public class URISupport {
* The URI whose query value is to be removed.
*
* @return a new URI that does not contain a query value.
- * @throws URISyntaxException
+ *
+ * @throws URISyntaxException if the given URI is invalid.
*/
public static URI removeQuery(URI uri) throws URISyntaxException {
return PropertyUtil.replaceQuery(uri, (String) null);
@@ -353,7 +355,8 @@ public class URISupport {
* The URI whose query should be extracted and processed.
*
* @return A Mapping of the URI options.
- * @throws URISyntaxException
+ *
+ * @throws URISyntaxException if the given URI is invalid.
*/
public static Map<String, String> parseParameters(URI uri) throws URISyntaxException {
if (!isCompositeURI(uri)) {
@@ -389,7 +392,8 @@ public class URISupport {
* The Key / Value mapping that will be transformed into a URI query string.
*
* @return A new URI value that combines the given URI and the constructed query string.
- * @throws URISyntaxException
+ *
+ * @throws URISyntaxException if the given URI is invalid.
*/
public static URI applyParameters(URI uri, Map<String, String> queryParameters) throws URISyntaxException {
return applyParameters(uri, queryParameters, "");
@@ -410,7 +414,8 @@ public class URISupport {
* key.
*
* @return A new URI value that combines the given URI and the constructed query string.
- * @throws URISyntaxException
+ *
+ * @throws URISyntaxException if the given URI is invalid.
*/
public static URI applyParameters(URI uri, Map<String, String> queryParameters, String optionPrefix) throws URISyntaxException {
if (queryParameters != null && !queryParameters.isEmpty()) {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionFactoryTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionFactoryTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionFactoryTest.java
index 75317cb..5238933 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionFactoryTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionFactoryTest.java
@@ -319,6 +319,8 @@ public class JmsConnectionFactoryTest extends QpidJmsTestCase {
* The prefetch policy is maintained in a child-object, which we extract the properties from
* when serializing the factory. Ensure this functions by doing a round trip on a factory
* configured with some new prefetch configuration via the URI.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSerializeThenDeserializeMaintainsPrefetchPolicy() throws Exception {
@@ -348,6 +350,8 @@ public class JmsConnectionFactoryTest extends QpidJmsTestCase {
* The redelivery policy is maintained in a child-object, which we extract the properties from
* when serializing the factory. Ensure this functions by doing a round trip on a factory
* configured with some new redelivery configuration via the URI.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSerializeThenDeserializeMaintainsRedeliveryPolicy() throws Exception {
@@ -405,6 +409,8 @@ public class JmsConnectionFactoryTest extends QpidJmsTestCase {
/**
* Verify that the 'global' exception listener set on the connection factory
* is ignored when the factory gets serialized.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSerializeThenDeserializeIgnoresGlobalExceptionListener() throws Exception {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsQueueConnectionTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsQueueConnectionTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsQueueConnectionTest.java
index 64a2b08..a218ce2 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsQueueConnectionTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsQueueConnectionTest.java
@@ -61,9 +61,11 @@ public class JmsQueueConnectionTest extends JmsConnectionTestSupport {
* (see JMS 1.1 specs, table 4-1).
*
* @since JMS 1.1
+ *
+ * @throws JMSException if an error occurs during the test.
*/
@Test(timeout = 30000, expected=IllegalStateException.class)
- public void testCreateDurableConnectionConsumerOnQueueConnection() throws JMSException{
+ public void testCreateDurableConnectionConsumerOnQueueConnection() throws JMSException {
queueConnection.createDurableConnectionConsumer(new JmsTopic(), "subscriptionName", "", (ServerSessionPool)null, 1);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/BytesMessageIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/BytesMessageIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/BytesMessageIntegrationTest.java
index aa62f50..5df5e93 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/BytesMessageIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/BytesMessageIntegrationTest.java
@@ -157,6 +157,8 @@ public class BytesMessageIntegrationTest extends QpidJmsTestCase {
* gives the expected data values when read, and when reset and left mid-stream before being
* resent that it results in the expected AMQP data body section and properties content type
* being received by the test peer.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceiveBytesMessageAndResendAfterResetAndPartialRead() throws Exception {
@@ -265,6 +267,8 @@ public class BytesMessageIntegrationTest extends QpidJmsTestCase {
* expected data values when read, and when sent to the test peer it results in an
* AMQP message containing a data body section and content type of
* {@link AmqpMessageSupport#OCTET_STREAM_CONTENT_TYPE}
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceiveBytesMessageWithAmqpValueAndResendResultsInData() throws Exception {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java
index 3df5b3a..e4d1869 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java
@@ -135,6 +135,8 @@ public class ConsumerIntegrationTest extends QpidJmsTestCase {
/**
* Test that a message is received when calling receive with a timeout
* of 0, which means wait indefinitely.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceiveMessageWithReceiveZeroTimeout() throws Exception {
@@ -164,6 +166,8 @@ public class ConsumerIntegrationTest extends QpidJmsTestCase {
/**
* Test that an Ack is not dropped when RTE is thrown from onMessage
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testRuntimeExceptionInOnMessageReleasesInAutoAckMode() throws Exception {
@@ -197,6 +201,8 @@ public class ConsumerIntegrationTest extends QpidJmsTestCase {
/**
* Test that an Ack is not dropped when RTE is thrown from onMessage
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testRuntimeExceptionInOnMessageReleasesInDupsOkAckMode() throws Exception {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ForeignMessageIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ForeignMessageIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ForeignMessageIntegrationTest.java
index 3543fc3..41e069a 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ForeignMessageIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ForeignMessageIntegrationTest.java
@@ -19,8 +19,8 @@
package org.apache.qpid.jms.integration;
import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -117,6 +117,8 @@ public class ForeignMessageIntegrationTest extends QpidJmsTestCase {
* Test that after sending a message with the disableMessageID hint set, which already had
* a JMSMessageID value, that the message object then has a null JMSMessageID value, and no
* message-id field value was set.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testSendForeignMessageWithDisableMessageIDHintAndExistingMessageID() throws Exception {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MapMessageIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MapMessageIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MapMessageIntegrationTest.java
index 0ac384c..8141751 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MapMessageIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MapMessageIntegrationTest.java
@@ -57,6 +57,8 @@ public class MapMessageIntegrationTest extends QpidJmsTestCase {
* Test that a message received from the test peer with an AmqpValue section containing
* a map which holds entries of the various supported entry types is returned as a
* {@link MapMessage}, and verify the values can all be retrieved as expected.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceiveBasicMapMessage() throws Exception {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MessageIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MessageIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MessageIntegrationTest.java
index bd991c1..101a637 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MessageIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MessageIntegrationTest.java
@@ -332,6 +332,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
* Tests that the lack of a 'to' in the Properties section of the incoming message (e.g
* one sent by a non-JMS client) is handled by making the JMSDestination method simply
* return the Queue Destination used to create the consumer that received the message.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageFromQueueWithoutToResultsInUseOfConsumerDestinationQueue() throws Exception {
@@ -342,6 +344,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
* Tests that the lack of a 'to' in the Properties section of the incoming message (e.g
* one sent by a non-JMS client) is handled by making the JMSDestination method simply
* return the Topic Destination used to create the consumer that received the message.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageFromQueueWithoutToResultsInUseOfConsumerDestinationTopic() throws Exception {
@@ -397,6 +401,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
/**
* Tests that lack of the reply-to set on a message results in it returning null for JMSReplyTo
* and not the consumer destination as happens for JMSDestination.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageFromQueueWithNoReplyToReturnsNull() throws Exception {
@@ -432,6 +438,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
/**
* Tests that the a connection with a 'topic prefix' set on it strips the
* prefix from the content of the to/reply-to fields for incoming messages.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageWithTopicDestinationsOnConnectionWithTopicPrefix() throws Exception {
@@ -455,6 +463,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
* Tests that the a connection with a 'topic prefix' set on it strips the
* prefix from the content of the to/reply-to fields for incoming messages
* if they don't have the 'destination type annotation' set.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageWithNoTypeAnnotationAndTopicDestinationsOnConnectionWithTopicPrefix() throws Exception {
@@ -477,6 +487,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
/**
* Tests that the a connection with a 'queue prefix' set on it strips the
* prefix from the content of the to/reply-to fields for incoming messages.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageWithQueueDestinationsOnConnectionWithQueuePrefix() throws Exception {
@@ -500,6 +512,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
* Tests that the a connection with a 'queue prefix' set on it strips the
* prefix from the content of the to/reply-to fields for incoming messages
* if they don't have the 'destination type annotation' set.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageWithNoTypeAnnotationAndQueueDestinationsOnConnectionWithQueuePrefix() throws Exception {
@@ -522,6 +536,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
/**
* Tests that a connection with a 'prefixes' set on its does not alter the
* address for a temporary queue in the to/reply-to fields for incoming messages.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageWithTemporaryQueueDestinationsOnConnectionWithPrefixes() throws Exception {
@@ -544,6 +560,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
/**
* Tests that a connection with a 'prefixes' set on its does not alter the
* address for a temporary queue in the to/reply-to fields for incoming messages.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageWithTemporaryTopicDestinationsOnConnectionWithPrefixes() throws Exception {
@@ -671,6 +689,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
/**
* Tests that the a connection with a 'topic prefix' set on it adds the
* prefix to the content of the to/reply-to fields for outgoing messages.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testSendMessageWithTopicDestinationsOnConnectionWithTopicPrefix() throws Exception {
@@ -686,6 +706,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
/**
* Tests that the a connection with a 'queue prefix' set on it adds the
* prefix to the content of the to/reply-to fields for outgoing messages.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testSendMessageWithQueueDestinationsOnConnectionWithQueuePrefix() throws Exception {
@@ -701,6 +723,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
/**
* Tests that the a connection with 'destination prefixes' set on it does not add
* the prefix to the content of the to/reply-to fields for TemporaryQueues.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testSendMessageWithTemporaryQueueDestinationsOnConnectionWithDestinationPrefixes() throws Exception {
@@ -716,6 +740,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
/**
* Tests that the a connection with 'destination prefixes' set on it does not add
* the prefix to the content of the to/reply-to fields for TemporaryTopics.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testSendMessageWithTemporaryTopicDestinationsOnConnectionWithDestinationPrefixes() throws Exception {
@@ -807,6 +833,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
/**
* Tests that a connection with 'prefixes' set on it via broker-provided connection properties
* strips the prefix from the to/reply-to fields for incoming messages with Topic destinations.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageWithTopicDestinationsOnConnectionWithBrokerDefinedPrefixProperties() throws Exception {
@@ -829,6 +857,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
/**
* Tests that a connection with 'prefixes' set on it via broker-provided connection properties
* strips the prefix from the to/reply-to fields for incoming messages with Queue destinations.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageWithQueueDestinationsOnConnectionWithBrokerDefinedPrefixProperties() throws Exception {
@@ -936,6 +966,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
/**
* Tests that the a connection with a 'queue prefix' set on it via broker-provided connection
* properties adds the prefix to the content of the to/reply-to fields for outgoing messages.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testSendMessageWithQueueDestinationsOnConnectionWithBrokerDefinedPrefixProperties() throws Exception {
@@ -951,6 +983,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
/**
* Tests that the a connection with a 'topic prefix' set on it via broker-provided connection
* properties adds the prefix to the content of the to/reply-to fields for outgoing messages.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testSendMessageWithTopicDestinationsOnConnectionWithBrokerDefinedPrefixProperties() throws Exception {
@@ -1033,6 +1067,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
* or {@link AmqpMessageSupport#LEGACY_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME}) set
* on a message to indicate type of its 'reply-to' address results in it
* being classed as the same type as the consumer destination.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageFromTopicWithReplyToWithoutTypeAnnotationResultsInUseOfConsumerDestinationType() throws Exception {
@@ -1074,6 +1110,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
/**
* Tests that the {@link AmqpDestinationHelper#JMS_DEST_TYPE_MSG_ANNOTATION_SYMBOL_NAME} is set as a byte on
* a sent message to indicate its 'to' address represents a Topic JMSDestination.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testSentMessageContainsToTypeAnnotationByte() throws Exception {
@@ -1111,6 +1149,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
/**
* Tests that the {@link AmqpDestinationHelper#JMS_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME} is set as a byte on
* a sent message to indicate its 'reply-to' address represents a Topic JMSDestination.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testSentMessageContainsReplyToTypeAnnotationByte() throws Exception {
@@ -1156,6 +1196,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
* Tests that the {@link AmqpMessageSupport#LEGACY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME} set on a message to
* indicate its 'to' address represents a Topic results in the JMSDestination object being a
* Topic. Ensure the consumers destination is not used by consuming from a Queue.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageFromQueueWithToLegacyTypeAnnotationForTopic() throws Exception {
@@ -1198,6 +1240,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
* Tests that the {@link AmqpMessageSupport#LEGACY_REPLY_TO_TYPE_MSG_ANNOTATION_SYMBOL_NAME} set on a message to
* indicate its 'reply-to' address represents a Topic results in the JMSReplyTo object being a
* Topic. Ensure the consumers destination is not used by consuming from a Queue.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageFromQueueWithLegacyReplyToTypeAnnotationForTopic() throws Exception {
@@ -1241,6 +1285,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
/**
* Tests that lack of the absolute-expiry-time and ttl fields on a message results
* in it returning 0 for for JMSExpiration
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageFromQueueWithNoAbsoluteExpiryOrTtlReturnsJMSExpirationZero() throws Exception {
@@ -1274,6 +1320,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
/**
* Tests that setting a non-zero value in the absolute-expiry-time field on a
* message results in it returning this value for JMSExpiration
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageFromQueueWithAbsoluteExpiryReturnsJMSExpirationNonZero() throws Exception {
@@ -1339,6 +1387,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
/**
* Tests that receiving a message with a string typed message-id results in returning the
* expected value for JMSMessageId where the JMS "ID:" prefix has been added.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageWithStringMessageIdReturnsExpectedJMSMessageID() throws Exception {
@@ -1348,6 +1398,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
/**
* Tests that receiving a message with a UUID typed message-id results in returning the
* expected value for JMSMessageId where the JMS "ID:" prefix has been added to the UUID.tostring()
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageWithUUIDMessageIdReturnsExpectedJMSMessageID() throws Exception {
@@ -1357,6 +1409,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
/**
* Tests that receiving a message with a ulong typed message-id results in returning the
* expected value for JMSMessageId where the JMS "ID:" prefix has been added to the UnsignedLong.tostring()
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageWithUnsignedLongMessageIdReturnsExpectedJMSMessageID() throws Exception {
@@ -1366,6 +1420,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
/**
* Tests that receiving a message with a binary typed message-id results in returning the
* expected value for JMSMessageId where the JMS "ID:" prefix has been added to the hex representation of the binary.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageWithBinaryMessageIdReturnsExpectedJMSMessageID() throws Exception {
@@ -1405,6 +1461,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
/**
* Tests that receiving a message with a string typed correlation-id results in returning the
* expected value for JMSCorrelationID where the JMS "ID:" prefix has been added.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageWithStringCorrelationIdReturnsExpectedJMSCorrelationID() throws Exception {
@@ -1415,6 +1473,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
* Tests that receiving a message with a string typed correlation-id, which is indicated to be an
* application-specific value, results in returning the expected value for JMSCorrelationID
* where the JMS "ID:" prefix has NOT been added.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageWithAppSpecificStringCorrelationIdReturnsExpectedJMSCorrelationID() throws Exception {
@@ -1424,6 +1484,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
/**
* Tests that receiving a message with a UUID typed correlation-id results in returning the
* expected value for JMSCorrelationID where the JMS "ID:" prefix has been added to the UUID.tostring()
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageWithUUIDCorrelationIdReturnsExpectedJMSCorrelationID() throws Exception {
@@ -1433,6 +1495,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
/**
* Tests that receiving a message with a UUID typed correlation-id results in returning the
* expected value for JMSCorrelationID where the JMS "ID:" prefix has been added to the UUID.tostring()
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageWithLongCorrelationIdReturnsExpectedJMSCorrelationID() throws Exception {
@@ -1484,6 +1548,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
* message-id results in an AMQP message with the expected encoding of the correlation-id,
* where the type is uuid, the "ID:" prefix of the JMSCorrelationID value is (obviously) not present, and there is
* no presence of the message annotation to indicate an app-specific correlation-id.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testSentMessageWithUUIDCorrelationId() throws Exception {
@@ -1497,6 +1563,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
* message-id results in an AMQP message with the expected encoding of the correlation-id,
* where the type is binary, the "ID:" prefix of the JMSCorrelationID value is (obviously) not present, and there is
* no presence of the message annotation to indicate an app-specific correlation-id.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testSentMessageWithBinaryCorrelationId() throws Exception
@@ -1511,6 +1579,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
* message-id results in an AMQP message with the expected encoding of the correlation-id,
* where the type is ulong, the "ID:" prefix of the JMSCorrelationID value is (obviously) not present, and there is
* no presence of the message annotation to indicate an app-specific correlation-id.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testSentMessageWithUlongCorrelationId() throws Exception {
@@ -1524,6 +1594,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
* message-id results in an AMQP message with the expected encoding of the correlation-id,
* where the "ID:" prefix of the JMSCorrelationID value is not present, and there is
* no presence of the message annotation to indicate an app-specific correlation-id.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testSentMessageWithStringCorrelationId() throws Exception {
@@ -1536,6 +1608,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
* Tests that sending a message with a string typed correlation-id value which is a
* app-specific results in an AMQP message with the expected encoding of the correlation-id,
* and the presence of the message annotation to indicate an app-specific correlation-id.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testSentMessageWithAppSpecificStringCorrelationId() throws Exception {
@@ -1590,6 +1664,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
* Tests that receiving a message with a string typed message-id, and then sending a message which
* uses the result of calling getJMSMessageID as the value for setJMSCorrelationId results in
* transmission of the expected AMQP message content.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageWithStringMessageIdAndSendValueAsCorrelationId() throws Exception {
@@ -1600,6 +1676,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
* Tests that receiving a message with a UUID typed message-id, and then sending a message which
* uses the result of calling getJMSMessageID as the value for setJMSCorrelationId results in
* transmission of the expected AMQP message content.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageWithUUIDMessageIdAndSendValueAsCorrelationId() throws Exception {
@@ -1610,6 +1688,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
* Tests that receiving a message with a ulong typed message-id, and then sending a message which
* uses the result of calling getJMSMessageID as the value for setJMSCorrelationId results in
* transmission of the expected AMQP message content.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageWithUlongMessageIdAndSendValueAsCorrelationId() throws Exception {
@@ -1620,6 +1700,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
* Tests that receiving a message with a binary typed message-id, and then sending a message which
* uses the result of calling getJMSMessageID as the value for setJMSCorrelationId results in
* transmission of the expected AMQP message content.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageWithBinaryMessageIdAndSendValueAsCorrelationId() throws Exception {
@@ -1691,6 +1773,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
* Tests that when receiving a message with the group-id, reply-to-group-id, and group-sequence
* fields of the AMQP properties section set, that the expected JMSX or JMS_AMQP properties
* are present, and the expected values are returned when retrieved from the JMS message.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceivedMessageWithGroupRelatedPropertiesSet() throws Exception {
@@ -1766,6 +1850,8 @@ public class MessageIntegrationTest extends QpidJmsTestCase
* Tests that when sending a message with the JMSXGroupID, JMSXGroupSeq, and JMS_AMQP_REPLY_TO_GROUP_ID
* properties of the JMS message set, that the expected values are included in the fields of
* the AMQP message emitted.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testSendMessageWithGroupRelatedPropertiesSet() throws Exception {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java
index 1cc54b3..2dd723b 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java
@@ -194,6 +194,8 @@ public class ProducerIntegrationTest extends QpidJmsTestCase {
/**
* Test that when a message is sent the JMSDestination header is set to
* the Destination used by the producer.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testSendingMessageSetsJMSDestination() throws Exception {
@@ -273,6 +275,8 @@ public class ProducerIntegrationTest extends QpidJmsTestCase {
/**
* Test that after sending a message with the disableMessageTimestamp hint set, the
* message object has a 0 JMSTimestamp value, and no creation-time field value was set.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testSendingMessageWithDisableMessageTimestampHint() throws Exception {
@@ -415,6 +419,8 @@ public class ProducerIntegrationTest extends QpidJmsTestCase {
/**
* Test that when a message is sent with default priority of 4, the emitted AMQP message has no value in the header
* priority field, since the default for that field is already 4.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testDefaultPriorityProducesMessagesWithoutPriorityField() throws Exception {
@@ -451,6 +457,8 @@ public class ProducerIntegrationTest extends QpidJmsTestCase {
/**
* Test that when a message is sent with a non-default priority, the emitted AMQP message has that value in the
* header priority field, and the JMS message has had JMSPriority set.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testNonDefaultPriorityProducesMessagesWithPriorityFieldAndSetsJMSPriority() throws Exception {
@@ -489,6 +497,8 @@ public class ProducerIntegrationTest extends QpidJmsTestCase {
/**
* Test that upon sending a message, the sender sets the JMSMessageID on the Message object,
* and that the value is included in the AMQP message sent by the client.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testSendingMessageSetsJMSMessageID() throws Exception {
@@ -635,6 +645,8 @@ public class ProducerIntegrationTest extends QpidJmsTestCase {
/**
* Test that after sending a message with the disableMessageID hint set, the message
* object has a null JMSMessageID value, and no message-id field value was set.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testSendingMessageWithDisableMessageIDHint() throws Exception {
@@ -645,6 +657,8 @@ public class ProducerIntegrationTest extends QpidJmsTestCase {
* Test that after sending a message with the disableMessageID hint set, which already had
* a JMSMessageID value, that the message object then has a null JMSMessageID value, and no
* message-id field value was set.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testSendingMessageWithDisableMessageIDHintAndExistingMessageID() throws Exception {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SaslIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SaslIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SaslIntegrationTest.java
index c41416b..c51b8f3 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SaslIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SaslIntegrationTest.java
@@ -134,6 +134,8 @@ public class SaslIntegrationTest extends QpidJmsTestCase {
/**
* Add a small delay after the SASL process fails, test peer will throw if
* any unexpected frames arrive, such as erroneous open+close.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testWaitForUnexpectedFramesAfterSaslFailure() throws Exception {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/StreamMessageIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/StreamMessageIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/StreamMessageIntegrationTest.java
index ef1c89d..2ac37ac 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/StreamMessageIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/StreamMessageIntegrationTest.java
@@ -57,6 +57,8 @@ public class StreamMessageIntegrationTest extends QpidJmsTestCase {
* Test that a message received from the test peer with an AmqpValue section containing
* a list which holds entries of the various supported entry types is returned as a
* {@link StreamMessage}, and verify the values can all be retrieved as expected.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(timeout = 20000)
public void testReceiveBasicMapMessage() throws Exception {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsBytesMessageTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsBytesMessageTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsBytesMessageTest.java
index df71e28..b2aa7b2 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsBytesMessageTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsBytesMessageTest.java
@@ -58,6 +58,8 @@ public class JmsBytesMessageTest {
/**
* Test that calling {@link BytesMessage#getBodyLength()} on a new message which has been
* populated and {@link BytesMessage#reset()} causes the length to be reported correctly.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testResetOnNewlyPopulatedBytesMessageUpdatesBodyLength() throws Exception {
@@ -71,6 +73,8 @@ public class JmsBytesMessageTest {
/**
* Test that attempting to call {@link BytesMessage#getBodyLength()} on a new message causes
* a {@link MessageNotReadableException} to be thrown due to being write-only.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(expected = MessageNotReadableException.class)
public void testGetBodyLengthOnNewMessageThrowsMessageNotReadableException() throws Exception {
@@ -109,6 +113,8 @@ public class JmsBytesMessageTest {
/**
* Test that attempting to write bytes to a received message (without calling {@link BytesMessage#clearBody()} first)
* causes a {@link MessageNotWriteableException} to be thrown due to being read-only.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(expected = MessageNotWriteableException.class)
public void testReceivedBytesMessageThrowsMessageNotWriteableExceptionOnWriteBytes() throws Exception {
@@ -123,6 +129,8 @@ public class JmsBytesMessageTest {
/**
* Test that attempting to read bytes from a new message (without calling {@link BytesMessage#reset()} first) causes a
* {@link MessageNotReadableException} to be thrown due to being write-only.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(expected = MessageNotReadableException.class)
public void testNewBytesMessageThrowsMessageNotReadableOnReadBytes() throws Exception {
@@ -134,6 +142,8 @@ public class JmsBytesMessageTest {
/**
* Test that calling {@link BytesMessage#clearBody()} causes a received
* message to become writable
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testClearBodyOnReceivedBytesMessageMakesMessageWritable() throws Exception {
@@ -150,6 +160,8 @@ public class JmsBytesMessageTest {
/**
* Test that calling {@link BytesMessage#clearBody()} of a received message
* causes the facade input stream to be empty and body length to return 0.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testClearBodyOnReceivedBytesMessageClearsFacadeInputStream() throws Exception {
@@ -169,6 +181,8 @@ public class JmsBytesMessageTest {
/**
* Test that attempting to call {@link BytesMessage#getBodyLength()} on a received message after calling
* {@link BytesMessage#clearBody()} causes {@link MessageNotReadableException} to be thrown due to being write-only.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testGetBodyLengthOnClearedReceivedMessageThrowsMessageNotReadableException() throws Exception {
@@ -191,6 +205,8 @@ public class JmsBytesMessageTest {
/**
* Test that calling {@link BytesMessage#reset()} causes a write-only
* message to become read-only
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testResetOnReceivedBytesMessageResetsMarker() throws Exception {
@@ -217,6 +233,8 @@ public class JmsBytesMessageTest {
/**
* Test that calling {@link BytesMessage#reset()} on a new message which has been populated
* causes the marker to be reset and makes the message read-only
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testResetOnNewlyPopulatedBytesMessageResetsMarkerAndMakesReadable() throws Exception {
@@ -239,6 +257,8 @@ public class JmsBytesMessageTest {
/**
* Verify that nothing is read when {@link BytesMessage#readBytes(byte[])} is
* called with a zero length destination array.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testReadBytesWithZeroLengthDestination() throws Exception {
@@ -250,6 +270,8 @@ public class JmsBytesMessageTest {
/**
* Verify that when {@link BytesMessage#readBytes(byte[], int)} is called
* with a negative length that an {@link IndexOutOfBoundsException} is thrown.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(expected=IndexOutOfBoundsException.class)
public void testReadBytesWithNegativeLengthThrowsIOOBE() throws Exception
@@ -263,6 +285,8 @@ public class JmsBytesMessageTest {
* Verify that when {@link BytesMessage#readBytes(byte[], int)} is called
* with a length that is greater than the size of the provided array,
* an {@link IndexOutOfBoundsException} is thrown.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(expected=IndexOutOfBoundsException.class)
public void testReadBytesWithLengthGreatThanArraySizeThrowsIOOBE() throws Exception {
@@ -274,6 +298,8 @@ public class JmsBytesMessageTest {
/**
* Test that writing a null using {@link BytesMessage#writeObject(Object)}
* results in a NPE being thrown.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(expected=NullPointerException.class)
public void testWriteObjectWithNullThrowsNPE() throws Exception {
@@ -284,6 +310,8 @@ public class JmsBytesMessageTest {
/**
* Test that writing a null using {@link BytesMessage#writeObject(Object)}
* results in an {@link MessageFormatException} being thrown.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(expected=MessageFormatException.class)
public void testWriteObjectWithIllegalTypeThrowsMFE() throws Exception {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMapMessageTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMapMessageTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMapMessageTest.java
index bbfc983..58a0ee9 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMapMessageTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMapMessageTest.java
@@ -63,6 +63,8 @@ public class JmsMapMessageTest {
/**
* Test that we are able to retrieve the names and values of map entries on a received
* message
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testGetMapNamesUsingReceivedMessageReturnsExpectedEnumeration() throws Exception {
@@ -89,6 +91,8 @@ public class JmsMapMessageTest {
/**
* Test that we enforce the requirement that map message key names not be null or the empty
* string.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetObjectWithNullOrEmptyKeyNameThrowsIAE() throws Exception {
@@ -111,6 +115,8 @@ public class JmsMapMessageTest {
/**
* Test that we are not able to write to a received message without calling
* {@link JmsMapMessage#clearBody()}
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testReceivedMessageIsReadOnlyAndThrowsMNWE() throws Exception {
@@ -130,6 +136,8 @@ public class JmsMapMessageTest {
/**
* Test that calling {@link JmsMapMessage#clearBody()} makes a received message writable
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testClearBodyMakesReceivedMessageWritable() throws Exception {
@@ -149,6 +157,8 @@ public class JmsMapMessageTest {
/**
* Test that calling {@link JmsMapMessage#clearBody()} clears the underlying message body
* map.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testClearBodyClearsUnderlyingMessageMap() throws Exception {
@@ -169,6 +179,8 @@ public class JmsMapMessageTest {
* fashion as <primitive>.valueOf(String).
*
* Test that this is the case.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testGetMissingMapEntryResultsInExpectedBehaviour() throws Exception {
@@ -201,6 +213,8 @@ public class JmsMapMessageTest {
/**
* Test that the {@link JmsMapMessage#setObject(String, Object)} method rejects Objects of
* unexpected types
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(expected=MessageFormatException.class)
public void testSetObjectWithIllegalTypeThrowsMFE() throws Exception {
@@ -288,6 +302,8 @@ public class JmsMapMessageTest {
/**
* Set a String, then retrieve it as all of the legal type combinations to verify it is
* parsed correctly
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetStringGetLegal() throws Exception {
@@ -335,6 +351,8 @@ public class JmsMapMessageTest {
/**
* Set a String, then retrieve it as all of the illegal type combinations to verify it fails
* as expected
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetStringGetIllegal() throws Exception {
@@ -354,6 +372,8 @@ public class JmsMapMessageTest {
/**
* Set a boolean, then retrieve it as all of the legal type combinations to verify it is
* parsed correctly
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetBooleanGetLegal() throws Exception {
@@ -376,6 +396,8 @@ public class JmsMapMessageTest {
/**
* Set a boolean, then retrieve it as all of the illegal type combinations to verify it
* fails as expected
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetBooleanGetIllegal() throws Exception {
@@ -401,6 +423,8 @@ public class JmsMapMessageTest {
/**
* Set a byte, then retrieve it as all of the legal type combinations to verify it is parsed
* correctly
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetByteGetLegalProperty() throws Exception {
@@ -421,6 +445,8 @@ public class JmsMapMessageTest {
/**
* Set a byte, then retrieve it as all of the illegal type combinations to verify it is
* fails as expected
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetByteGetIllegal() throws Exception {
@@ -443,6 +469,8 @@ public class JmsMapMessageTest {
/**
* Set a short, then retrieve it as all of the legal type combinations to verify it is
* parsed correctly
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetShortGetLegal() throws Exception {
@@ -462,6 +490,8 @@ public class JmsMapMessageTest {
/**
* Set a short, then retrieve it as all of the illegal type combinations to verify it fails
* as expected
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetShortGetIllegal() throws Exception {
@@ -485,6 +515,8 @@ public class JmsMapMessageTest {
/**
* Set an int, then retrieve it as all of the legal type combinations to verify it is parsed
* correctly
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetIntGetLegal() throws Exception {
@@ -503,6 +535,8 @@ public class JmsMapMessageTest {
/**
* Set an int, then retrieve it as all of the illegal type combinations to verify it fails
* as expected
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetIntGetIllegal() throws Exception {
@@ -527,6 +561,8 @@ public class JmsMapMessageTest {
/**
* Set a long, then retrieve it as all of the legal type combinations to verify it is parsed
* correctly
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetLongGetLegal() throws Exception {
@@ -544,6 +580,8 @@ public class JmsMapMessageTest {
/**
* Set an long, then retrieve it as all of the illegal type combinations to verify it fails
* as expected
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetLongGetIllegal() throws Exception {
@@ -569,6 +607,8 @@ public class JmsMapMessageTest {
/**
* Set a float, then retrieve it as all of the legal type combinations to verify it is
* parsed correctly
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetFloatGetLegal() throws Exception {
@@ -587,6 +627,8 @@ public class JmsMapMessageTest {
/**
* Set a float, then retrieve it as all of the illegal type combinations to verify it fails
* as expected
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetFloatGetIllegal() throws Exception {
@@ -611,6 +653,8 @@ public class JmsMapMessageTest {
/**
* Set a double, then retrieve it as all of the legal type combinations to verify it is
* parsed correctly
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetDoubleGetLegal() throws Exception {
@@ -628,6 +672,8 @@ public class JmsMapMessageTest {
/**
* Set a double, then retrieve it as all of the illegal type combinations to verify it fails
* as expected
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetDoubleGetIllegal() throws Exception {
@@ -653,6 +699,8 @@ public class JmsMapMessageTest {
/**
* Set a char, then retrieve it as all of the legal type combinations to verify it is parsed
* correctly
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetCharGetLegal() throws Exception {
@@ -670,6 +718,8 @@ public class JmsMapMessageTest {
/**
* Set a char, then retrieve it as all of the illegal type combinations to verify it fails
* as expected
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetCharGetIllegal() throws Exception {
@@ -695,6 +745,8 @@ public class JmsMapMessageTest {
/**
* Set bytes, then retrieve it as all of the legal type combinations to verify it is parsed
* correctly
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetBytesGetLegal() throws Exception {
@@ -710,6 +762,8 @@ public class JmsMapMessageTest {
/**
* Set bytes, then retrieve it as all of the illegal type combinations to verify it fails as
* expected
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetBytesGetIllegal() throws Exception {
@@ -773,6 +827,8 @@ public class JmsMapMessageTest {
/**
* Verify that setting bytes takes a copy of the array. Set bytes, then modify them, then
* retrieve the map entry and verify the two differ.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetBytesTakesSnapshot() throws Exception {
@@ -797,6 +853,8 @@ public class JmsMapMessageTest {
/**
* Verify that getting bytes returns a copy of the array. Set bytes, then get them, modify
* the retrieved value, then get them again and verify the two differ.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testGetBytesReturnsSnapshot() throws Exception {
@@ -825,6 +883,8 @@ public class JmsMapMessageTest {
/**
* Verify that setting bytes takes a copy of the array. Set bytes, then modify them, then
* retrieve the map entry and verify the two differ.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetBytesWithOffsetAndLength() throws Exception {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java
index 2726810..4aaf1e5 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java
@@ -1169,6 +1169,8 @@ public class JmsMessageTest {
* When a property is not set, the behaviour of JMS specifies that it is equivalent to a null value,
* and the primitive property accessors should behave in the same fashion as <primitive>.valueOf(String).
* Test that this is the case.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testGetMissingPrimitivePropertyResultsInExpectedBehaviour() throws Exception {
@@ -1206,6 +1208,8 @@ public class JmsMessageTest {
* {@link Character#isJavaLetter(char)} is true, as described in
* {@link javax.jms.Message}. Verify an IAE is thrown if setting a property
* beginning with a non-letter character.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetPropertyWithNonLetterAsFirstCharacterThrowsIAE() throws Exception {
@@ -1223,6 +1227,8 @@ public class JmsMessageTest {
* for which {@link Character#isJavaLetterOrDigit(char)} is true, as
* described in {@link javax.jms.Message}. Verify an IAE is thrown if
* setting a property continuing with a non-letter-or-digit character.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetPropertyWithNonLetterOrDigitCharacterThrowsIAE() throws Exception {
@@ -1259,6 +1265,8 @@ public class JmsMessageTest {
* Property 'identifiers' (i.e. names) are not allowed to be NULL, TRUE, or
* FALSE, as described in {@link javax.jms.Message}. Verify an IAE is thrown
* if setting a property with these values.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetPropertyWithNameNULL() throws Exception {
@@ -1274,6 +1282,8 @@ public class JmsMessageTest {
* Property 'identifiers' (i.e. names) are not allowed to be NULL, TRUE, or
* FALSE, as described in {@link javax.jms.Message}. Verify an IAE is thrown
* if setting a property with these values.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetPropertyWithNameTRUE() throws Exception {
@@ -1289,6 +1299,8 @@ public class JmsMessageTest {
* Property 'identifiers' (i.e. names) are not allowed to be NULL, TRUE, or
* FALSE, as described in {@link javax.jms.Message}. Verify an IAE is thrown
* if setting a property with these values.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetPropertyWithNameFALSE() throws Exception {
@@ -1305,6 +1317,8 @@ public class JmsMessageTest {
* BETWEEN, LIKE, IN, IS, or ESCAPE, as described in
* {@link javax.jms.Message}. Verify an IAE is thrown if setting a property
* with these values.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetPropertyWithNameNOT() throws Exception {
@@ -1321,6 +1335,8 @@ public class JmsMessageTest {
* BETWEEN, LIKE, IN, IS, or ESCAPE, as described in
* {@link javax.jms.Message}. Verify an IAE is thrown if setting a property
* with these values.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetPropertyWithNameAND() throws Exception {
@@ -1337,6 +1353,8 @@ public class JmsMessageTest {
* BETWEEN, LIKE, IN, IS, or ESCAPE, as described in
* {@link javax.jms.Message}. Verify an IAE is thrown if setting a property
* with these values.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetPropertyWithNameOR() throws Exception {
@@ -1353,6 +1371,8 @@ public class JmsMessageTest {
* BETWEEN, LIKE, IN, IS, or ESCAPE, as described in
* {@link javax.jms.Message}. Verify an IAE is thrown if setting a property
* with these values.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetPropertyWithNameBETWEEN() throws Exception {
@@ -1369,6 +1389,8 @@ public class JmsMessageTest {
* BETWEEN, LIKE, IN, IS, or ESCAPE, as described in
* {@link javax.jms.Message}. Verify an IAE is thrown if setting a property
* with these values.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetPropertyWithNameLIKE() throws Exception {
@@ -1385,6 +1407,8 @@ public class JmsMessageTest {
* BETWEEN, LIKE, IN, IS, or ESCAPE, as described in
* {@link javax.jms.Message}. Verify an IAE is thrown if setting a property
* with these values.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetPropertyWithNameIN() throws Exception {
@@ -1401,6 +1425,8 @@ public class JmsMessageTest {
* BETWEEN, LIKE, IN, IS, or ESCAPE, as described in
* {@link javax.jms.Message}. Verify an IAE is thrown if setting a property
* with these values.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetPropertyWithNameIS() throws Exception {
@@ -1417,6 +1443,8 @@ public class JmsMessageTest {
* BETWEEN, LIKE, IN, IS, or ESCAPE, as described in
* {@link javax.jms.Message}. Verify an IAE is thrown if setting a property
* with these values.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetPropertyWithNameESCAPE() throws Exception {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsObjectMessageTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsObjectMessageTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsObjectMessageTest.java
index 720aaaa..f116396 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsObjectMessageTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsObjectMessageTest.java
@@ -52,6 +52,8 @@ public class JmsObjectMessageTest {
/**
* Test that attempting to write bytes to a received message (without calling {@link ObjectMessage#clearBody()} first)
* causes a {@link MessageNotWriteableException} to be thrown due to being read-only.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testReceivedObjectMessageThrowsMessageNotWriteableExceptionOnSetObject() throws Exception {
@@ -71,6 +73,8 @@ public class JmsObjectMessageTest {
/**
* Test that calling {@link ObjectMessage#toString()} returns a meaningful value
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testToString() throws Exception {
@@ -86,6 +90,8 @@ public class JmsObjectMessageTest {
/**
* Test that calling {@link ObjectMessage#clearBody()} causes a received
* message to become writable
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testClearBodyOnReceivedObjectMessageMakesMessageWritable() throws Exception {
@@ -103,6 +109,8 @@ public class JmsObjectMessageTest {
/**
* Test that calling {@link ObjectMessage#clearBody()} of a received message
* causes the body of the underlying message facade to be emptied.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testClearBodyOnReceivedObjectMessageClearsUnderlyingMessageBody() throws Exception {
@@ -125,6 +133,8 @@ public class JmsObjectMessageTest {
/**
* Test that setting an object on a new message and later getting the value, returns an
* equal but different object that does not pick up intermediate changes to the set object.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetThenGetObjectReturnsSnapshot() throws Exception
@@ -162,6 +172,8 @@ public class JmsObjectMessageTest {
/**
* Test that setting an object on a new message which contains non-serializable content results
* in an {@link MessageFormatException} being thrown due to failure to encode the object.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetObjectWithNonSerializableThrowsJMSMFE() throws Exception {
@@ -179,17 +191,16 @@ public class JmsObjectMessageTest {
}
}
- //Test class
- private static class NotSerializable
- {
- public NotSerializable()
- {
- }
+ // Test class
+ private static class NotSerializable {
+ public NotSerializable() {}
}
/**
* Test that failure during deserialization of an object in a message results
* in an {@link MessageFormatException} being throw.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test(expected=MessageFormatException.class)
public void testGetObjectWithFailedDeserialisationThrowsJMSMFE() throws Exception {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsStreamMessageTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsStreamMessageTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsStreamMessageTest.java
index f1c9efe..40849e9 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsStreamMessageTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsStreamMessageTest.java
@@ -107,6 +107,8 @@ public class JmsStreamMessageTest {
*
* Write bytes, then deliberately try to retrieve them as illegal types, then check they can
* be successfully read.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testIllegalTypeConvesionFailureDoesNotIncrementPosition1() throws Exception {
@@ -142,6 +144,8 @@ public class JmsStreamMessageTest {
*
* Write String, then deliberately try illegal retrieval as bytes, then check it can be
* successfully read.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testIllegalTypeConvesionFailureDoesNotIncrementPosition2() throws Exception {
@@ -164,6 +168,8 @@ public class JmsStreamMessageTest {
* Test that this is the case, and in doing show demonstrate that primitive type conversion
* failure does not increment the stream position, as shown by not hitting the end of the
* stream unexpectedly.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testNullStreamEntryResultsInExpectedBehaviour() throws Exception {
@@ -199,7 +205,6 @@ public class JmsStreamMessageTest {
streamMessage.reset(); // need to reset as read was a success
}
-
@Test
public void testClearBodyAppliesCorrectState() throws JMSException {
JmsStreamMessage streamMessage = factory.createStreamMessage();
@@ -300,6 +305,8 @@ public class JmsStreamMessageTest {
/**
* Write bytes, then retrieve them as all of the legal type combinations
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testWriteBytesReadLegal() throws Exception {
@@ -320,6 +327,8 @@ public class JmsStreamMessageTest {
/**
* Write bytes, then retrieve them as all of the illegal type combinations to verify it
* fails as expected
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testWriteBytesReadIllegal() throws Exception {
@@ -470,6 +479,8 @@ public class JmsStreamMessageTest {
*
* Test that these restrictions are met, and don't interfere with completing the readBytes
* usage.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testReadObjectAfterPartialReadBytesThrowsMFE() throws Exception {
@@ -506,6 +517,8 @@ public class JmsStreamMessageTest {
/**
* Verify that setting bytes takes a copy of the array. Set bytes subset, then retrieve the
* entry and verify the are different arrays and the subsets are equal.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testWriteBytesWithOffsetAndLength() throws Exception {
@@ -547,6 +560,8 @@ public class JmsStreamMessageTest {
/**
* Set a boolean, then retrieve it as all of the legal type combinations to verify it is
* parsed correctly
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testWriteBooleanReadLegal() throws Exception {
@@ -564,6 +579,8 @@ public class JmsStreamMessageTest {
/**
* Set a boolean, then retrieve it as all of the illegal type combinations to verify it
* fails as expected
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetBooleanGetIllegal() throws Exception {
@@ -601,6 +618,8 @@ public class JmsStreamMessageTest {
/**
* Set a string, then retrieve it as all of the legal type combinations to verify it is
* parsed correctly
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testWriteStringReadLegal() throws Exception {
@@ -647,6 +666,8 @@ public class JmsStreamMessageTest {
/**
* Set a string, then retrieve it as all of the illegal type combinations to verify it fails
* as expected
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testWriteStringReadIllegal() throws Exception {
@@ -693,6 +714,8 @@ public class JmsStreamMessageTest {
/**
* Set a byte, then retrieve it as all of the legal type combinations to verify it is parsed
* correctly
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testWriteByteReadLegal() throws Exception {
@@ -713,6 +736,8 @@ public class JmsStreamMessageTest {
/**
* Set a byte, then retrieve it as all of the illegal type combinations to verify it fails
* as expected
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testWriteByteReadIllegal() throws Exception {
@@ -747,6 +772,8 @@ public class JmsStreamMessageTest {
/**
* Set a short, then retrieve it as all of the legal type combinations to verify it is
* parsed correctly
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testWriteShortReadLegal() throws Exception {
@@ -766,6 +793,8 @@ public class JmsStreamMessageTest {
/**
* Set a short, then retrieve it as all of the illegal type combinations to verify it fails
* as expected
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testWriteShortReadIllegal() throws Exception {
@@ -801,6 +830,8 @@ public class JmsStreamMessageTest {
/**
* Set a char, then retrieve it as all of the legal type combinations to verify it is parsed
* correctly
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testWriteCharReadLegal() throws Exception {
@@ -818,6 +849,8 @@ public class JmsStreamMessageTest {
/**
* Set a char, then retrieve it as all of the illegal type combinations to verify it fails
* as expected
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testWriteCharReadIllegal() throws Exception {
@@ -855,6 +888,8 @@ public class JmsStreamMessageTest {
/**
* Set an int, then retrieve it as all of the legal type combinations to verify it is parsed
* correctly
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testWriteIntReadLegal() throws Exception {
@@ -873,6 +908,8 @@ public class JmsStreamMessageTest {
/**
* Set an int, then retrieve it as all of the illegal type combinations to verify it fails
* as expected
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testWriteIntReadIllegal() throws Exception {
@@ -909,6 +946,8 @@ public class JmsStreamMessageTest {
/**
* Set a long, then retrieve it as all of the legal type combinations to verify it is parsed
* correctly
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testWriteLongReadLegal() throws Exception {
@@ -926,6 +965,8 @@ public class JmsStreamMessageTest {
/**
* Set a long, then retrieve it as all of the illegal type combinations to verify it fails
* as expected
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testWriteLongReadIllegal() throws Exception {
@@ -963,6 +1004,8 @@ public class JmsStreamMessageTest {
/**
* Set a float, then retrieve it as all of the legal type combinations to verify it is
* parsed correctly
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testWriteFloatReadLegal() throws Exception {
@@ -981,6 +1024,8 @@ public class JmsStreamMessageTest {
/**
* Set a float, then retrieve it as all of the illegal type combinations to verify it fails
* as expected
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testWriteFloatReadIllegal() throws Exception {
@@ -1017,6 +1062,8 @@ public class JmsStreamMessageTest {
/**
* Set a double, then retrieve it as all of the legal type combinations to verify it is
* parsed correctly
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testWriteDoubleReadLegal() throws Exception {
@@ -1034,6 +1081,8 @@ public class JmsStreamMessageTest {
/**
* Set a double, then retrieve it as all of the illegal type combinations to verify it fails
* as expected
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testWriteDoubleReadIllegal() throws Exception {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/197d1227/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacadeTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacadeTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacadeTest.java
index 67d8af3..ce7cf4d 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacadeTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsBytesMessageFacadeTest.java
@@ -137,6 +137,8 @@ public class AmqpJmsBytesMessageFacadeTest extends AmqpJmsMessageTypesTestCase {
/**
* Test that copying a new messages which has been written to creates the
* non-empty data section of the underlying message.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testCopyOnPopulatedNewMessageCreatesDataSection() throws Exception {
@@ -159,6 +161,8 @@ public class AmqpJmsBytesMessageFacadeTest extends AmqpJmsMessageTypesTestCase {
/**
* Test that copying a new messages which has not been written to creates the
* (empty) data section of the underlying message on the copy.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testCopyOfNewMessageDoesNotCreateDataSection() throws Exception {
@@ -399,6 +403,8 @@ public class AmqpJmsBytesMessageFacadeTest extends AmqpJmsMessageTypesTestCase {
/**
* Test that setting bytes on a received message results in the expected content in the body section
* of the underlying message and returned by a new InputStream requested from the message.
+ *
+ * @throws Exception if an error occurs during the test.
*/
@Test
public void testSetGetBodyOnReceivedMessage() throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org