switch to using the the AMQP message facades
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/1b10a6a7 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/1b10a6a7 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/1b10a6a7 Branch: refs/heads/master Commit: 1b10a6a72fd9ffe4e65f238570d954b2aee5a1fc Parents: 9e3b5ec Author: Robert Gemmell <rob...@apache.org> Authored: Mon Sep 29 12:16:07 2014 +0100 Committer: Robert Gemmell <rob...@apache.org> Committed: Mon Sep 29 17:16:24 2014 +0100 ---------------------------------------------------------------------- .../qpid/jms/provider/amqp/AmqpJMSVendor.java | 4 ++-- .../amqp/message/AmqpJmsMessageFactory.java | 25 +++++--------------- 2 files changed, 8 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1b10a6a7/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpJMSVendor.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpJMSVendor.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpJMSVendor.java index eba019e..fbe2b21 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpJMSVendor.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpJMSVendor.java @@ -34,9 +34,9 @@ import org.apache.qpid.jms.JmsQueue; import org.apache.qpid.jms.JmsTemporaryQueue; import org.apache.qpid.jms.JmsTemporaryTopic; import org.apache.qpid.jms.JmsTopic; -import org.apache.qpid.jms.message.JmsDefaultMessageFactory; import org.apache.qpid.jms.message.JmsMessage; import org.apache.qpid.jms.message.JmsMessageFactory; +import org.apache.qpid.jms.provider.amqp.message.AmqpJmsMessageFactory; import org.apache.qpid.proton.jms.JMSVendor; /** @@ -48,7 +48,7 @@ public class AmqpJMSVendor extends JMSVendor { public static final AmqpJMSVendor INSTANCE = new AmqpJMSVendor(); - private final JmsMessageFactory factory = new JmsDefaultMessageFactory(); + private final JmsMessageFactory factory = new AmqpJmsMessageFactory(); private AmqpJMSVendor() { } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1b10a6a7/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFactory.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFactory.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFactory.java index 882c2ac..3a918de 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFactory.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFactory.java @@ -31,12 +31,6 @@ import org.apache.qpid.jms.message.JmsStreamMessage; import org.apache.qpid.jms.message.JmsTextMessage; import org.apache.qpid.jms.message.facade.JmsObjectMessageFacade; import org.apache.qpid.jms.message.facade.JmsTextMessageFacade; -import org.apache.qpid.jms.message.facade.defaults.JmsDefaultBytesMessageFacade; -import org.apache.qpid.jms.message.facade.defaults.JmsDefaultMapMessageFacade; -import org.apache.qpid.jms.message.facade.defaults.JmsDefaultMessageFacade; -import org.apache.qpid.jms.message.facade.defaults.JmsDefaultObjectMessageFacade; -import org.apache.qpid.jms.message.facade.defaults.JmsDefaultStreamMessageFacade; -import org.apache.qpid.jms.message.facade.defaults.JmsDefaultTextMessageFacade; import org.apache.qpid.jms.provider.amqp.AmqpConnection; /** @@ -66,8 +60,7 @@ public class AmqpJmsMessageFactory implements JmsMessageFactory { @Override public JmsMessage createMessage() throws JMSException { - //return new JmsMessage(new AmqpJmsMessageFacade(connection)); - return new JmsMessage(new JmsDefaultMessageFacade()); + return new JmsMessage(new AmqpJmsMessageFacade(connection)); } @Override @@ -78,8 +71,7 @@ public class AmqpJmsMessageFactory implements JmsMessageFactory { @Override public JmsTextMessage createTextMessage(String payload) throws JMSException { - // JmsTextMessageFacade facade = new AmqpJmsTextMessageFacade(connection); - JmsTextMessageFacade facade = new JmsDefaultTextMessageFacade(); + JmsTextMessageFacade facade = new AmqpJmsTextMessageFacade(connection); if (payload != null) { facade.setText(payload); @@ -90,20 +82,17 @@ public class AmqpJmsMessageFactory implements JmsMessageFactory { @Override public JmsBytesMessage createBytesMessage() throws JMSException { - // return new JmsBytesMessage(new AmqpJmsBytesMessageFacade(connection)); - return new JmsBytesMessage(new JmsDefaultBytesMessageFacade()); + return new JmsBytesMessage(new AmqpJmsBytesMessageFacade(connection)); } @Override public JmsMapMessage createMapMessage() throws JMSException { - // return new JmsMapMessage(new AmqpJmsMapMessageFacade(connection)); - return new JmsMapMessage(new JmsDefaultMapMessageFacade()); + return new JmsMapMessage(new AmqpJmsMapMessageFacade(connection)); } @Override public JmsStreamMessage createStreamMessage() throws JMSException { - // return new JmsStreamMessage(new AmqpJmsStreamMessageFacade(connection)); - return new JmsStreamMessage(new JmsDefaultStreamMessageFacade()); + return new JmsStreamMessage(new AmqpJmsStreamMessageFacade(connection)); } @Override @@ -113,9 +102,7 @@ public class AmqpJmsMessageFactory implements JmsMessageFactory { @Override public JmsObjectMessage createObjectMessage(Serializable payload) throws JMSException { - - // JmsObjectMessageFacade facade = new AmqpJmsSerializedObjectMessageFacade(connection); - JmsObjectMessageFacade facade = new JmsDefaultObjectMessageFacade(); + JmsObjectMessageFacade facade = new AmqpJmsObjectMessageFacade(connection); if (payload != null) { try { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
