Update jitsi-utils (#1925)

* chore: Update jitsi-utils. * chore: Update jicoco.
jitsi · Jul 20, 2022 · ade06bf · ade06bf
1 parent efc1d24
commit ade06bf
Show file tree

Hide file tree

Showing 25 changed files with 28 additions and 30 deletions.
diff --git a/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/rtp/TransportCcEngine.kt b/jitsi-media-transform/src/main/kotlin/org/jitsi/nlj/rtp/TransportCcEngine.kt
@@ -35,7 +35,6 @@ import org.json.simple.JSONObject
 import java.time.Clock
 import java.time.Duration
 import java.time.Instant
-import java.util.*
 import java.util.concurrent.atomic.LongAdder
 
 /**
@@ -90,7 +89,7 @@ class TransportCcEngine(
 
     private var lastRtt: Duration? = null
 
-    private val lossListeners = LinkedList<LossListener>()
+    private val lossListeners = mutableListOf<LossListener>()
 
     /**
      * Called when an RTP sender has a new round-trip time estimate.

diff --git a/...media-transform/src/main/kotlin/org/jitsi/nlj/transform/node/incoming/TccGeneratorNode.kt b/...media-transform/src/main/kotlin/org/jitsi/nlj/transform/node/incoming/TccGeneratorNode.kt
@@ -40,7 +40,7 @@ import org.jitsi.utils.secs
 import java.time.Clock
 import java.time.Duration
 import java.time.Instant
-import java.util.*
+import java.util.TreeMap
 
 /**
  * Extract the TCC sequence numbers from each passing packet and generate
@@ -70,7 +70,7 @@ class TccGeneratorNode(
     }
     private val rfc3711IndexTracker = Rfc3711IndexTracker()
 
-    private val lossListeners = LinkedList<LossListener>()
+    private val lossListeners = mutableListOf<LossListener>()
 
     init {
         streamInformation.onRtpExtensionMapping(TRANSPORT_CC) {

diff --git a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/MediaSourceDescTest.kt b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/MediaSourceDescTest.kt
@@ -224,9 +224,8 @@ private fun createSource(
 ): MediaSourceDesc {
     var height = 720
 
-    val encodings = Array(primarySsrcs.size) {
-            encodingIdx ->
-        val primarySsrc: Long = primarySsrcs.get(encodingIdx)
+    val encodings = Array(primarySsrcs.size) { encodingIdx ->
+        val primarySsrc: Long = primarySsrcs[encodingIdx]
         val ret = createRtpEncodingDesc(
             primarySsrc,
             numSpatialLayersPerStream, numTemporalLayersPerStream, encodingIdx, height

diff --git a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/rtcp/KeyframeRequesterTest.kt b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/rtcp/KeyframeRequesterTest.kt
@@ -35,9 +35,9 @@ import org.jitsi.nlj.util.RtpExtensionHandler
 import org.jitsi.nlj.util.RtpPayloadTypesChangedHandler
 import org.jitsi.rtp.rtcp.rtcpfb.payload_specific_fb.RtcpFbFirPacket
 import org.jitsi.rtp.rtcp.rtcpfb.payload_specific_fb.RtcpFbPliPacket
-import org.jitsi.test.time.FakeClock
 import org.jitsi.utils.ms
 import org.jitsi.utils.secs
+import org.jitsi.utils.time.FakeClock
 
 class KeyframeRequesterTest : ShouldSpec() {
     override fun isolationMode(): IsolationMode? = IsolationMode.InstancePerLeaf

diff --git a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/rtcp/StreamPacketRequesterTest.kt b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/rtcp/StreamPacketRequesterTest.kt
@@ -24,7 +24,7 @@ import io.kotest.matchers.shouldBe
 import org.jitsi.nlj.resources.logging.StdoutLogger
 import org.jitsi.rtp.rtcp.RtcpPacket
 import org.jitsi.rtp.rtcp.rtcpfb.transport_layer_fb.RtcpFbNackPacket
-import org.jitsi.test.concurrent.FakeScheduledExecutorService
+import org.jitsi.utils.concurrent.FakeScheduledExecutorService
 
 class StreamPacketRequesterTest : ShouldSpec() {
     override fun isolationMode(): IsolationMode? = IsolationMode.InstancePerLeaf

diff --git a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/rtp/TransportCcEngineTest.kt b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/rtp/TransportCcEngineTest.kt
@@ -23,7 +23,7 @@ import org.jitsi.nlj.resources.logging.StdoutLogger
 import org.jitsi.nlj.rtp.bandwidthestimation.BandwidthEstimator
 import org.jitsi.nlj.util.bytes
 import org.jitsi.rtp.rtcp.rtcpfb.transport_layer_fb.tcc.RtcpFbTccPacketBuilder
-import org.jitsi.test.time.FakeClock
+import org.jitsi.utils.time.FakeClock
 import java.util.logging.Level
 
 class TransportCcEngineTest : FunSpec() {

diff --git a/...ransform/src/test/kotlin/org/jitsi/nlj/rtp/bandwidthestimation/BandwidthEstimationTest.kt b/...ransform/src/test/kotlin/org/jitsi/nlj/rtp/bandwidthestimation/BandwidthEstimationTest.kt
@@ -25,7 +25,7 @@ import org.jitsi.nlj.util.bits
 import org.jitsi.nlj.util.bps
 import org.jitsi.nlj.util.bytes
 import org.jitsi.nlj.util.mbps
-import org.jitsi.test.concurrent.FakeScheduledExecutorService
+import org.jitsi.utils.concurrent.FakeScheduledExecutorService
 import org.jitsi.utils.logging.DiagnosticContext
 import org.jitsi.utils.logging.TimeSeriesLogger
 import org.jitsi.utils.logging2.LoggerImpl

diff --git a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/stats/EndpointConnectionStatsTest.kt b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/stats/EndpointConnectionStatsTest.kt
@@ -27,8 +27,8 @@ import org.jitsi.nlj.test_utils.timeline
 import org.jitsi.rtp.rtcp.RtcpReportBlock
 import org.jitsi.rtp.rtcp.RtcpRrPacket
 import org.jitsi.rtp.rtcp.RtcpSrPacket
-import org.jitsi.test.time.FakeClock
 import org.jitsi.utils.ms
+import org.jitsi.utils.time.FakeClock
 import java.time.Duration
 
 class EndpointConnectionStatsTest : ShouldSpec() {

diff --git a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/stats/PacketIOActivityTest.kt b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/stats/PacketIOActivityTest.kt
@@ -19,8 +19,8 @@ package org.jitsi.nlj.stats
 import io.kotest.core.spec.IsolationMode
 import io.kotest.core.spec.style.ShouldSpec
 import io.kotest.matchers.shouldBe
-import org.jitsi.test.time.FakeClock
 import org.jitsi.utils.secs
+import org.jitsi.utils.time.FakeClock
 import java.time.Duration
 
 class PacketIOActivityTest : ShouldSpec() {

diff --git a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/test_utils/RtpPacketGenerator.kt b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/test_utils/RtpPacketGenerator.kt
@@ -22,9 +22,9 @@ import org.jitsi.nlj.util.atRate
 import org.jitsi.nlj.util.howMuchCanISendAtRate
 import org.jitsi.nlj.util.`in`
 import org.jitsi.rtp.rtp.RtpPacket
-import org.jitsi.test.time.FakeClock
 import org.jitsi.utils.div
 import org.jitsi.utils.secs
+import org.jitsi.utils.time.FakeClock
 import java.time.Duration
 import java.time.Instant
 

diff --git a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/test_utils/TimelineTest.kt b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/test_utils/TimelineTest.kt
@@ -16,7 +16,7 @@
 
 package org.jitsi.nlj.test_utils
 
-import org.jitsi.test.time.FakeClock
+import org.jitsi.utils.time.FakeClock
 import java.time.Duration
 import java.time.Instant
 

diff --git a/...orm/src/test/kotlin/org/jitsi/nlj/transform/node/incoming/RemoteBandwidthEstimatorTest.kt b/...orm/src/test/kotlin/org/jitsi/nlj/transform/node/incoming/RemoteBandwidthEstimatorTest.kt
@@ -31,8 +31,8 @@ import org.jitsi.nlj.util.StreamInformationStoreImpl
 import org.jitsi.nlj.util.mbps
 import org.jitsi.rtp.rtp.RtpPacket
 import org.jitsi.rtp.rtp.header_extensions.AbsSendTimeHeaderExtension
-import org.jitsi.test.time.FakeClock
 import org.jitsi.utils.secs
+import org.jitsi.utils.time.FakeClock
 import java.time.Duration
 
 class RemoteBandwidthEstimatorTest : ShouldSpec() {

diff --git a/...a-transform/src/test/kotlin/org/jitsi/nlj/transform/node/incoming/TccGeneratorNodeTest.kt b/...a-transform/src/test/kotlin/org/jitsi/nlj/transform/node/incoming/TccGeneratorNodeTest.kt
@@ -22,8 +22,8 @@ import org.jitsi.rtp.rtcp.rtcpfb.transport_layer_fb.tcc.RtcpFbTccPacket
 import org.jitsi.rtp.rtcp.rtcpfb.transport_layer_fb.tcc.UnreceivedPacketReport
 import org.jitsi.rtp.rtp.RtpPacket
 import org.jitsi.rtp.rtp.header_extensions.TccHeaderExtension
-import org.jitsi.test.time.FakeClock
 import org.jitsi.utils.ms
+import org.jitsi.utils.time.FakeClock
 import java.time.Duration
 import java.util.Random
 

diff --git a/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/util/TimeExpiringCacheTest.kt b/jitsi-media-transform/src/test/kotlin/org/jitsi/nlj/util/TimeExpiringCacheTest.kt
@@ -21,8 +21,8 @@ import io.kotest.core.spec.style.ShouldSpec
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.shouldNotBe
 import io.kotest.matchers.types.shouldBeSameInstanceAs
-import org.jitsi.test.time.FakeClock
 import org.jitsi.utils.secs
+import org.jitsi.utils.time.FakeClock
 import java.time.Instant
 
 internal class TimeExpiringCacheTest : ShouldSpec() {

diff --git a/jvb/src/test/kotlin/org/jitsi/videobridge/EndpointConnectionStatusMonitorTest.kt b/jvb/src/test/kotlin/org/jitsi/videobridge/EndpointConnectionStatusMonitorTest.kt
@@ -27,7 +27,7 @@ import io.mockk.every
 import io.mockk.mockk
 import io.mockk.slot
 import org.jitsi.nlj.util.NEVER
-import org.jitsi.test.concurrent.FakeScheduledExecutorService
+import org.jitsi.utils.concurrent.FakeScheduledExecutorService
 import org.jitsi.utils.logging2.LoggerImpl
 import org.jitsi.utils.mins
 import org.jitsi.utils.secs

diff --git a/jvb/src/test/kotlin/org/jitsi/videobridge/VideobridgeTest.kt b/jvb/src/test/kotlin/org/jitsi/videobridge/VideobridgeTest.kt
@@ -25,8 +25,8 @@ import io.mockk.mockk
 import io.mockk.verify
 import org.jitsi.config.withNewConfig
 import org.jitsi.shutdown.ShutdownServiceImpl
-import org.jitsi.test.concurrent.FakeScheduledExecutorService
 import org.jitsi.utils.OrderedJsonObject
+import org.jitsi.utils.concurrent.FakeScheduledExecutorService
 import org.jitsi.videobridge.shutdown.ShutdownConfig
 import org.jitsi.videobridge.shutdown.ShutdownState
 import org.jitsi.videobridge.util.TaskPools

diff --git a/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerNewTest.kt b/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerNewTest.kt
@@ -31,11 +31,11 @@ import org.jitsi.nlj.rtp.VideoRtpPacket
 import org.jitsi.nlj.util.bps
 import org.jitsi.nlj.util.kbps
 import org.jitsi.nlj.util.mbps
-import org.jitsi.test.time.FakeClock
 import org.jitsi.utils.logging.DiagnosticContext
 import org.jitsi.utils.logging2.createLogger
 import org.jitsi.utils.ms
 import org.jitsi.utils.secs
+import org.jitsi.utils.time.FakeClock
 import org.jitsi.videobridge.message.ReceiverVideoConstraintsMessage
 import java.util.function.Supplier
 

diff --git a/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerPerfTest.kt b/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerPerfTest.kt
@@ -19,12 +19,12 @@ import io.kotest.core.spec.style.StringSpec
 import org.jitsi.nlj.PacketInfo
 import org.jitsi.nlj.format.RtxPayloadType
 import org.jitsi.nlj.rtp.VideoRtpPacket
-import org.jitsi.test.time.FakeClock
 import org.jitsi.utils.logging.DiagnosticContext
 import org.jitsi.utils.logging2.createLogger
 import org.jitsi.utils.ms
 import org.jitsi.utils.nanos
 import org.jitsi.utils.secs
+import org.jitsi.utils.time.FakeClock
 import org.jitsi.videobridge.message.ReceiverVideoConstraintsMessage
 import java.util.function.Supplier
 import kotlin.random.Random

diff --git a/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerTest.kt b/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerTest.kt
@@ -35,11 +35,11 @@ import org.jitsi.nlj.util.Bandwidth
 import org.jitsi.nlj.util.bps
 import org.jitsi.nlj.util.kbps
 import org.jitsi.nlj.util.mbps
-import org.jitsi.test.time.FakeClock
 import org.jitsi.utils.logging.DiagnosticContext
 import org.jitsi.utils.logging2.createLogger
 import org.jitsi.utils.ms
 import org.jitsi.utils.secs
+import org.jitsi.utils.time.FakeClock
 import org.jitsi.videobridge.configWithMultiStreamDisabled
 import org.jitsi.videobridge.message.ReceiverVideoConstraintsMessage
 import java.time.Instant

diff --git a/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerTraceTest.kt b/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/BitrateControllerTraceTest.kt
@@ -23,7 +23,7 @@ import org.jitsi.nlj.MediaSourceDesc
 import org.jitsi.nlj.RtpEncodingDesc
 import org.jitsi.nlj.VideoType
 import org.jitsi.nlj.util.bps
-import org.jitsi.test.time.FakeClock
+import org.jitsi.utils.time.FakeClock
 import java.time.Instant
 
 /**

diff --git a/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/SingleSourceAllocation2Test.kt b/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/SingleSourceAllocation2Test.kt
@@ -25,8 +25,8 @@ import org.jitsi.nlj.RtpEncodingDesc
 import org.jitsi.nlj.VideoType
 import org.jitsi.nlj.util.bps
 import org.jitsi.nlj.util.kbps
-import org.jitsi.test.time.FakeClock
 import org.jitsi.utils.logging.DiagnosticContext
+import org.jitsi.utils.time.FakeClock
 
 /**
  * Test the logic for selecting the layers to be considered for a source and the "preferred" layer.

diff --git a/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/SingleSourceAllocationTest.kt b/jvb/src/test/kotlin/org/jitsi/videobridge/cc/allocation/SingleSourceAllocationTest.kt
@@ -24,8 +24,8 @@ import org.jitsi.nlj.RtpEncodingDesc
 import org.jitsi.nlj.VideoType
 import org.jitsi.nlj.util.bps
 import org.jitsi.nlj.util.kbps
-import org.jitsi.test.time.FakeClock
 import org.jitsi.utils.logging.DiagnosticContext
+import org.jitsi.utils.time.FakeClock
 
 /**
  * Test the logic for selecting the layers to be considered for an endpoint and the "preferred" layer.

diff --git a/jvb/src/test/kotlin/org/jitsi/videobridge/load_management/JvbLoadManagerTest.kt b/jvb/src/test/kotlin/org/jitsi/videobridge/load_management/JvbLoadManagerTest.kt
@@ -23,9 +23,9 @@ import io.mockk.mockk
 import io.mockk.verify
 import org.jitsi.ConfigTest
 import org.jitsi.config.withNewConfig
-import org.jitsi.test.time.FakeClock
 import org.jitsi.utils.mins
 import org.jitsi.utils.secs
+import org.jitsi.utils.time.FakeClock
 
 class JvbLoadManagerTest : ConfigTest() {
     init {

diff --git a/jvb/src/test/kotlin/org/jitsi/videobridge/util/BooleanStateTimeTrackerTest.kt b/jvb/src/test/kotlin/org/jitsi/videobridge/util/BooleanStateTimeTrackerTest.kt
@@ -18,8 +18,8 @@ package org.jitsi.videobridge.util
 
 import io.kotest.core.spec.style.ShouldSpec
 import io.kotest.matchers.shouldBe
-import org.jitsi.test.time.FakeClock
 import org.jitsi.utils.secs
+import org.jitsi.utils.time.FakeClock
 import java.time.Duration
 
 class BooleanStateTimeTrackerTest : ShouldSpec() {

diff --git a/pom.xml b/pom.xml
@@ -27,8 +27,8 @@
         <kotlin.version>1.6.21</kotlin.version>
         <kotest.version>5.3.0</kotest.version>
         <junit.version>5.8.2</junit.version>
-        <jicoco.version>1.1-112-g46bbe5c</jicoco.version>
-        <jitsi.utils.version>1.0-115-gb93957d</jitsi.utils.version>
+        <jicoco.version>1.1-113-g4e7ea8b</jicoco.version>
+        <jitsi.utils.version>1.0-119-ga7b23ff</jitsi.utils.version>
         <ktlint-maven-plugin.version>1.13.1</ktlint-maven-plugin.version>
         <maven-shade-plugin.version>3.2.2</maven-shade-plugin.version>
         <spotbugs.version>4.6.0</spotbugs.version>