diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/XmppHeaders.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/XmppHeaders.java index 010be8ad60..032b204bd0 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/XmppHeaders.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/XmppHeaders.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.xmpp; import org.springframework.integration.MessageHeaders; @@ -31,9 +32,10 @@ public class XmppHeaders { public static final String CHAT = PREFIX + "chatKey"; - public static final String CHAT_TO_USER = PREFIX + "chatToUser"; + public static final String CHAT_TO = PREFIX + "chatTo"; - public static final String CHAT_THREAD_ID = PREFIX + "threadId"; + public static final String CHAT_THREAD_ID = PREFIX + "chatThreadId"; public static final String TYPE = PREFIX + "type"; + } diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParser.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParser.java index 254d4d9810..41baa21e38 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParser.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParser.java @@ -24,13 +24,12 @@ import org.springframework.integration.xmpp.XmppHeaders; * @author Josh Long * @author Oleg ZHurakousky * @since 2.0 - * */ public class XmppHeaderEnricherParser extends HeaderEnricherParserSupport { public XmppHeaderEnricherParser() { - this.addElementToHeaderMapping("message-to", XmppHeaders.CHAT_TO_USER); - this.addElementToHeaderMapping("message-thread-id", XmppHeaders.CHAT_THREAD_ID); + this.addElementToHeaderMapping("chat-to", XmppHeaders.CHAT_TO); + this.addElementToHeaderMapping("chat-thread-id", XmppHeaders.CHAT_THREAD_ID); } } diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandler.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandler.java index bc97267cd4..217338e7fe 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandler.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandler.java @@ -13,11 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.xmpp.outbound; import org.jivesoftware.smack.Chat; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException; + import org.springframework.integration.Message; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.xmpp.XmppHeaders; @@ -41,16 +43,17 @@ public class ChatMessageSendingMessageHandler extends AbstractXmppConnectionAwar super(xmppConnection); } + + @Override protected void handleMessageInternal(Message message) { Assert.isTrue(this.initialized, this.getComponentName() + "#" + this.getComponentType() + " must be initialized"); Object messageBody = message.getPayload(); - String destinationUser = (String) message.getHeaders().get(XmppHeaders.CHAT_TO_USER); - Assert.state(StringUtils.hasText(destinationUser), "'" + XmppHeaders.CHAT_TO_USER + "' header must not be null"); + String chatTo = (String) message.getHeaders().get(XmppHeaders.CHAT_TO); + Assert.state(StringUtils.hasText(chatTo), "The '" + XmppHeaders.CHAT_TO + "' header must not be null"); Assert.isInstanceOf(String.class, messageBody, "Only payload of type String is suported. You " + "can apply transformer prior to sending message to this handler"); - String threadId = (String) message.getHeaders().get(XmppHeaders.CHAT_THREAD_ID); - Chat chat = getOrCreateChatWithParticipant(destinationUser, threadId); + Chat chat = getOrCreateChatWithParticipant(chatTo, threadId); try { chat.sendMessage((String) messageBody); } diff --git a/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-2.0.xsd b/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-2.0.xsd index 38a06242df..039801232e 100644 --- a/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-2.0.xsd +++ b/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-2.0.xsd @@ -109,6 +109,37 @@ + + + + Configures an endpoint that will forward Presence state changes to a MessageChannel. + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -141,37 +172,6 @@ - - - - Configures an endpoint that will forward Presence state changes to a MessageChannel. - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -182,8 +182,8 @@ - - + + diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests-context.xml b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests-context.xml index 77bd4eac39..1d3671f321 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests-context.xml +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests-context.xml @@ -17,7 +17,7 @@ - + diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests.java index 77e64e0f72..7fc0833f7e 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests.java @@ -61,7 +61,7 @@ public class XmppHeaderEnricherParserTests { doAnswer(new Answer() { public Object answer(InvocationOnMock invocation) throws Throwable { Message message = (Message) invocation.getArguments()[0]; - String chatToUser = (String) message.getHeaders().get(XmppHeaders.CHAT_TO_USER); + String chatToUser = (String) message.getHeaders().get(XmppHeaders.CHAT_TO); assertNotNull(chatToUser); assertEquals("test1@example.org", chatToUser); return null; diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppMessageOutboundEndpointParserTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppMessageOutboundEndpointParserTests.java index 5c248954e1..0565482dbf 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppMessageOutboundEndpointParserTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppMessageOutboundEndpointParserTests.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.xmpp.config; import static junit.framework.Assert.assertEquals; @@ -79,7 +80,7 @@ public class XmppMessageOutboundEndpointParserTests { Object pollingConsumer = context.getBean("outboundPollingAdapter"); assertTrue(pollingConsumer instanceof PollingConsumer); MessageChannel channel = context.getBean("outboundEventChannel", MessageChannel.class); - Message message = MessageBuilder.withPayload("hello").setHeader(XmppHeaders.CHAT_TO_USER, "oleg").build(); + Message message = MessageBuilder.withPayload("hello").setHeader(XmppHeaders.CHAT_TO, "oleg").build(); XMPPConnection connection = context.getBean("testConnection", XMPPConnection.class); ChatManager chatManager = mock(ChatManager.class); diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/XmppMessageProducer.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/XmppMessageProducer.java index bde5dd4923..5828628917 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/XmppMessageProducer.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/XmppMessageProducer.java @@ -55,7 +55,7 @@ public class XmppMessageProducer implements MessageSource { logger.info("sending message to recipient " + recipient); - return MessageBuilder.withPayload(msg).setHeader(XmppHeaders.CHAT_TO_USER, recipient).build(); + return MessageBuilder.withPayload(msg).setHeader(XmppHeaders.CHAT_TO, recipient).build(); } catch (InterruptedException e) { logger.debug("exception thrown when trying to receive a message", e); diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/XmppMessageSendingMessageHandlerTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/XmppMessageSendingMessageHandlerTests.java index 5ccb7fb1c3..def2a05fa3 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/XmppMessageSendingMessageHandlerTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/XmppMessageSendingMessageHandlerTests.java @@ -1,6 +1,19 @@ -/** - * +/* + * Copyright 2002-2010 the original author or authors. + * + * Licensed 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.springframework.integration.xmpp.outbound; import static junit.framework.Assert.assertNotNull; @@ -44,7 +57,7 @@ public class XmppMessageSendingMessageHandlerTests { ChatMessageSendingMessageHandler handler = new ChatMessageSendingMessageHandler(connection); handler.afterPropertiesSet(); Message message = MessageBuilder.withPayload("Test Message"). - setHeader(XmppHeaders.CHAT_TO_USER, "kermit@frog.com"). + setHeader(XmppHeaders.CHAT_TO, "kermit@frog.com"). build(); // first Message handler.handleMessage(message); @@ -54,7 +67,7 @@ public class XmppMessageSendingMessageHandlerTests { // assuming we know thread ID although currently we do not provide this capability message = MessageBuilder.withPayload("Hello Kitty"). - setHeader(XmppHeaders.CHAT_TO_USER, "kermit@frog.com"). + setHeader(XmppHeaders.CHAT_TO, "kermit@frog.com"). setHeader(XmppHeaders.CHAT_THREAD_ID, "123"). build(); reset(chat, chantManager); diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/XmppRosterEventMessageSendingHandlerTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/XmppRosterEventMessageSendingHandlerTests.java index 2260b136d8..c40b08d0dd 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/XmppRosterEventMessageSendingHandlerTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/XmppRosterEventMessageSendingHandlerTests.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.xmpp.outbound; import static junit.framework.Assert.assertNotNull;