You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2009/06/25 06:45:09 UTC
svn commit: r788250 - in /camel/trunk/components/camel-xmpp/src:
main/java/org/apache/camel/component/xmpp/
test/java/org/apache/camel/component/xmpp/
Author: hadrian
Date: Thu Jun 25 04:45:09 2009
New Revision: 788250
URL: http://svn.apache.org/viewvc?rev=788250&view=rev
Log:
CAMEL-1078. Removed XmppExchange specialization.
Removed:
camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppExchange.java
Modified:
camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppMessage.java
camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
Modified: camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java?rev=788250&r1=788249&r2=788250&view=diff
==============================================================================
--- camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java (original)
+++ camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java Thu Jun 25 04:45:09 2009
@@ -27,7 +27,7 @@
import org.jivesoftware.smack.packet.Message;
/**
- * A Strategy used to convert between a Camel {@link XmppExchange} and {@link XmppMessage} to and from a
+ * A Strategy used to convert between a Camel {@link Exchange} and {@link XmppMessage} to and from a
* XMPP {@link Message}
*
* @version $Revision$
@@ -80,7 +80,7 @@
/**
* Extracts the body from the XMPP message
*/
- public Object extractBodyFromXmpp(XmppExchange exchange, Message message) {
+ public Object extractBodyFromXmpp(Exchange exchange, Message message) {
return message.getBody();
}
Modified: camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java?rev=788250&r1=788249&r2=788250&view=diff
==============================================================================
--- camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java (original)
+++ camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java Thu Jun 25 04:45:09 2009
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.xmpp;
+import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.impl.DefaultConsumer;
import org.apache.commons.logging.Log;
@@ -111,7 +112,7 @@
LOG.debug("Recieved XMPP message: " + message.getBody());
}
- XmppExchange exchange = endpoint.createExchange(message);
+ Exchange exchange = endpoint.createExchange(message);
try {
getProcessor().process(exchange);
} catch (Exception e) {
Modified: camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java?rev=788250&r1=788249&r2=788250&view=diff
==============================================================================
--- camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java (original)
+++ camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java Thu Jun 25 04:45:09 2009
@@ -24,6 +24,7 @@
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultEndpoint;
+import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.impl.DefaultHeaderFilterStrategy;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spi.HeaderFilterStrategyAware;
@@ -94,13 +95,20 @@
@Override
public Exchange createExchange(ExchangePattern pattern) {
- return new XmppExchange(this, pattern, getBinding());
+ return createExchange(pattern, null);
}
- public XmppExchange createExchange(Message message) {
- return new XmppExchange(this, getExchangePattern(), getBinding(), message);
+ public Exchange createExchange(Message message) {
+ return createExchange(getExchangePattern(), message);
}
+ private Exchange createExchange(ExchangePattern pattern, Message message) {
+ Exchange exchange = new DefaultExchange(this, getExchangePattern());
+ exchange.setProperty(Exchange.BINDING, getBinding());
+ exchange.setIn(new XmppMessage(message));
+ return exchange;
+ }
+
@Override
protected String createEndpointUri() {
return "xmpp://" + host + ":" + port + "/" + getParticipant() + "?serviceName=" + serviceName;
Modified: camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppMessage.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppMessage.java?rev=788250&r1=788249&r2=788250&view=diff
==============================================================================
--- camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppMessage.java (original)
+++ camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppMessage.java Thu Jun 25 04:45:09 2009
@@ -18,6 +18,7 @@
import java.util.Map;
+import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultMessage;
import org.jivesoftware.smack.packet.Message;
@@ -47,11 +48,6 @@
}
}
- @Override
- public XmppExchange getExchange() {
- return (XmppExchange)super.getExchange();
- }
-
/**
* Returns the underlying XMPP message
*/
@@ -71,7 +67,10 @@
@Override
protected Object createBody() {
if (xmppMessage != null) {
- return getExchange().getBinding().extractBodyFromXmpp(getExchange(), xmppMessage);
+ XmppBinding binding = (XmppBinding) getExchange().getProperty(Exchange.BINDING);
+ if (binding != null) {
+ binding.extractBodyFromXmpp(getExchange(), xmppMessage);
+ }
}
return null;
}
@@ -79,7 +78,10 @@
@Override
protected void populateInitialHeaders(Map<String, Object> map) {
if (xmppMessage != null) {
- map.putAll(getExchange().getBinding().extractHeadersFromXmpp(xmppMessage, getExchange()));
+ XmppBinding binding = (XmppBinding) getExchange().getProperty(Exchange.BINDING);
+ if (binding != null) {
+ map.putAll(binding.extractHeadersFromXmpp(xmppMessage, getExchange()));
+ }
}
}
}
Modified: camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java?rev=788250&r1=788249&r2=788250&view=diff
==============================================================================
--- camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java (original)
+++ camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppRouteTest.java Thu Jun 25 04:45:09 2009
@@ -48,7 +48,7 @@
protected static boolean enabled;
protected static String xmppUrl;
private static final transient Log LOG = LogFactory.getLog(XmppRouteTest.class);
- protected XmppExchange receivedExchange;
+ protected Exchange receivedExchange;
protected CamelContext container = new DefaultCamelContext();
protected CountDownLatch latch = new CountDownLatch(1);
protected Endpoint endpoint;
@@ -97,7 +97,7 @@
assertTrue("Did not receive the message!", received);
assertNotNull(receivedExchange);
- XmppMessage receivedMessage = receivedExchange.getIn();
+ XmppMessage receivedMessage = (XmppMessage)receivedExchange.getIn();
Assert.assertEquals("cheese header", 123, receivedMessage.getHeader("cheese"));
Object body = receivedMessage.getBody();
@@ -128,7 +128,7 @@
from(uri3).process(new Processor() {
public void process(Exchange e) {
LOG.info("Received exchange: " + e);
- receivedExchange = (XmppExchange) e;
+ receivedExchange = e;
latch.countDown();
}
});