Author: ningjiang
Date: Sat Aug 29 08:19:07 2009
New Revision: 809095
URL: http://svn.apache.org/viewvc?rev=809095&view=rev
Log:
CAMEL-1942 Allow to access IoSession via message
Added:
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MessageIOSessionTest.java
(with props)
Modified:
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java
Modified:
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java?rev=809095&r1=809094&r2=809095&view=diff
==============================================================================
---
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java
(original)
+++
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java
Sat Aug 29 08:19:07 2009
@@ -36,6 +36,13 @@
* @version $Revision$
*/
public class MinaEndpoint extends DefaultEndpoint {
+ /** The key of the IoSession which is stored in the message header*/
+ public static final transient String HEADER_MINA_IOSESSION =
"CamelMinaIoSession";
+ /** The socket address of local machine that received the message. */
+ public static final transient String HEADER_LOCAL_ADDRESS =
"CamelMinaLocalAddress";
+ /** The socket address of the remote machine that send the message. */
+ public static final transient String HEADER_REMOTE_ADDRESS =
"CamelMinaRemoteAddress";
+
private SocketAddress address;
private IoAcceptor acceptor;
@@ -75,6 +82,9 @@
public Exchange createExchange(IoSession session, Object payload) {
Exchange exchange = createExchange();
+ exchange.getIn().setHeader(HEADER_MINA_IOSESSION, session);
+ exchange.getIn().setHeader(HEADER_LOCAL_ADDRESS,
session.getLocalAddress());
+ exchange.getIn().setHeader(HEADER_REMOTE_ADDRESS ,
session.getRemoteAddress());
MinaPayloadHelper.setIn(exchange, payload);
return exchange;
}
Added:
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MessageIOSessionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MessageIOSessionTest.java?rev=809095&view=auto
==============================================================================
---
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MessageIOSessionTest.java
(added)
+++
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MessageIOSessionTest.java
Sat Aug 29 08:19:07 2009
@@ -0,0 +1,70 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.component.mina;
+
+import java.net.SocketAddress;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+
+/**
+ * Unit test to check if the message of an exchange send from the MinaConsumer
+ * is a MinaMessage.
+ */
+public class MessageIOSessionTest extends ContextTestSupport {
+
+ public void testIoSession() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+
template.sendBody("mina:tcp://localhost:6200?textline=true&sync=false", "Hello
World");
+ assertMockEndpointsSatisfied();
+
+ Exchange exchange = mock.getExchanges().get(0);
+ Message message = exchange.getIn();
+ assertNotNull(message.getHeader(MinaEndpoint.HEADER_MINA_IOSESSION));
+
+ }
+
+ public void testLocalAndRemoteAddressHeaders() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+
template.sendBody("mina:tcp://localhost:6200?textline=true&sync=false", "Hello
World");
+ assertMockEndpointsSatisfied();
+
+ Message message = mock.getExchanges().get(0).getIn();
+ // Not making assumptions on what these headers contain, because it
might differ
+ // on different machines/OSs.
+ assertNotNull(message.getHeader(MinaEndpoint.HEADER_LOCAL_ADDRESS,
SocketAddress.class));
+ assertNotNull(message.getHeader(MinaEndpoint.HEADER_REMOTE_ADDRESS,
SocketAddress.class));
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("mina:tcp://localhost:6200?textline=true&sync=false")
+ .to("log://mytest")
+ .to("mock:result");
+ }
+ };
+ }
+}
Propchange:
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MessageIOSessionTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MessageIOSessionTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
