SpringCloud/spring-functions-catalog
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update xmpp consumer for consistency (#404)

Browse Source
This commit is contained in:
Daniel Frey
2022-11-10 12:47:20 -05:00
committed by GitHub
parent fccf0e3a78
commit 720aadfdb0
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
consumer/xmpp-consumer/src/main/java/org/springframework/cloud/fn/consumer/xmpp/XmppConsumerConfiguration.java
View File

@@ -50,7 +50,7 @@ public class XmppConsumerConfiguration {
public Consumer<Message<?>> xmppConsumer(ChatMessageSendingMessageHandler chatMessageSendingMessageHandler, XmppConsumerProperties properties) {
return message -> {
Message<?> send = MessageBuilder
var send = MessageBuilder
.fromMessage(message)
.setHeaderIfAbsent(XmppHeaders.TO, properties.getChatTo())
.build();

13
consumer/xmpp-consumer/src/test/java/org/springframework/cloud/fn/consumer/xmpp/XmppConsumerConfigurationTests.java
View File

@@ -22,7 +22,6 @@ import java.util.function.Consumer;
import org.jivesoftware.smack.ConnectionConfiguration;
import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.StanzaCollector;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.filter.StanzaTypeFilter;
import org.jivesoftware.smack.packet.Stanza;
@@ -82,7 +81,8 @@ public class XmppConsumerConfigurationTests implements XmppTestContainerSupport
@BeforeEach
void setup() throws IOException, SmackException, XMPPException, InterruptedException {
XMPPTCPConnectionConfiguration.Builder builder = XMPPTCPConnectionConfiguration.builder();
var builder = XMPPTCPConnectionConfiguration.builder();
builder.setSecurityMode(ConnectionConfiguration.SecurityMode.disabled);
builder.setHost(XmppTestContainerSupport.getXmppHost());
builder.setPort(XmppTestContainerSupport.getXmppMappedPort());
@@ -92,6 +92,7 @@ public class XmppConsumerConfigurationTests implements XmppTestContainerSupport
this.clientConnection = new XMPPTCPConnection(builder.build());
this.clientConnection.connect();
this.clientConnection.login();
}
@AfterEach
@@ -101,10 +102,10 @@ public class XmppConsumerConfigurationTests implements XmppTestContainerSupport
@Test
void messageHandlerConfiguration() {
StanzaCollector collector
var collector
= this.clientConnection.createStanzaCollector(StanzaTypeFilter.MESSAGE);
Message<?> testMessage =
var testMessage =
MessageBuilder.withPayload("test")
.setHeader(XmppHeaders.TO, JANE_USER + "@" + SERVICE_NAME)
.build();
@@ -119,10 +120,10 @@ public class XmppConsumerConfigurationTests implements XmppTestContainerSupport
@Test
void xmppMessageHandlerConfiguration() throws XmppStringprepException {
StanzaCollector collector
var collector
= this.clientConnection.createStanzaCollector(StanzaTypeFilter.MESSAGE);
Message<?> testMessage =
var testMessage =
MessageBuilder.withPayload(org.jivesoftware.smack.packet.MessageBuilder.buildMessage().addBody("en_us", "test").to(JANE_USER + "@" + SERVICE_NAME).build())
.build();