Adapt to jitsi-xmpp-extensions ELEMENT_NAME -> ELEMENT change. (#820)

* Adapt to jitsi-xmpp-extensions ELEMENT_NAME -> ELEMENT change. Take advantage of it to remove some deprecated Smack method calls. * Make getMUCUserExtension get the correct extension.
jitsi · Oct 22, 2021 · 931b95a · 931b95a
1 parent 9de78c8
commit 931b95a
Show file tree

Hide file tree

Showing 22 changed files with 46 additions and 53 deletions.
diff --git a/pom.xml b/pom.xml
@@ -101,7 +101,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jitsi-xmpp-extensions</artifactId>
-      <version>1.0-29-g3c269f8</version>
+      <version>1.0-30-g48113ca</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

diff --git a/src/main/java/org/jitsi/impl/protocol/xmpp/ChatMemberImpl.java b/src/main/java/org/jitsi/impl/protocol/xmpp/ChatMemberImpl.java
@@ -220,7 +220,7 @@ void processPresence(Presence presence)
         this.presence = presence;
 
         UserInfoPacketExt userInfoPacketExt
-            = presence.getExtension(UserInfoPacketExt.ELEMENT_NAME, UserInfoPacketExt.NAMESPACE);
+            = presence.getExtension(UserInfoPacketExt.class);
         if (userInfoPacketExt != null)
         {
             Boolean newStatus = userInfoPacketExt.isRobot();
@@ -262,14 +262,14 @@ void processPresence(Presence presence)
         }
 
         RegionPacketExtension regionPE
-            = presence.getExtension(RegionPacketExtension.ELEMENT_NAME, RegionPacketExtension.NAMESPACE);
+            = presence.getExtension(RegionPacketExtension.class);
         if (regionPE != null)
         {
             region = regionPE.getRegionId();
         }
 
         StartMutedPacketExtension ext
-            = presence.getExtension(StartMutedPacketExtension.ELEMENT_NAME, StartMutedPacketExtension.NAMESPACE);
+            = presence.getExtension(StartMutedPacketExtension.class);
 
         if (ext != null)
         {
@@ -282,7 +282,7 @@ void processPresence(Presence presence)
             }
         }
 
