chore: Fix and enforce import ordering. (#1678)

jitsi · Jun 29, 2021 · e83100a · e83100a
1 parent 2a0848b
commit e83100a
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 17 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -2,8 +2,4 @@
 # Comma-separated list of rules to disable (Since 0.34.0)
 # Note that rules in any ruleset other than the standard ruleset will need to be prefixed 
 # by the ruleset identifier.
-# intellij currently has no setting to set sort order, and its
-# default behavior directly contradicts what this rule wants. see
-# https://youtrack.jetbrains.com/issue/KT-10974
-disabled_rules=import-ordering
 max_line_length=120
diff --git a/jvb/src/main/kotlin/org/jitsi/videobridge/Endpoint.kt b/jvb/src/main/kotlin/org/jitsi/videobridge/Endpoint.kt
@@ -35,7 +35,6 @@ import org.jitsi.nlj.transform.node.ConsumerNode
 import org.jitsi.nlj.util.Bandwidth
 import org.jitsi.nlj.util.LocalSsrcAssociation
 import org.jitsi.nlj.util.NEVER
-import org.jitsi.utils.OrderedJsonObject
 import org.jitsi.nlj.util.PacketInfoQueue
 import org.jitsi.nlj.util.RemoteSsrcAssociation
 import org.jitsi.rtp.Packet
@@ -47,6 +46,7 @@ import org.jitsi.rtp.rtcp.rtcpfb.payload_specific_fb.RtcpFbFirPacket
 import org.jitsi.rtp.rtcp.rtcpfb.payload_specific_fb.RtcpFbPliPacket
 import org.jitsi.rtp.rtp.RtpPacket
 import org.jitsi.utils.MediaType
+import org.jitsi.utils.OrderedJsonObject
 import org.jitsi.utils.concurrent.RecurringRunnableExecutor
 import org.jitsi.utils.logging2.Logger
 import org.jitsi.utils.logging2.cdebug

diff --git a/jvb/src/main/kotlin/org/jitsi/videobridge/cc/allocation/AllocationSettings.kt b/jvb/src/main/kotlin/org/jitsi/videobridge/cc/allocation/AllocationSettings.kt
@@ -17,9 +17,9 @@ package org.jitsi.videobridge.cc.allocation
 
 import org.jitsi.utils.OrderedJsonObject
 import org.jitsi.videobridge.message.ReceiverVideoConstraintsMessage
-import org.jitsi.videobridge.cc.config.BitrateControllerConfig as config
 import java.util.stream.Collectors
 import kotlin.math.min
+import org.jitsi.videobridge.cc.config.BitrateControllerConfig as config
 
 /**
  * This class encapsulates all of the client-controlled settings for bandwidth allocation.

diff --git a/jvb/src/main/kotlin/org/jitsi/videobridge/octo/config/OctoRtpReceiver.kt b/jvb/src/main/kotlin/org/jitsi/videobridge/octo/config/OctoRtpReceiver.kt
@@ -42,13 +42,13 @@ import org.jitsi.nlj.transform.node.incoming.VideoParser
 import org.jitsi.nlj.transform.node.incoming.VideoQualityLayerLookup
 import org.jitsi.nlj.transform.packetPath
 import org.jitsi.nlj.transform.pipeline
-import org.jitsi.utils.OrderedJsonObject
 import org.jitsi.nlj.util.PacketInfoQueue
 import org.jitsi.nlj.util.PacketPredicate
 import org.jitsi.nlj.util.ReadOnlyStreamInformationStore
 import org.jitsi.rtp.Packet
 import org.jitsi.rtp.extensions.looksLikeRtcp
 import org.jitsi.rtp.extensions.looksLikeRtp
+import org.jitsi.utils.OrderedJsonObject
 import org.jitsi.utils.logging2.Logger
 import org.jitsi.utils.logging2.createChildLogger
 import org.jitsi.utils.queue.CountingErrorHandler

diff --git a/jvb/src/main/kotlin/org/jitsi/videobridge/octo/config/OctoRtpSender.kt b/jvb/src/main/kotlin/org/jitsi/videobridge/octo/config/OctoRtpSender.kt
@@ -30,9 +30,9 @@ import org.jitsi.nlj.stats.PacketStreamStats
 import org.jitsi.nlj.transform.NodeStatsVisitor
 import org.jitsi.nlj.transform.node.ConsumerNode
 import org.jitsi.nlj.transform.node.outgoing.OutgoingStatisticsSnapshot
-import org.jitsi.utils.OrderedJsonObject
 import org.jitsi.nlj.util.ReadOnlyStreamInformationStore
 import org.jitsi.nlj.util.bps
+import org.jitsi.utils.OrderedJsonObject
 import org.jitsi.utils.logging2.Logger
 import org.jitsi.utils.logging2.createChildLogger
 import org.jitsi.videobridge.util.ByteBufferPool

diff --git a/jvb/src/main/kotlin/org/jitsi/videobridge/transport/octo/BridgeOctoTransport.kt b/jvb/src/main/kotlin/org/jitsi/videobridge/transport/octo/BridgeOctoTransport.kt
@@ -17,11 +17,11 @@
 package org.jitsi.videobridge.transport.octo
 
 import org.jitsi.nlj.PacketHandler
-import org.jitsi.utils.OrderedJsonObject
 import org.jitsi.rtp.Packet
 import org.jitsi.rtp.UnparsedPacket
 import org.jitsi.rtp.rtp.RtpPacket
 import org.jitsi.utils.MediaType
+import org.jitsi.utils.OrderedJsonObject
 import org.jitsi.utils.logging2.Logger
 import org.jitsi.utils.logging2.cdebug
 import org.jitsi.utils.logging2.createChildLogger

diff --git a/jvb/src/main/kotlin/org/jitsi/videobridge/transport/udp/UdpTransport.kt b/jvb/src/main/kotlin/org/jitsi/videobridge/transport/udp/UdpTransport.kt
@@ -17,8 +17,8 @@
 package org.jitsi.videobridge.transport.udp
 
 import org.jitsi.nlj.util.BitrateTracker
-import org.jitsi.utils.OrderedJsonObject
 import org.jitsi.nlj.util.bytes
+import org.jitsi.utils.OrderedJsonObject
 import org.jitsi.utils.logging2.Logger
 import org.jitsi.utils.logging2.createChildLogger
 import org.jitsi.utils.secs

diff --git a/jvb/src/main/kotlin/org/jitsi/videobridge/util/PayloadTypeUtil.kt b/jvb/src/main/kotlin/org/jitsi/videobridge/util/PayloadTypeUtil.kt
@@ -22,13 +22,13 @@ import org.jitsi.nlj.format.OtherAudioPayloadType
 import org.jitsi.nlj.format.OtherVideoPayloadType
 import org.jitsi.nlj.format.PayloadType
 import org.jitsi.nlj.format.PayloadTypeEncoding.Companion.createFrom
-import org.jitsi.nlj.format.PayloadTypeEncoding.VP8
-import org.jitsi.nlj.format.PayloadTypeEncoding.VP9
 import org.jitsi.nlj.format.PayloadTypeEncoding.H264
 import org.jitsi.nlj.format.PayloadTypeEncoding.OPUS
-import org.jitsi.nlj.format.PayloadTypeEncoding.RTX
-import org.jitsi.nlj.format.PayloadTypeEncoding.RED
 import org.jitsi.nlj.format.PayloadTypeEncoding.OTHER
+import org.jitsi.nlj.format.PayloadTypeEncoding.RED
+import org.jitsi.nlj.format.PayloadTypeEncoding.RTX
+import org.jitsi.nlj.format.PayloadTypeEncoding.VP8
+import org.jitsi.nlj.format.PayloadTypeEncoding.VP9
 import org.jitsi.nlj.format.RtxPayloadType
 import org.jitsi.nlj.format.VideoRedPayloadType
 import org.jitsi.nlj.format.Vp8PayloadType

diff --git a/jvb/src/test/kotlin/org/jitsi/videobridge/VideobridgeTest.kt b/jvb/src/test/kotlin/org/jitsi/videobridge/VideobridgeTest.kt
@@ -21,8 +21,8 @@ import io.kotest.matchers.shouldBe
 import io.kotest.matchers.types.shouldBeInstanceOf
 import io.mockk.mockk
 import io.mockk.verify
-import org.jitsi.utils.OrderedJsonObject
 import org.jitsi.shutdown.ShutdownServiceImpl
+import org.jitsi.utils.OrderedJsonObject
 import org.jivesoftware.smack.packet.ErrorIQ
 import org.jivesoftware.smack.packet.XMPPError
 import org.json.simple.parser.JSONParser

diff --git a/jvb/src/test/kotlin/org/jitsi/videobridge/cc/vp9/Vp9QualityFilterTest.kt b/jvb/src/test/kotlin/org/jitsi/videobridge/cc/vp9/Vp9QualityFilterTest.kt
@@ -16,8 +16,8 @@
 
 package org.jitsi.videobridge.cc.vp9
 
-import io.kotest.matchers.shouldBe
 import io.kotest.core.spec.style.ShouldSpec
+import io.kotest.matchers.shouldBe
 import org.jitsi.nlj.RtpLayerDesc
 import org.jitsi.utils.logging2.LoggerImpl
 import org.jitsi.utils.logging2.getClassForLogging

diff --git a/jvb/src/test/kotlin/org/jitsi/videobridge/octo/OctoPacketTest.kt b/jvb/src/test/kotlin/org/jitsi/videobridge/octo/OctoPacketTest.kt
@@ -18,8 +18,8 @@ package org.jitsi.videobridge.octo
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.core.spec.style.ShouldSpec
 import io.kotest.matchers.shouldBe
-import org.jitsi.utils.MediaType
 import org.jitsi.rtp.extensions.bytearray.byteArrayOf
+import org.jitsi.utils.MediaType
 import java.lang.IllegalArgumentException
 
 class OctoPacketTest : ShouldSpec() {