Skip to content

Commit 1fd9f47

Browse files
bgrozevbgrozev
authored
chore: Bump jitsi-xmpp-extensions, jicoco. (#1223)
1 parent c320234 commit 1fd9f47

23 files changed

Lines changed: 64 additions & 95 deletions

File tree

‎jicofo-common/src/main/java/org/jitsi/impl/protocol/xmpp/log/PacketDebugger.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import edu.umd.cs.findbugs.annotations.*;
1919
import org.jitsi.utils.logging2.*;
20-
import org.jitsi.xmpp.util.*;
2120
import org.jivesoftware.smack.*;
2221
import org.jivesoftware.smack.debugger.*;
2322
import org.jivesoftware.smack.packet.*;
@@ -67,20 +66,15 @@ public PacketDebugger(XMPPConnection connection, @NonNull String id)
6766
@Override
6867
public void onIncomingStreamElement(TopLevelStreamElement streamElement)
6968
{
70-
logger.debug(
71-
() -> "RCV PKT (" + id + "): " + XmlStringBuilderUtil.Companion.toStringOpt(streamElement.toXML())
72-
);
69+
logger.debug(() -> "RCV PKT (" + id + "): " + streamElement.toXML());
7370
}
7471

7572
@Override
7673
public void onOutgoingStreamElement(TopLevelStreamElement streamElement)
7774
{
78-
logger.debug(
79-
() -> "SENT PKT (" + id + "): " + XmlStringBuilderUtil.Companion.toStringOpt(streamElement.toXML())
80-
);
75+
logger.debug(() -> "SENT PKT (" + id + "): " + streamElement.toXML());
8176
}
8277

83-
// It's fine to do non-atomic as it's only 1 thread doing write operation
8478
/**
8579
* {@inheritDoc}
8680
*/

‎jicofo-common/src/main/java/org/jitsi/jicofo/xmpp/BaseBrewery.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.jitsi.jicofo.*;
2222
import org.jitsi.jicofo.xmpp.muc.*;
2323
import org.jitsi.utils.logging2.*;
24-
import org.jitsi.xmpp.util.*;
2524
import org.jivesoftware.smack.*;
2625
import org.jivesoftware.smack.packet.*;
2726
import org.jivesoftware.smack.tcp.*;
@@ -327,7 +326,7 @@ protected void processInstanceStatusChanged(@NotNull EntityFullJid jid, @NotNull
327326
instance.status = extension;
328327
}
329328

330-
logger.debug(() -> "New presence from " + jid + ": " + XmlStringBuilderUtil.toStringOpt(extension));
329+
logger.debug(() -> "New presence from " + jid + ": " + extension.toXML());
331330
onInstanceStatusChanged(jid, extension);
332331
}
333332

‎jicofo-common/src/main/kotlin/org/jitsi/jicofo/xmpp/Util.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
package org.jitsi.jicofo.xmpp
1919

