Author: davsclaus
Date: Wed Aug 25 15:13:16 2010
New Revision: 989162
URL: http://svn.apache.org/viewvc?rev=989162&view=rev
Log:
Headers should be on MinaConstants and use the same syntax as the other
components.
Modified:
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConstants.java
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaEndpoint.java
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MessageIOSessionTest.java
Modified:
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConstants.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConstants.java?rev=989162&r1=989161&r2=989162&view=diff
==============================================================================
---
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConstants.java
(original)
+++
camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConstants.java
Wed Aug 25 15:13:16 2010
@@ -25,6 +25,13 @@ public final class MinaConstants {
public static final transient String MINA_CLOSE_SESSION_WHEN_COMPLETE =
"CamelMinaCloseSessionWhenComplete";
+ /** The key of the IoSession which is stored in the message header*/
+ public static final transient String MINA_IOSESSION = "CamelMinaIoSession";
+ /** The socket address of local machine that received the message. */
+ public static final transient String MINA_LOCAL_ADDRESS =
"CamelMinaLocalAddress";
+ /** The socket address of the remote machine that send the message. */
+ public static final transient String MINA_REMOTE_ADDRESS =
"CamelMinaRemoteAddress";
+
private MinaConstants() {
// Utility class
}
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=989162&r1=989161&r2=989162&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
Wed Aug 25 15:13:16 2010
@@ -39,10 +39,13 @@ import org.apache.mina.common.IoSession;
public class MinaEndpoint extends DefaultEndpoint implements
MultipleConsumersSupport {
/** The key of the IoSession which is stored in the message header*/
+ @Deprecated
public static final transient String HEADER_MINA_IOSESSION =
"CamelMinaIoSession";
/** The socket address of local machine that received the message. */
+ @Deprecated
public static final transient String HEADER_LOCAL_ADDRESS =
"CamelMinaLocalAddress";
/** The socket address of the remote machine that send the message. */
+ @Deprecated
public static final transient String HEADER_REMOTE_ADDRESS =
"CamelMinaRemoteAddress";
private SocketAddress address;
@@ -83,9 +86,9 @@ public class MinaEndpoint extends Defaul
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());
+ exchange.getIn().setHeader(MinaConstants.MINA_IOSESSION, session);
+ exchange.getIn().setHeader(MinaConstants.MINA_LOCAL_ADDRESS,
session.getLocalAddress());
+ exchange.getIn().setHeader(MinaConstants.MINA_REMOTE_ADDRESS,
session.getRemoteAddress());
MinaPayloadHelper.setIn(exchange, payload);
return exchange;
}
Modified:
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=989162&r1=989161&r2=989162&view=diff
==============================================================================
---
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MessageIOSessionTest.java
(original)
+++
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MessageIOSessionTest.java
Wed Aug 25 15:13:16 2010
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.mina;
import java.net.SocketAddress;
@@ -39,7 +38,7 @@ public class MessageIOSessionTest extend
Exchange exchange = mock.getExchanges().get(0);
Message message = exchange.getIn();
- assertNotNull(message.getHeader(MinaEndpoint.HEADER_MINA_IOSESSION));
+ assertNotNull(message.getHeader(MinaConstants.MINA_IOSESSION));
}
@@ -52,8 +51,8 @@ public class MessageIOSessionTest extend
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));
+ assertNotNull(message.getHeader(MinaConstants.MINA_LOCAL_ADDRESS,
SocketAddress.class));
+ assertNotNull(message.getHeader(MinaConstants.MINA_REMOTE_ADDRESS,
SocketAddress.class));
}
@Override
