Author: davsclaus
Date: Sat Aug 30 06:38:00 2008
New Revision: 690502
URL: http://svn.apache.org/viewvc?rev=690502&view=rev
Log:
Polished javadoc. Added unit test for sending object with jms
Added:
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java
(contents, props changed)
- copied, changed from r690476,
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsBytesMessageTest.java
Modified:
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
Modified:
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java?rev=690502&r1=690501&r2=690502&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
Sat Aug 30 06:38:00 2008
@@ -743,8 +743,6 @@
* Set to true if you want to send message using the QoS settings specified
* on the message. Normally the QoS settings used are the one configured on
* this Object.
- *
- * @param preserveMessageQos
*/
public void setPreserveMessageQos(boolean preserveMessageQos) {
this.preserveMessageQos = preserveMessageQos;
@@ -773,8 +771,6 @@
/**
* Sets the frequency that the requestMap for InOut exchanges is purged for
* timed out message exchanges
- *
- * @param requestMapPurgePollTimeMillis
*/
public void setRequestMapPurgePollTimeMillis(long
requestMapPurgePollTimeMillis) {
this.requestMapPurgePollTimeMillis = requestMapPurgePollTimeMillis;
@@ -804,8 +800,6 @@
/**
* Sets the [EMAIL PROTECTED] JmsOperations} used to deduce the [EMAIL
PROTECTED] JmsProviderMetadata} details which if none
* is customized one is lazily created on demand
- *
- * @param metadataJmsOperations
*/
public void setMetadataJmsOperations(JmsOperations metadataJmsOperations) {
this.metadataJmsOperations = metadataJmsOperations;
@@ -909,8 +903,7 @@
if (tm != null) {
listenerContainer.setTransactionManager(tm);
} else if (transacted) {
- throw new IllegalArgumentException(
- "Property transacted is
enabled but a transactionManager was not injected!");
+ throw new IllegalArgumentException("Property transacted is
enabled but a transactionManager was not injected!");
}
if (transactionName != null) {
listenerContainer.setTransactionName(transactionName);
@@ -947,7 +940,7 @@
if (isEagerLoadingOfProperties()) {
listener.setEagerLoadingOfProperties(true);
}
- // REVISIT: We really ought to change the model and let JmsProducer
+ // TODO: REVISIT: We really ought to change the model and let
JmsProducer
// and JmsConsumer have their own JmsConfiguration instance
// This way producer's and consumer's QoS can differ and be
// independently configured
Copied:
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java
(from r690476,
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsBytesMessageTest.java)
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java?p2=activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java&p1=activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsBytesMessageTest.java&r1=690476&r2=690502&rev=690502&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsBytesMessageTest.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java
Sat Aug 30 06:38:00 2008
@@ -16,78 +16,66 @@
*/
package org.apache.camel.component.jms;
-
-import java.util.Arrays;
-
-import javax.jms.BytesMessage;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Session;
-
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
+import static
org.apache.camel.component.jms.JmsComponent.jmsComponentClientAcknowledge;
import org.apache.camel.component.mock.MockEndpoint;
import org.springframework.jms.core.JmsTemplate;
import org.springframework.jms.core.MessageCreator;
-import static
org.apache.camel.component.jms.JmsComponent.jmsComponentClientAcknowledge;
-
+import javax.jms.*;
+import java.io.Serializable;
/**
* @version $Revision$
*/
-public class ConsumeJmsBytesMessageTest extends ContextTestSupport {
+public class ConsumeJmsObjectMessageTest extends ContextTestSupport {
protected JmsTemplate jmsTemplate;
private MockEndpoint endpoint;
- public void testConsumeBytesMessage() throws Exception {
+ public void testConsumeObjectMessage() throws Exception {
endpoint.expectedMessageCount(1);
jmsTemplate.setPubSubDomain(false);
- jmsTemplate.send("test.bytes", new MessageCreator() {
+ jmsTemplate.send("test.object", new MessageCreator() {
public Message createMessage(Session session) throws JMSException {
- BytesMessage bytesMessage = session.createBytesMessage();
- bytesMessage.writeByte((byte) 1);
- bytesMessage.writeByte((byte) 2);
- bytesMessage.writeByte((byte) 3);
- return bytesMessage;
+ ObjectMessage msg = session.createObjectMessage();
+
+ MyUser user = new MyUser();
+ user.setName("Claus");
+ msg.setObject(user);
+
+ return msg;
}
});
endpoint.assertIsSatisfied();
- assertCorrectBytesReceived();
+ assertCorrectObjectReceived();
}
public void testSendBytesMessage() throws Exception {
-
endpoint.expectedMessageCount(1);
- byte[] bytes = new byte[] {1, 2, 3};
-
- template.sendBody("direct:test", bytes);
+ MyUser user = new MyUser();
+ user.setName("Claus");
+ template.sendBody("direct:test", user);
endpoint.assertIsSatisfied();
- assertCorrectBytesReceived();
+ assertCorrectObjectReceived();
}
- protected void assertCorrectBytesReceived() {
+ protected void assertCorrectObjectReceived() {
Exchange exchange = endpoint.getReceivedExchanges().get(0);
JmsExchange jmsExchange = assertIsInstanceOf(JmsExchange.class,
exchange);
- byte[] bytes = exchange.getIn().getBody(byte[].class);
+ assertIsInstanceOf(ObjectMessage.class, jmsExchange.getInMessage());
- log.info("Received bytes: " + Arrays.toString(bytes));
-
- assertNotNull("Should have received a bytes message!", bytes);
- assertIsInstanceOf(BytesMessage.class, jmsExchange.getInMessage());
- assertEquals("Wrong byte 1", 1, bytes[0]);
- assertEquals("Wrong payload lentght", 3, bytes.length);
+ MyUser user = exchange.getIn().getBody(MyUser.class);
+ assertEquals("Claus", user.getName());
}
-
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -107,9 +95,21 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("activemq:test.bytes").to("mock:result");
- from("direct:test").to("activemq:test.bytes");
+ from("activemq:test.object").to("mock:result");
+ from("direct:test").to("activemq:test.object");
}
};
}
-}
+
+ public static class MyUser implements Serializable {
+ private String name;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+ }
+}
\ No newline at end of file
Propchange:
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