2020
import org.jitsi.utils.logging2.LoggerImpl
21-
import org.jitsi.xmpp.util.XmlStringBuilderUtil.Companion.toStringOpt
2221
import org.jivesoftware.smack.AbstractXMPPConnection
2322
import org.jivesoftware.smack.SmackException
2423
import org.jivesoftware.smack.XMPPConnection
@@ -62,9 +61,9 @@ fun parseJidFromClientProxyJid(
6261
fun XMPPConnection.tryToSendStanza(stanza: Stanza) = try {
6362
sendStanza(stanza)
6463
} catch (e: SmackException.NotConnectedException) {
65-
logger.error("No connection - unable to send packet: ${stanza.toXML().toStringOpt()}", e)
64+
logger.error("No connection - unable to send packet: ${stanza.toXML()}", e)
6665
} catch (e: InterruptedException) {
67-
logger.error("Failed to send packet: ${stanza.toXML().toStringOpt()}", e)
66+
logger.error("Failed to send packet: ${stanza.toXML()}", e)
6867
}
6968

7069
@Throws(SmackException.NotConnectedException::class)

‎jicofo-common/src/main/kotlin/org/jitsi/jicofo/xmpp/jingle/JingleSession.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import org.jitsi.xmpp.extensions.jingle.JinglePacketFactory
3636
import org.jitsi.xmpp.extensions.jingle.Reason
3737
import org.jitsi.xmpp.extensions.jingle.RtpDescriptionPacketExtension
3838
import org.jitsi.xmpp.extensions.jitsimeet.JsonMessageExtension
39-
import org.jitsi.xmpp.util.XmlStringBuilderUtil.Companion.toStringOpt
4039
import org.jivesoftware.smack.AbstractXMPPConnection
4140
import org.jivesoftware.smack.SmackException
4241
import org.jivesoftware.smack.packet.ExtensionElement
@@ -144,7 +143,7 @@ class JingleSession(
144143
val response = if (error == null) {
145144
IQ.createResultIQ(iq)
146145
} else {
147-
logger.info("Returning error: request=${iq.toStringOpt()}, error=${error.toStringOpt()} ")
146+
logger.info("Returning error: request=${iq.toXML()}, error=${error.toXML()} ")
148147
IQ.createErrorResponse(iq, error)
149148
}
150149
connection.tryToSendStanza(response)
@@ -208,7 +207,7 @@ class JingleSession(
208207
return if (response?.type == IQ.Type.result) {
209208
true
210209
} else {
211-
logger.error("Unexpected response to transport-replace: ${response?.toStringOpt()}")
210+
logger.error("Unexpected response to transport-replace: ${response?.toXML()}")
212211
false
213212
}
214213
}

‎jicofo-common/src/main/kotlin/org/jitsi/jicofo/xmpp/muc/ChatRoomImpl.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import org.jitsi.utils.event.EventEmitter
3131
import org.jitsi.utils.event.SyncEventEmitter
3232
import org.jitsi.utils.logging2.createLogger
3333
import org.jitsi.utils.observableWhenChanged
34-
import org.jitsi.xmpp.util.XmlStringBuilderUtil.Companion.toStringOpt
3534
import org.jivesoftware.smack.PresenceListener
3635
import org.jivesoftware.smack.SmackException
3736
import org.jivesoftware.smack.XMPPConnection
@@ -562,15 +561,15 @@ class ChatRoomImpl(
562561
*/
563562
override fun processPresence(presence: Presence?) {
564563
if (presence == null || presence.error != null) {
565-
logger.warn("Unable to handle packet: ${presence?.toXML()?.toStringOpt()}")
564+
logger.warn("Unable to handle packet: ${presence?.toXML()}")
566565
return
567566
}
568-
logger.trace { "Presence received ${presence.toXML().toStringOpt()}" }
567+
logger.trace { "Presence received ${presence.toXML()}" }
569568

570569
// Should never happen, but log if something is broken
571570
val myOccupantJid = this.myOccupantJid
572571
if (myOccupantJid == null) {
573-
logger.error("Processing presence when myOccupantJid is not set: ${presence.toXML().toStringOpt()}")
572+
logger.error("Processing presence when myOccupantJid is not set: ${presence.toXML()}")
574573
}
575574
if (myOccupantJid != null && myOccupantJid.equals(presence.from)) {
576575
processOwnPresence(presence)

‎jicofo-selector/src/main/java/org/jitsi/jicofo/bridge/JvbDoctor.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.jitsi.utils.logging2.*;
2424
import org.jitsi.xmpp.extensions.health.*;
2525

26-
import org.jitsi.xmpp.util.*;
2726
import org.jivesoftware.smack.*;
2827
import org.jivesoftware.smack.packet.*;
2928

@@ -274,16 +273,14 @@ protected void doHealthCheck()
274273
|| StanzaError.Condition.service_unavailable.equals(condition))
275274
{
276275
// Health check failure
277-
logger.warn(
278-
"Health check failed for: " + bridge + ": " + XmlStringBuilderUtil.toStringOpt(error)
279-
);
276+
logger.warn("Health check failed for: " + bridge + ": " + error.toXML());
280277
listener.healthCheckFailed(bridge.getJid());
281278
}
282279
else
283280
{
284281
logger.error(
285-
"Unexpected error returned by the bridge: " + bridge + ", err: "
286-
+ XmlStringBuilderUtil.toStringOpt(response));
282+
"Unexpected error returned by the bridge: " + bridge + ", err: " + response.toXML()
283+
);
287284
}
288285
}
289286
}

‎jicofo-selector/src/main/kotlin/org/jitsi/jicofo/bridge/colibri/Colibri2Session.kt‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ import org.jitsi.xmpp.extensions.colibri2.Transport
4343
import org.jitsi.xmpp.extensions.jingle.DtlsFingerprintPacketExtension
4444
import org.jitsi.xmpp.extensions.jingle.ExtmapAllowMixedPacketExtension
4545
import org.jitsi.xmpp.extensions.jingle.IceUdpTransportPacketExtension
46-
import org.jitsi.xmpp.util.XmlStringBuilderUtil.Companion.toStringOpt
4746
import org.jivesoftware.smack.StanzaCollector
4847
import org.jivesoftware.smack.packet.IQ
4948
import org.jivesoftware.smackx.muc.MUCRole
@@ -110,7 +109,7 @@ class Colibri2Session(
110109
participant.medias.forEach { endpoint.addMedia(it) }
111110
request.addEndpoint(endpoint.build())
112111

113-
logger.trace { "Sending allocation request for ${participant.id}: ${request.build().toStringOpt()}" }
112+
logger.trace { "Sending allocation request for ${participant.id}: ${request.build().toXML()}" }
114113
created = true
115114
return xmppConnection.createStanzaCollectorAndSend(request.build())
116115
}
@@ -259,7 +258,7 @@ class Colibri2Session(
259258
relayId: String
260259
) {
261260
logger.info("Setting relay transport for $relayId")
262-
logger.debug { "Setting relay transport for $relayId: ${transport.toStringOpt()}" }
261+
logger.debug { "Setting relay transport for $relayId: ${transport.toXML()}" }
263262
relays[relayId]?.setTransport(transport)
264263
?: throw IllegalStateException("Relay $relayId doesn't exist (bridge=${this.relayId}")
265264
}
@@ -292,7 +291,7 @@ class Colibri2Session(
292291
* failure.
293292
*/
294293
private fun sendRequest(iq: IQ, name: String) {
295-
logger.debug { "Sending $name request: ${iq.toStringOpt()}" }
294+
logger.debug { "Sending $name request: ${iq.toXML()}" }
296295
xmppConnection.sendIqAndHandleResponseAsync(iq) { response ->
297296
if (response == null) {
298297
logger.info("$name request timed out. Ignoring.")
@@ -314,12 +313,12 @@ class Colibri2Session(
314313
val reInvite = reason == Colibri2Error.Reason.UNKNOWN_ENDPOINT && endpointId != null
315314
if (reInvite) {
316315
logger.warn(
317-
"Endpoint [$endpointId] is not found, session failed: ${error.toStringOpt()}, " +
318-
"request was: ${iq.toStringOpt()}"
316+
"Endpoint [$endpointId] is not found, session failed: ${error.toXML()}, " +
317+
"request was: ${iq.toXML()}"
319318
)
320319
colibriSessionManager.endpointFailed(endpointId!!)
321320
} else {
322-
logger.error("Received error response for $name, session failed: ${error.toStringOpt()}")
321+
logger.error("Received error response for $name, session failed: ${error.toXML()}")
323322
colibriSessionManager.sessionFailed(this@Colibri2Session)
324323
}
325324
return@sendIqAndHandleResponseAsync
@@ -329,7 +328,7 @@ class Colibri2Session(
329328
logger.error("Received response with unexpected type ${response.javaClass.name}")
330329
colibriSessionManager.sessionFailed(this@Colibri2Session)
331330
} else {
332-
logger.debug { "Received $name response: ${response.toStringOpt()}" }
331+
logger.debug { "Received $name response: ${response.toXML()}" }
333332
}
334333
}
335334
}
@@ -374,22 +373,22 @@ class Colibri2Session(
374373
/** Send a request to allocate a new relay, and submit a task to wait for a response. */
375374
internal fun start(initialParticipants: List<ParticipantInfo>) {
376375
val request = buildCreateRelayRequest(initialParticipants)
377-
logger.trace { "Sending create relay: ${request.toStringOpt()}" }
376+
logger.trace { "Sending create relay: ${request.toXML()}" }
378377

379378
xmppConnection.sendIqAndHandleResponseAsync(request) { response ->
380379
// Wait for a response to the relay allocation request. When a response is received, parse the contained
381380
// transport and forward it to the associated [Relay] for the remote side via [colibriSessionManager]
382-
logger.trace { "Received response: ${response?.toStringOpt()}" }
381+
logger.trace { "Received response: ${response?.toXML()}" }
383382
if (response !is ConferenceModifiedIQ) {
384-
logger.error("Received error: ${response?.toStringOpt() ?: "timeout"}")
383+
logger.error("Received error: ${response?.toXML() ?: "timeout"}")
385384
colibriSessionManager.sessionFailed(this@Colibri2Session)
386385
return@sendIqAndHandleResponseAsync
387386
}
388387

389388
// TODO: We just assume that the response has a single [Colibri2Relay].
390389
val transport = response.relays.firstOrNull()?.transport
391390
?: run {
392-
logger.error("No transport in response: ${response.toStringOpt()}")
391+
logger.error("No transport in response: ${response.toXML()}")
393392
colibriSessionManager.sessionFailed(this@Colibri2Session)
394393
return@sendIqAndHandleResponseAsync
395394
}

‎jicofo-selector/src/main/kotlin/org/jitsi/jicofo/bridge/colibri/ColibriV2SessionManager.kt‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ import org.jitsi.xmpp.extensions.colibri2.Colibri2Error
4242
import org.jitsi.xmpp.extensions.colibri2.ConferenceModifiedIQ
4343
import org.jitsi.xmpp.extensions.colibri2.InitialLastN
4444
import org.jitsi.xmpp.extensions.jingle.IceUdpTransportPacketExtension
45-
import org.jitsi.xmpp.util.XmlStringBuilderUtil.Companion.toStringOpt
4645
import org.jivesoftware.smack.AbstractXMPPConnection
4746
import org.jivesoftware.smack.StanzaCollector
4847
import org.jivesoftware.smack.packet.IQ
@@ -365,7 +364,7 @@ class ColibriV2SessionManager(
365364
val response: IQ?
366365
try {
367366
response = stanzaCollector.nextResult()
368-
logger.trace { "Received response: ${response?.toStringOpt()}" }
367+
logger.trace { "Received response: ${response?.toXML()}" }
369368
} finally {
370369
stanzaCollector.cancel()
371370
}
@@ -442,13 +441,13 @@ class ColibriV2SessionManager(
442441
Colibri2Error.ELEMENT,
443442
Colibri2Error.NAMESPACE
444443
)?.reason
445-
logger.info("Received error response: ${response.toStringOpt()}")
444+
logger.info("Received error response: ${response.toXML()}")
446445
when (error.condition) {
447446
bad_request -> {
448447
// Most probably we sent a bad request.
449448
// If we flag the bridge as non-operational we may disrupt other conferences.
450449
// If we trigger a re-invite we may cause the same error repeating.
451-
throw ColibriAllocationFailedException("Bad request: ${error.toStringOpt()}", false)
450+
throw ColibriAllocationFailedException("Bad request: ${error.toXML()}", false)
452451
}
453452
item_not_found -> {
454453
if (reason == Colibri2Error.Reason.CONFERENCE_NOT_FOUND) {
@@ -467,7 +466,7 @@ class ColibriV2SessionManager(
467466
if (reason == null) {
468467
// An error NOT coming from the bridge.
469468
throw ColibriAllocationFailedException(
470-
"XMPP error: ${error.toStringOpt()}",
469+
"XMPP error: ${error.toXML()}",
471470
true
472471
)
473472
} else if (reason == Colibri2Error.Reason.CONFERENCE_ALREADY_EXISTS) {
@@ -480,7 +479,7 @@ class ColibriV2SessionManager(
480479
// we can't expire a conference without listing its individual endpoints and we think there
481480
// were none.
482481
// We remove the bridge from the conference (expiring it) and re-invite the participants.
483-
throw ColibriAllocationFailedException("Colibri error: ${error.toStringOpt()}", true)
482+
throw ColibriAllocationFailedException("Colibri error: ${error.toXML()}", true)
484483
}
485484
}
486485
service_unavailable -> {
@@ -496,7 +495,7 @@ class ColibriV2SessionManager(
496495
}
497496
else -> {
498497
session.bridge.isOperational = false
499-
throw ColibriAllocationFailedException("Error: ${error.toStringOpt()}", true)
498+
throw ColibriAllocationFailedException("Error: ${error.toXML()}", true)
500499
}
501500
}
502501
}
@@ -629,7 +628,7 @@ class ColibriV2SessionManager(
629628
relayId: String
630629
) {
631630
logger.info("Received transport from $session for relay $relayId")
632-
logger.debug { "Received transport from $session for relay $relayId: ${transport.toStringOpt()}" }
631+
logger.debug { "Received transport from $session for relay $relayId: ${transport.toXML()}" }
633632
synchronized(syncRoot) {
634633
// It's possible a new session was started for the same bridge.
635634
if (!sessions.containsKey(session.bridge.relayId) || sessions[session.bridge.relayId] != session) {

‎jicofo/src/main/java/org/jitsi/jicofo/conference/ParticipantInviteRunnable.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import org.jitsi.xmpp.extensions.jingle.JingleUtils;
3434
import org.jitsi.xmpp.extensions.jitsimeet.*;
3535
import org.jitsi.utils.logging2.*;
36-
import org.jitsi.xmpp.util.*;
3736
import org.jivesoftware.smack.*;
3837
import org.jivesoftware.smack.packet.*;
3938
import org.jxmpp.jid.*;
@@ -188,9 +187,7 @@ private void doRun()
188187
}
189188
else
190189
{
191-
logger.warn(
192-
"Failed to convert ContentPacketExtension to Media: "
193-
+ XmlStringBuilderUtil.toStringOpt(content));
190+
logger.warn("Failed to convert ContentPacketExtension to Media: " + content.toXML());
194191
}
195192
});
196193
// This makes the bridge signal its private host candidates. We enable them for backend components, because

‎jicofo/src/main/java/org/jitsi/jicofo/jibri/JibriSession.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.jitsi.xmpp.extensions.jibri.JibriIq.*;
2626
import org.jetbrains.annotations.*;
2727
import org.jitsi.utils.logging2.*;
28-
import org.jitsi.xmpp.util.*;
2928
import org.jivesoftware.smack.*;
3029
import org.jivesoftware.smack.packet.*;
3130
import org.jxmpp.jid.*;
@@ -352,7 +351,7 @@ synchronized public void stop(Jid initiator)
352351
stopRequest.setAction(JibriIq.Action.STOP);
353352
stopRequest.setSessionId(this.sessionId);
354353

355-
logger.info("Trying to stop: " + XmlStringBuilderUtil.toStringOpt(stopRequest));
354+
logger.info("Trying to stop: " + stopRequest.toXML());
356355

357356
SmackFuture<IQ, Exception> future =
358357
jibriDetector.getXmppConnection().sendIqRequestAsync(stopRequest, 60000);
@@ -367,7 +366,7 @@ synchronized public void stop(Jid initiator)
367366
{
368367
logger.error(
369368
"Unexpected response to stop iq: "
370-
+ (stanza != null ? XmlStringBuilderUtil.toStringOpt(stanza) : "null"));
369+
+ (stanza != null ? stanza.toXML() : "null"));
371370
stopError(stopRequest.getTo());
372371
}
373372
}).onError(exception ->
@@ -435,7 +434,7 @@ private void processJibriIqFromJibri(JibriIq iq)
435434
JibriIq.Status status = iq.getStatus();
436435
if (!JibriIq.Status.UNDEFINED.equals(status))
437436
{
438-
logger.info("Updating status from JIBRI: " + XmlStringBuilderUtil.toStringOpt(iq) + " for " + roomName);
437+
logger.info("Updating status from JIBRI: " + iq.toXML() + " for " + roomName);
439438

440439
handleJibriStatusUpdate(iq.getFrom(), status, iq.getFailureReason(), iq.getShouldRetry());
441440
}
@@ -542,7 +541,7 @@ private void sendJibriStartIq(final Jid jibriJid)
542541
}
543542
if (!(reply instanceof JibriIq))
544543
{
545-
logger.error("Unexpected response to start request: " + XmlStringBuilderUtil.toStringOpt(reply));
544+
logger.error("Unexpected response to start request: " + reply.toXML());
546545

547546
throw new StartException.UnexpectedResponse();
548547
}
@@ -556,7 +555,7 @@ private void sendJibriStartIq(final Jid jibriJid)
556555
if (!isPendingResponse(jibriIq))
557556
{
558557
logger.error(
559-
"Unexpected status received in response to the start IQ: " + XmlStringBuilderUtil.toStringOpt(jibriIq));
558+
"Unexpected status received in response to the start IQ: " + jibriIq.toXML());
560559

561560
throw new StartException.UnexpectedResponse();
562561
}

0 commit comments

Comments
 (0)