Author: hadrian
Date: Tue Jun 23 21:24:39 2009
New Revision: 787840
URL: http://svn.apache.org/viewvc?rev=787840&view=rev
Log:
CAMEL-1078. Removed IrcExchange.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcBinding.java
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcExchange.java
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcMessage.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java?rev=787840&r1=787839&r2=787840&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/Exchange.java Tue Jun
23 21:24:39 2009
@@ -97,6 +97,8 @@
String TRANSACTED = "CamelTransacted";
String ROLLBACK_ONLY = "CamelRollbackOnly";
+ String BINDING = "CamelBinding";
+
/**
* Returns the {...@link ExchangePattern} (MEP) of this exchange.
*
Modified:
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcBinding.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcBinding.java?rev=787840&r1=787839&r2=787840&view=diff
==============================================================================
---
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcBinding.java
(original)
+++
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcBinding.java
Tue Jun 23 21:24:39 2009
@@ -16,9 +16,10 @@
*/
package org.apache.camel.component.irc;
-public class IrcBinding {
+import org.apache.camel.Exchange;
- public Object extractBodyFromIrc(IrcExchange exchange, IrcMessage message)
{
+public class IrcBinding {
+ public Object extractBodyFromIrc(Exchange exchange, IrcMessage message) {
String type = message.getMessageType();
String text = message.getMessage();
if (text != null) {
Modified:
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java?rev=787840&r1=787839&r2=787840&view=diff
==============================================================================
---
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java
(original)
+++
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java
Tue Jun 23 21:24:39 2009
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.irc;
+import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.impl.DefaultConsumer;
import org.apache.commons.logging.Log;
@@ -78,7 +79,7 @@
@Override
public void onNick(IRCUser user, String newNick) {
if (configuration.isOnNick()) {
- IrcExchange exchange = endpoint.createOnNickExchange(user,
newNick);
+ Exchange exchange = endpoint.createOnNickExchange(user,
newNick);
try {
getProcessor().process(exchange);
} catch (Exception e) {
@@ -90,7 +91,7 @@
@Override
public void onQuit(IRCUser user, String msg) {
if (configuration.isOnQuit()) {
- IrcExchange exchange = endpoint.createOnQuitExchange(user,
msg);
+ Exchange exchange = endpoint.createOnQuitExchange(user, msg);
try {
getProcessor().process(exchange);
} catch (Exception e) {
@@ -103,7 +104,7 @@
public void onJoin(String channel, IRCUser user) {
if (configuration.isOnJoin()) {
if (channel.equals(configuration.getTarget())) {
- IrcExchange exchange =
endpoint.createOnJoinExchange(channel, user);
+ Exchange exchange = endpoint.createOnJoinExchange(channel,
user);
try {
getProcessor().process(exchange);
} catch (Exception e) {
@@ -117,7 +118,7 @@
public void onKick(String channel, IRCUser user, String passiveNick,
String msg) {
if (configuration.isOnKick()) {
if (channel.equals(configuration.getTarget())) {
- IrcExchange exchange =
endpoint.createOnKickExchange(channel, user, passiveNick, msg);
+ Exchange exchange = endpoint.createOnKickExchange(channel,
user, passiveNick, msg);
try {
getProcessor().process(exchange);
} catch (Exception e) {
@@ -131,7 +132,7 @@
public void onMode(String channel, IRCUser user, IRCModeParser
modeParser) {
if (configuration.isOnMode()) {
if (channel.equals(configuration.getTarget())) {
- IrcExchange exchange =
endpoint.createOnModeExchange(channel, user, modeParser);
+ Exchange exchange = endpoint.createOnModeExchange(channel,
user, modeParser);
try {
getProcessor().process(exchange);
} catch (Exception e) {
@@ -145,7 +146,7 @@
public void onPart(String channel, IRCUser user, String msg) {
if (configuration.isOnPart()) {
if (channel.equals(configuration.getTarget())) {
- IrcExchange exchange =
endpoint.createOnPartExchange(channel, user, msg);
+ Exchange exchange = endpoint.createOnPartExchange(channel,
user, msg);
try {
getProcessor().process(exchange);
} catch (Exception e) {
@@ -159,7 +160,7 @@
public void onTopic(String channel, IRCUser user, String topic) {
if (configuration.isOnTopic()) {
if (channel.equals(configuration.getTarget())) {
- IrcExchange exchange =
endpoint.createOnTopicExchange(channel, user, topic);
+ Exchange exchange =
endpoint.createOnTopicExchange(channel, user, topic);
try {
getProcessor().process(exchange);
} catch (Exception e) {
@@ -173,7 +174,7 @@
public void onPrivmsg(String target, IRCUser user, String msg) {
if (configuration.isOnPrivmsg()) {
if (target.equals(configuration.getTarget())) {
- IrcExchange exchange =
endpoint.createOnPrivmsgExchange(target, user, msg);
+ Exchange exchange =
endpoint.createOnPrivmsgExchange(target, user, msg);
try {
getProcessor().process(exchange);
} catch (Exception e) {
Modified:
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java?rev=787840&r1=787839&r2=787840&view=diff
==============================================================================
---
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
(original)
+++
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
Tue Jun 23 21:24:39 2009
@@ -20,6 +20,7 @@
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.impl.DefaultEndpoint;
+import org.apache.camel.impl.DefaultExchange;
import org.schwering.irc.lib.IRCModeParser;
import org.schwering.irc.lib.IRCUser;
@@ -44,39 +45,65 @@
}
public Exchange createExchange(ExchangePattern pattern) {
- return new IrcExchange(this, pattern, getBinding());
+ DefaultExchange exchange = new DefaultExchange(this, pattern);
+ exchange.setProperty(Exchange.BINDING, getBinding());
+ return exchange;
}
- public IrcExchange createOnPrivmsgExchange(String target, IRCUser user,
String msg) {
- return new IrcExchange(this, getExchangePattern(), getBinding(), new
IrcMessage("PRIVMSG", target, user, msg));
+ public Exchange createOnPrivmsgExchange(String target, IRCUser user,
String msg) {
+ DefaultExchange exchange = new DefaultExchange(this,
getExchangePattern());
+ exchange.setProperty(Exchange.BINDING, getBinding());
+ exchange.setIn(new IrcMessage("PRIVMSG", target, user, msg));
+ return exchange;
}
- public IrcExchange createOnNickExchange(IRCUser user, String newNick) {
- return new IrcExchange(this, getExchangePattern(), getBinding(), new
IrcMessage("NICK", user, newNick));
+ public Exchange createOnNickExchange(IRCUser user, String newNick) {
+ DefaultExchange exchange = new DefaultExchange(this,
getExchangePattern());
+ exchange.setProperty(Exchange.BINDING, getBinding());
+ exchange.setIn(new IrcMessage("NICK", user, newNick));
+ return exchange;
}
- public IrcExchange createOnQuitExchange(IRCUser user, String msg) {
- return new IrcExchange(this, getExchangePattern(), getBinding(), new
IrcMessage("QUIT", user, msg));
+ public Exchange createOnQuitExchange(IRCUser user, String msg) {
+ DefaultExchange exchange = new DefaultExchange(this,
getExchangePattern());
+ exchange.setProperty(Exchange.BINDING, getBinding());
+ exchange.setIn(new IrcMessage("QUIT", user, msg));
+ return exchange;
}
- public IrcExchange createOnJoinExchange(String channel, IRCUser user) {
- return new IrcExchange(this, getExchangePattern(), getBinding(), new
IrcMessage("JOIN", channel, user));
+ public Exchange createOnJoinExchange(String channel, IRCUser user) {
+ DefaultExchange exchange = new DefaultExchange(this,
getExchangePattern());
+ exchange.setProperty(Exchange.BINDING, getBinding());
+ exchange.setIn(new IrcMessage("JOIN", channel, user));
+ return exchange;
}
- public IrcExchange createOnKickExchange(String channel, IRCUser user,
String whoWasKickedNick, String msg) {
- return new IrcExchange(this, getExchangePattern(), getBinding(), new
IrcMessage("KICK", channel, user, whoWasKickedNick, msg));
+ public Exchange createOnKickExchange(String channel, IRCUser user, String
whoWasKickedNick, String msg) {
+ DefaultExchange exchange = new DefaultExchange(this,
getExchangePattern());
+ exchange.setProperty(Exchange.BINDING, getBinding());
+ exchange.setIn(new IrcMessage("KICK", channel, user, whoWasKickedNick,
msg));
+ return exchange;
}
- public IrcExchange createOnModeExchange(String channel, IRCUser user,
IRCModeParser modeParser) {
- return new IrcExchange(this, getExchangePattern(), getBinding(), new
IrcMessage("MODE", channel, user, modeParser.getLine()));
+ public Exchange createOnModeExchange(String channel, IRCUser user,
IRCModeParser modeParser) {
+ DefaultExchange exchange = new DefaultExchange(this,
getExchangePattern());
+ exchange.setProperty(Exchange.BINDING, getBinding());
+ exchange.setIn(new IrcMessage("MODE", channel, user,
modeParser.getLine()));
+ return exchange;
}
- public IrcExchange createOnPartExchange(String channel, IRCUser user,
String msg) {
- return new IrcExchange(this, getExchangePattern(), getBinding(), new
IrcMessage("PART", channel, user, msg));
+ public Exchange createOnPartExchange(String channel, IRCUser user, String
msg) {
+ DefaultExchange exchange = new DefaultExchange(this,
getExchangePattern());
+ exchange.setProperty(Exchange.BINDING, getBinding());
+ exchange.setIn(new IrcMessage("PART", channel, user, msg));
+ return exchange;
}
- public IrcExchange createOnTopicExchange(String channel, IRCUser user,
String topic) {
- return new IrcExchange(this, getExchangePattern(), getBinding(), new
IrcMessage("TOPIC", channel, user, topic));
+ public Exchange createOnTopicExchange(String channel, IRCUser user, String
topic) {
+ DefaultExchange exchange = new DefaultExchange(this,
getExchangePattern());
+ exchange.setProperty(Exchange.BINDING, getBinding());
+ exchange.setIn(new IrcMessage("TOPIC", channel, user, topic));
+ return exchange;
}
public IrcProducer createProducer() throws Exception {
Modified:
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcExchange.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcExchange.java?rev=787840&r1=787839&r2=787840&view=diff
==============================================================================
---
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcExchange.java
(original)
+++
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcExchange.java
Tue Jun 23 21:24:39 2009
@@ -16,34 +16,34 @@
*/
package org.apache.camel.component.irc;
-import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.impl.DefaultExchange;
public class IrcExchange extends DefaultExchange {
- private IrcBinding binding;
public IrcExchange(IrcEndpoint endpoint, ExchangePattern pattern,
IrcBinding binding) {
super(endpoint, pattern);
- this.binding = binding;
+ setProperty(Exchange.BINDING, binding);
}
public IrcExchange(IrcEndpoint endpoint, ExchangePattern pattern,
IrcBinding binding, IrcMessage inMessage) {
this(endpoint, pattern, binding);
+ setProperty(Exchange.BINDING, binding);
setIn(inMessage);
}
public IrcExchange(DefaultExchange parent, IrcBinding binding) {
super(parent);
- this.binding = binding;
+ setProperty(Exchange.BINDING, binding);
}
public IrcBinding getBinding() {
- return binding;
+ return (IrcBinding)getProperty(Exchange.BINDING);
}
public void setBinding(IrcBinding binding) {
- this.binding = binding;
+ setProperty(Exchange.BINDING, binding);
}
@Override
Modified:
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcMessage.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcMessage.java?rev=787840&r1=787839&r2=787840&view=diff
==============================================================================
---
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcMessage.java
(original)
+++
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcMessage.java
Tue Jun 23 21:24:39 2009
@@ -18,6 +18,7 @@
import java.util.Map;
+import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultMessage;
import org.schwering.irc.lib.IRCUser;
@@ -100,15 +101,10 @@
}
@Override
- public IrcExchange getExchange() {
- return (IrcExchange)super.getExchange();
- }
-
- @Override
protected Object createBody() {
- IrcExchange ircExchange = getExchange();
- IrcBinding binding = ircExchange.getBinding();
- return binding.extractBodyFromIrc(ircExchange, this);
+ Exchange exchange = getExchange();
+ IrcBinding binding =
(IrcBinding)exchange.getProperty(Exchange.BINDING);
+ return binding.extractBodyFromIrc(exchange, this);
}
@Override