-        StatsId statsIdPacketExt = presence.getExtension(StatsId.ELEMENT_NAME, StatsId.NAMESPACE);
+        StatsId statsIdPacketExt = presence.getExtension(StatsId.class);
         if (statsIdPacketExt != null)
         {
             statsId = statsIdPacketExt.getStatsId();

diff --git a/src/main/java/org/jitsi/impl/protocol/xmpp/ChatRoomImpl.java b/src/main/java/org/jitsi/impl/protocol/xmpp/ChatRoomImpl.java
@@ -398,7 +398,7 @@ public int getMembersCount()
     @Override
     public boolean containsPresenceExtension(String elementName, String namespace)
     {
-        return lastPresenceSent != null && lastPresenceSent.getExtension(elementName, namespace) != null;
+        return lastPresenceSent != null && lastPresenceSent.getExtensionElement(elementName, namespace) != null;
     }
 
     @Override
@@ -484,7 +484,7 @@ private MUCUser getMUCUserExtension(Presence packet)
         if (packet != null)
         {
             // Get the MUC User extension
-            return packet.getExtension(MUCInitialPresence.ELEMENT, MUCInitialPresence.NAMESPACE);
+            return packet.getExtension(MUCUser.class);
         }
 
         return null;
@@ -502,7 +502,8 @@ public void setPresenceExtension(ExtensionElement extension, boolean remove)
         boolean presenceUpdated = false;
 
         // Remove old
-        ExtensionElement old = lastPresenceSent.getExtension(extension.getElementName(), extension.getNamespace());
+        ExtensionElement old =
+            lastPresenceSent.getExtensionElement(extension.getElementName(), extension.getNamespace());
         if (old != null)
         {
             lastPresenceSent.removeExtension(old);

diff --git a/src/main/java/org/jitsi/jicofo/conference/JitsiMeetConferenceImpl.java b/src/main/java/org/jitsi/jicofo/conference/JitsiMeetConferenceImpl.java
@@ -650,7 +650,7 @@ private Bridge selectBridge(Participant participant)
 
             if (chatRoom != null
                 && !chatRoom.containsPresenceExtension(
-                BridgeNotAvailablePacketExt.ELEMENT_NAME,
+                BridgeNotAvailablePacketExt.ELEMENT,
                 BridgeNotAvailablePacketExt.NAMESPACE))
             {
                 chatRoom.setPresenceExtension(new BridgeNotAvailablePacketExt(), false);
@@ -1240,10 +1240,7 @@ public StanzaError onSessionInfo(@NotNull JingleSession session, JingleIQ iq)
             return StanzaError.from(StanzaError.Condition.item_not_found, errorMsg).build();
         }
 
-        IceStatePacketExtension iceStatePE
-                = iq.getExtension(
-                        IceStatePacketExtension.ELEMENT_NAME,
-                        IceStatePacketExtension.NAMESPACE);
+        IceStatePacketExtension iceStatePE = iq.getExtension(IceStatePacketExtension.class);
         String iceState = iceStatePE != null ? iceStatePE.getText() : null;
 
         if (!"failed".equalsIgnoreCase(iceState))
@@ -1280,7 +1277,7 @@ public StanzaError onSessionInfo(@NotNull JingleSession session, JingleIQ iq)
 
     private BridgeSessionPacketExtension getBridgeSessionPacketExtension(@NotNull IQ iq)
     {
-        return iq.getExtension(BridgeSessionPacketExtension.ELEMENT_NAME, BridgeSessionPacketExtension.NAMESPACE);
+        return iq.getExtension(BridgeSessionPacketExtension.class);
     }
 
     /**

diff --git a/src/main/java/org/jitsi/jicofo/jigasi/TranscriberManager.java b/src/main/java/org/jitsi/jicofo/jigasi/TranscriberManager.java
@@ -161,10 +161,7 @@ private Collection<String> getBridgeRegions()
      */
     private TranscriptionStatusExtension getTranscriptionStatus(Presence p)
     {
-        return p.getExtension(
-            TranscriptionStatusExtension.ELEMENT_NAME,
-            TranscriptionStatusExtension.NAMESPACE
-        );
+        return p.getExtension(TranscriptionStatusExtension.class);
     }
 
     /**
@@ -272,9 +269,7 @@ private boolean isRequestingTranscriber(Presence presence)
             return false;
         }
 
-        TranscriptionRequestExtension ext =  presence.getExtension(
-            TranscriptionRequestExtension.ELEMENT_NAME,
-            TranscriptionRequestExtension.NAMESPACE);
+        TranscriptionRequestExtension ext =  presence.getExtension(TranscriptionRequestExtension.class);
 
         if (ext == null)
         {

diff --git a/src/main/java/org/jitsi/protocol/xmpp/AbstractOperationSetJingle.java b/src/main/java/org/jitsi/protocol/xmpp/AbstractOperationSetJingle.java
@@ -65,7 +65,7 @@ public static JSONObject getStats()
 
     protected AbstractOperationSetJingle()
     {
-        super(JingleIQ.ELEMENT_NAME, JingleIQ.NAMESPACE, IQ.Type.set, Mode.sync);
+        super(JingleIQ.ELEMENT, JingleIQ.NAMESPACE, IQ.Type.set, Mode.sync);
     }
 
     @Override

diff --git a/src/main/kotlin/org/jitsi/jicofo/bridge/BridgeMucDetector.kt b/src/main/kotlin/org/jitsi/jicofo/bridge/BridgeMucDetector.kt
@@ -40,7 +40,7 @@ class BridgeMucDetector(
 ) : BaseBrewery<ColibriStatsExtension?>(
     xmppProvider,
     breweryJid,
-    ColibriStatsExtension.ELEMENT_NAME,
+    ColibriStatsExtension.ELEMENT,
     ColibriStatsExtension.NAMESPACE,
     LoggerImpl(BridgeMucDetector::class.simpleName).apply { addContext("type", "bridge") }
 ) {

diff --git a/src/main/kotlin/org/jitsi/jicofo/jibri/JibriDetector.kt b/src/main/kotlin/org/jitsi/jicofo/jibri/JibriDetector.kt
@@ -41,7 +41,7 @@ class JibriDetector(
 ) : BaseBrewery<JibriStatusPacketExt>(
     xmppProvider,
     breweryJid,
-    JibriStatusPacketExt.ELEMENT_NAME,
+    JibriStatusPacketExt.ELEMENT,
     JibriStatusPacketExt.NAMESPACE,
     createLogger().apply { addContext("type", if (isSip) "sip_jibri" else "jibri") }
 ) {

diff --git a/src/main/kotlin/org/jitsi/jicofo/jigasi/JigasiDetector.kt b/src/main/kotlin/org/jitsi/jicofo/jigasi/JigasiDetector.kt
@@ -37,7 +37,7 @@ class JigasiDetector(
 ) : BaseBrewery<ColibriStatsExtension>(
     xmppProvider,
     breweryJid,
-    ColibriStatsExtension.ELEMENT_NAME,
+    ColibriStatsExtension.ELEMENT,
     ColibriStatsExtension.NAMESPACE,
     createLogger().apply { addContext("type", "jigasi") }
 ) {

diff --git a/src/main/kotlin/org/jitsi/jicofo/xmpp/AuthenticationIqHandler.kt b/src/main/kotlin/org/jitsi/jicofo/xmpp/AuthenticationIqHandler.kt
@@ -53,7 +53,7 @@ class AuthenticationIqHandler(private val authAuthority: AuthenticationAuthority
     private fun handleLogoutIq(logoutIq: LogoutIq): IQ = authAuthority.processLogoutIq(logoutIq)
 
     private inner class LoginUrlIqHandler : AbstractIqRequestHandler(
-        LoginUrlIq.ELEMENT_NAME,
+        LoginUrlIq.ELEMENT,
         LoginUrlIq.NAMESPACE,
         IQ.Type.get,
         IQRequestHandler.Mode.sync
@@ -74,7 +74,7 @@ class AuthenticationIqHandler(private val authAuthority: AuthenticationAuthority
     }
 
     private inner class LogoutIqHandler : AbstractIqRequestHandler(
-        LogoutIq.ELEMENT_NAME,
+        LogoutIq.ELEMENT,
         LogoutIq.NAMESPACE,
         IQ.Type.set,
         IQRequestHandler.Mode.sync

diff --git a/src/main/kotlin/org/jitsi/jicofo/xmpp/AvModerationHandler.kt b/src/main/kotlin/org/jitsi/jicofo/xmpp/AvModerationHandler.kt
@@ -56,8 +56,8 @@ class AvModerationHandler(
             return
         }
 
-        val jsonMessage = stanza.getExtension<JsonMessageExtension>(
-            JsonMessageExtension.ELEMENT_NAME, JsonMessageExtension.NAMESPACE
+        val jsonMessage = stanza.getExtension(
+            JsonMessageExtension::class.java
         ) ?: return Unit.also {
             logger.warn("Skip processing stanza without JsonMessageExtension")
         }

diff --git a/src/main/kotlin/org/jitsi/jicofo/xmpp/ConferenceIqHandler.kt b/src/main/kotlin/org/jitsi/jicofo/xmpp/ConferenceIqHandler.kt
@@ -42,7 +42,7 @@ class ConferenceIqHandler(
     val reservationSystem: ReservationSystem?,
     val jigasiEnabled: Boolean
 ) : AbstractIqRequestHandler(
-    ConferenceIq.ELEMENT_NAME,
+    ConferenceIq.ELEMENT,
     ConferenceIq.NAMESPACE,
     IQ.Type.set,
     IQRequestHandler.Mode.sync

diff --git a/src/main/kotlin/org/jitsi/jicofo/xmpp/JibriIqHandler.kt b/src/main/kotlin/org/jitsi/jicofo/xmpp/JibriIqHandler.kt
@@ -38,7 +38,7 @@ class JibriIqHandler(
 ) :
     AbstractIqHandler<JibriIq>(
         connections,
-        JibriIq.ELEMENT_NAME,
+        JibriIq.ELEMENT,
         JibriIq.NAMESPACE,
         setOf(IQ.Type.set),
         IQRequestHandler.Mode.sync

diff --git a/src/main/kotlin/org/jitsi/jicofo/xmpp/JigasiIqHandler.kt b/src/main/kotlin/org/jitsi/jicofo/xmpp/JigasiIqHandler.kt
@@ -40,7 +40,7 @@ class JigasiIqHandler(
     private val jigasiDetector: JigasiDetector
 ) : AbstractIqHandler<RayoIqProvider.DialIq>(
     connections,
-    RayoIqProvider.DialIq.ELEMENT_NAME,
+    RayoIqProvider.DialIq.ELEMENT,
     RayoIqProvider.NAMESPACE,
     setOf(IQ.Type.set)
 ) {

diff --git a/src/main/kotlin/org/jitsi/jicofo/xmpp/MuteIqHandler.kt b/src/main/kotlin/org/jitsi/jicofo/xmpp/MuteIqHandler.kt
@@ -38,7 +38,7 @@ class AudioMuteIqHandler(
 ) :
     AbstractIqHandler<MuteIq>(
         connections,
-        MuteIq.ELEMENT_NAME,
+        MuteIq.ELEMENT,
         MuteIq.NAMESPACE,
         setOf(IQ.Type.set),
         IQRequestHandler.Mode.sync
@@ -63,7 +63,7 @@ class VideoMuteIqHandler(
 ) :
     AbstractIqHandler<MuteVideoIq>(
         connections,
-        MuteVideoIq.ELEMENT_NAME,
+        MuteVideoIq.ELEMENT,
         MuteVideoIq.NAMESPACE,
         setOf(IQ.Type.set),
         IQRequestHandler.Mode.sync

diff --git a/src/main/kotlin/org/jitsi/jicofo/xmpp/Smack.kt b/src/main/kotlin/org/jitsi/jicofo/xmpp/Smack.kt
@@ -70,74 +70,74 @@ fun registerXmppExtensions() {
     HealthCheckIQProvider.registerIQProvider()
     // ice-state
     ProviderManager.addExtensionProvider(
-        IceStatePacketExtension.ELEMENT_NAME,
+        IceStatePacketExtension.ELEMENT,
         IceStatePacketExtension.NAMESPACE,
         DefaultPacketExtensionProvider(IceStatePacketExtension::class.java)
     )
     // bridge-session
     ProviderManager.addExtensionProvider(
-        BridgeSessionPacketExtension.ELEMENT_NAME,
+        BridgeSessionPacketExtension.ELEMENT,
         BridgeSessionPacketExtension.NAMESPACE,
         DefaultPacketExtensionProvider(BridgeSessionPacketExtension::class.java)
     )
     // Jibri IQs
-    ProviderManager.addIQProvider(JibriIq.ELEMENT_NAME, JibriIq.NAMESPACE, JibriIqProvider())
+    ProviderManager.addIQProvider(JibriIq.ELEMENT, JibriIq.NAMESPACE, JibriIqProvider())
     JibriStatusPacketExt.registerExtensionProvider()
     JibriBusyStatusPacketExt.registerExtensionProvider()
     HealthStatusPacketExt.registerExtensionProvider()
     // User info
     ProviderManager.addExtensionProvider(
-        UserInfoPacketExt.ELEMENT_NAME,
+        UserInfoPacketExt.ELEMENT,
         UserInfoPacketExt.NAMESPACE,
         DefaultPacketExtensionProvider(UserInfoPacketExt::class.java)
     )
     ProviderManager.addExtensionProvider(
-        RegionPacketExtension.ELEMENT_NAME,
+        RegionPacketExtension.ELEMENT,
         RegionPacketExtension.NAMESPACE,
         DefaultPacketExtensionProvider(RegionPacketExtension::class.java)
     )
     ProviderManager.addExtensionProvider(
-        StatsId.ELEMENT_NAME,
+        StatsId.ELEMENT,
         StatsId.NAMESPACE,
         StatsId.Provider()
     )
 
     // Add the extensions used for handling the inviting of transcriber
     ProviderManager.addExtensionProvider(
-        TranscriptionRequestExtension.ELEMENT_NAME,
+        TranscriptionRequestExtension.ELEMENT,
         TranscriptionRequestExtension.NAMESPACE,
         DefaultPacketExtensionProvider(TranscriptionRequestExtension::class.java)
     )
     ProviderManager.addExtensionProvider(
-        TranscriptionStatusExtension.ELEMENT_NAME,
+        TranscriptionStatusExtension.ELEMENT,
         TranscriptionStatusExtension.NAMESPACE,
         DefaultPacketExtensionProvider(TranscriptionStatusExtension::class.java)
     )
 
     // Register Colibri
     ProviderManager.addIQProvider(
-        ColibriConferenceIQ.ELEMENT_NAME,
+        ColibriConferenceIQ.ELEMENT,
         ColibriConferenceIQ.NAMESPACE,
         ColibriIQProvider()
     )
     // register Jingle
     ProviderManager.addIQProvider(
-        JingleIQ.ELEMENT_NAME,
+        JingleIQ.ELEMENT,
         JingleIQ.NAMESPACE,
         JingleIQProvider()
     )
     ProviderManager.addExtensionProvider(
-        JsonMessageExtension.ELEMENT_NAME,
+        JsonMessageExtension.ELEMENT,
         JsonMessageExtension.NAMESPACE,
         DefaultPacketExtensionProvider(JsonMessageExtension::class.java)
     )
     ProviderManager.addExtensionProvider(
-        FeaturesExtension.ELEMENT_NAME,
+        FeaturesExtension.ELEMENT,
         FeaturesExtension.NAMESPACE,
         DefaultPacketExtensionProvider(FeaturesExtension::class.java)
     )
     ProviderManager.addExtensionProvider(
-        FeatureExtension.ELEMENT_NAME,
+        FeatureExtension.ELEMENT,
         FeatureExtension.NAMESPACE,
         DefaultPacketExtensionProvider(FeatureExtension::class.java)
     )

diff --git a/src/test/java/mock/jvb/MockVideobridge.java b/src/test/java/mock/jvb/MockVideobridge.java
@@ -74,7 +74,7 @@ private class ColibriConferenceIqHandler extends AbstractIqRequestHandler
     {
         ColibriConferenceIqHandler(IQ.Type type)
         {
-            super(ColibriConferenceIQ.ELEMENT_NAME,
+            super(ColibriConferenceIQ.ELEMENT,
                 ColibriConferenceIQ.NAMESPACE,
                 type,
                 Mode.sync

diff --git a/src/test/java/mock/xmpp/XmppPeer.java b/src/test/java/mock/xmpp/XmppPeer.java
@@ -115,7 +115,7 @@ public IQ.Type getType()
     @Override
     public String getElement()
     {
-        return JingleIQ.ELEMENT_NAME;
+        return JingleIQ.ELEMENT;
     }
 
     @Override

diff --git a/src/test/java/org/jitsi/jicofo/auth/XMPPAuthenticationAuthorityTest.java b/src/test/java/org/jitsi/jicofo/auth/XMPPAuthenticationAuthorityTest.java
@@ -145,7 +145,7 @@ public void testXmppDomainAuthentication()
 
         // REPLY with session-invalid
         assertNotNull(errorResponse.getError().getExtension(
-                SessionInvalidPacketExtension.ELEMENT_NAME,
+                SessionInvalidPacketExtension.ELEMENT,
                 SessionInvalidPacketExtension.NAMESPACE));
 
         // CASE 6: do not allow to use session-id from different machine

diff --git a/src/test/kotlin/org/jitsi/jicofo/auth/ShibbolethAuthenticationAuthorityTest.kt b/src/test/kotlin/org/jitsi/jicofo/auth/ShibbolethAuthenticationAuthorityTest.kt
@@ -111,7 +111,7 @@ class ShibbolethAuthenticationAuthorityTest : ShouldSpec() {
                         // REPLY with session-invalid
                         it.shouldBeInstanceOf<ErrorIQ>()
                         it.error.getExtension<ExtensionElement>(
-                            SessionInvalidPacketExtension.ELEMENT_NAME,
+                            SessionInvalidPacketExtension.ELEMENT,
                             SessionInvalidPacketExtension.NAMESPACE
                         ) shouldNotBe null
                     }

diff --git a/src/test/kotlin/org/jitsi/jicofo/jibri/JibriDetectorTest.kt b/src/test/kotlin/org/jitsi/jicofo/jibri/JibriDetectorTest.kt
@@ -53,7 +53,7 @@ private fun createJibriMember(jid: EntityFullJid): ChatRoomMember {
         every { occupantJid } returns jid
         every { presence } returns mockk<Presence> {
             every {
-                getExtension<ExtensionElement>(JibriStatusPacketExt.ELEMENT_NAME, JibriStatusPacketExt.NAMESPACE)
+                getExtension<ExtensionElement>(JibriStatusPacketExt.ELEMENT, JibriStatusPacketExt.NAMESPACE)
             } answers {
                 JibriStatusPacketExt().apply {
                     healthStatus = HealthStatusPacketExt().apply { status = HealthStatusPacketExt.Health.HEALTHY }

diff --git a/src/test/kotlin/org/jitsi/jicofo/xmpp/util/MockXmppEndpoint.kt b/src/test/kotlin/org/jitsi/jicofo/xmpp/util/MockXmppEndpoint.kt
@@ -35,7 +35,7 @@ class MockJigasi(
     init {
         xmppConnection.registerIQRequestHandler(
             object : AbstractIqRequestHandler(
-                RayoIqProvider.DialIq.ELEMENT_NAME, RayoIqProvider.NAMESPACE, IQ.Type.set, IQRequestHandler.Mode.sync
+                RayoIqProvider.DialIq.ELEMENT, RayoIqProvider.NAMESPACE, IQ.Type.set, IQRequestHandler.Mode.sync
             ) {
                 override fun handleIQRequest(iq: IQ): IQ? {
                     return when (response) {