Skip to content

Commit 7a7cb2b

Browse files
committed
Fix XMPP module after downgrading Smack library
1 parent 6f34d68 commit 7a7cb2b

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpoint.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import org.jivesoftware.smack.StanzaListener;
2323
import org.jivesoftware.smack.XMPPConnection;
2424
import org.jivesoftware.smack.filter.StanzaFilter;
25+
import org.jivesoftware.smack.packet.ExtensionElement;
2526
import org.jivesoftware.smack.packet.Stanza;
26-
import org.jivesoftware.smack.packet.XmlElement;
2727

2828
import org.springframework.expression.EvaluationContext;
2929
import org.springframework.expression.Expression;
@@ -132,9 +132,9 @@ public void processStanza(Stanza packet) {
132132
if (ChatMessageListeningEndpoint.this.payloadExpression != null) {
133133
EvaluationContext evaluationContextToUse = ChatMessageListeningEndpoint.this.evaluationContext;
134134

135-
List<XmlElement> extensions = xmppMessage.getExtensions();
135+
List<ExtensionElement> extensions = xmppMessage.getExtensions();
136136
if (extensions.size() == 1) {
137-
XmlElement extension = extensions.get(0);
137+
ExtensionElement extension = extensions.get(0);
138138
evaluationContextToUse = ExpressionUtils.createStandardEvaluationContext(getBeanFactory());
139139
evaluationContextToUse.setVariable("extension", extension);
140140
}

spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageInboundChannelAdapterParserTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -82,7 +82,7 @@ public void testInboundAdapter() {
8282
assertThat(TestUtils.getPropertyValue(adapter, "payloadExpression.expression")).isEqualTo("#root");
8383
adapter.start();
8484
Map asyncRecvListeners = TestUtils.getPropertyValue(connection, "asyncRecvListeners", Map.class);
85-
assertThat(asyncRecvListeners.size()).isEqualTo(6);
85+
assertThat(asyncRecvListeners.size()).isEqualTo(5);
8686
Object lastListener = asyncRecvListeners.values().stream().reduce((first, second) -> second).get();
8787
assertThat(TestUtils.getPropertyValue(lastListener, "packetFilter")).isSameAs(stanzaFilter);
8888
adapter.stop();

0 commit comments

Comments
 (0)