From 7a7cb2b792a1fa8330399603cea6a4ec39ba2f86 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Tue, 16 Apr 2024 15:57:08 -0400 Subject: [PATCH] Fix XMPP module after downgrading Smack library --- .../xmpp/inbound/ChatMessageListeningEndpoint.java | 6 +++--- .../config/ChatMessageInboundChannelAdapterParserTests.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpoint.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpoint.java index 46bc3ad458..931ccd6e7e 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpoint.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpoint.java @@ -22,8 +22,8 @@ import java.util.Map; import org.jivesoftware.smack.StanzaListener; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.filter.StanzaFilter; +import org.jivesoftware.smack.packet.ExtensionElement; import org.jivesoftware.smack.packet.Stanza; -import org.jivesoftware.smack.packet.XmlElement; import org.springframework.expression.EvaluationContext; import org.springframework.expression.Expression; @@ -132,9 +132,9 @@ public class ChatMessageListeningEndpoint extends AbstractXmppConnectionAwareEnd if (ChatMessageListeningEndpoint.this.payloadExpression != null) { EvaluationContext evaluationContextToUse = ChatMessageListeningEndpoint.this.evaluationContext; - List extensions = xmppMessage.getExtensions(); + List extensions = xmppMessage.getExtensions(); if (extensions.size() == 1) { - XmlElement extension = extensions.get(0); + ExtensionElement extension = extensions.get(0); evaluationContextToUse = ExpressionUtils.createStandardEvaluationContext(getBeanFactory()); evaluationContextToUse.setVariable("extension", extension); } diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageInboundChannelAdapterParserTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageInboundChannelAdapterParserTests.java index 64589f93f9..35e3380de4 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageInboundChannelAdapterParserTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageInboundChannelAdapterParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2023 the original author or authors. + * Copyright 2002-2024 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. @@ -82,7 +82,7 @@ public class ChatMessageInboundChannelAdapterParserTests { assertThat(TestUtils.getPropertyValue(adapter, "payloadExpression.expression")).isEqualTo("#root"); adapter.start(); Map asyncRecvListeners = TestUtils.getPropertyValue(connection, "asyncRecvListeners", Map.class); - assertThat(asyncRecvListeners.size()).isEqualTo(6); + assertThat(asyncRecvListeners.size()).isEqualTo(5); Object lastListener = asyncRecvListeners.values().stream().reduce((first, second) -> second).get(); assertThat(TestUtils.getPropertyValue(lastListener, "packetFilter")).isSameAs(stanzaFilter); adapter.stop();