From 174e3c462f4c965612cb3a3179608a497b1a491e Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Sun, 28 Feb 2021 21:21:51 +0100
Subject: [PATCH] Reformat sources
---
.../libquassel/protocol/models/HandshakeMessage.kt | 1 -
.../libquassel/protocol/models/ids/SignedId.kt | 1 -
.../serializers/handshake/SessionInitSerializer.kt | 9 ++++++---
.../protocol/serializers/qt/ByteBufferSerializer.kt | 1 -
.../serializers/quassel/BufferInfoSerializer.kt | 1 -
.../protocol/syncables/BufferViewManager.kt | 3 ++-
.../protocol/syncables/IgnoreListManager.kt | 1 -
.../libquassel/protocol/syncables/Network.kt | 12 +++++-------
.../protocol/syncables/StatefulSyncableObject.kt | 2 +-
.../libquassel/protocol/util/collections/pairs.kt | 3 ---
.../protocol/serializers/qt/UuidSerializerTest.kt | 2 +-
.../libquassel/protocol/syncables/NetworkTest.kt | 4 ++--
.../justjanne/libquassel/protocol/testutil/Random.kt | 2 +-
.../protocol/testutil/handshakeSerializerTest.kt | 3 ---
.../testutil/testPrimitiveSerializerDirect.kt | 1 -
15 files changed, 18 insertions(+), 28 deletions(-)
diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/HandshakeMessage.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/HandshakeMessage.kt
index b6a3cf1..d7203d8 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/HandshakeMessage.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/HandshakeMessage.kt
@@ -12,7 +12,6 @@ package de.justjanne.libquassel.protocol.models
import de.justjanne.libquassel.protocol.features.FeatureSet
import de.justjanne.libquassel.protocol.models.ids.NetworkId
-import de.justjanne.libquassel.protocol.variant.QVariantList
import de.justjanne.libquassel.protocol.variant.QVariantMap
/**
diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/ids/SignedId.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/ids/SignedId.kt
index 1b25a64..e91f0c8 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/ids/SignedId.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/models/ids/SignedId.kt
@@ -10,7 +10,6 @@
package de.justjanne.libquassel.protocol.models.ids
-import de.justjanne.libquassel.annotations.Generated
import java.io.Serializable
/**
diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/serializers/handshake/SessionInitSerializer.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/serializers/handshake/SessionInitSerializer.kt
index 3bde603..8511039 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/serializers/handshake/SessionInitSerializer.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/serializers/handshake/SessionInitSerializer.kt
@@ -44,9 +44,12 @@ object SessionInitSerializer : HandshakeSerializer<HandshakeMessage.SessionInit>
},
QtType.QVariantList
),
- "Identities" to qVariant<QVariantList>(data.identities.map {
- qVariant<QVariantMap>(it, QuasselType.Identity)
- }, QtType.QVariantList),
+ "Identities" to qVariant<QVariantList>(
+ data.identities.map {
+ qVariant<QVariantMap>(it, QuasselType.Identity)
+ },
+ QtType.QVariantList
+ ),
),
QtType.QVariantMap
)
diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/serializers/qt/ByteBufferSerializer.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/serializers/qt/ByteBufferSerializer.kt
index 0394c64..28c88a0 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/serializers/qt/ByteBufferSerializer.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/serializers/qt/ByteBufferSerializer.kt
@@ -12,7 +12,6 @@ package de.justjanne.libquassel.protocol.serializers.qt
import de.justjanne.libquassel.protocol.features.FeatureSet
import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
-import de.justjanne.libquassel.protocol.io.contentToString
import de.justjanne.libquassel.protocol.io.copyData
import de.justjanne.libquassel.protocol.serializers.PrimitiveSerializer
import java.nio.ByteBuffer
diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/serializers/quassel/BufferInfoSerializer.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/serializers/quassel/BufferInfoSerializer.kt
index e21f8a5..9857ba7 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/serializers/quassel/BufferInfoSerializer.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/serializers/quassel/BufferInfoSerializer.kt
@@ -14,7 +14,6 @@ import de.justjanne.bitflags.of
import de.justjanne.bitflags.toBits
import de.justjanne.libquassel.protocol.features.FeatureSet
import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
-import de.justjanne.libquassel.protocol.io.contentToString
import de.justjanne.libquassel.protocol.models.BufferInfo
import de.justjanne.libquassel.protocol.models.flags.BufferType
import de.justjanne.libquassel.protocol.serializers.PrimitiveSerializer
diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/BufferViewManager.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/BufferViewManager.kt
index 07f1b48..b2a6dbd 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/BufferViewManager.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/BufferViewManager.kt
@@ -52,7 +52,8 @@ open class BufferViewManager(
}
val config = BufferViewConfig(
- session, BufferViewConfigState(
+ session,
+ BufferViewConfigState(
bufferViewId = bufferViewConfigId
)
)
diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/IgnoreListManager.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/IgnoreListManager.kt
index c16ba3e..30254bc 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/IgnoreListManager.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/IgnoreListManager.kt
@@ -9,4 +9,3 @@
*/
package de.justjanne.libquassel.protocol.syncables
-
diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/Network.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/Network.kt
index 5b00831..cee2ac6 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/Network.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/Network.kt
@@ -10,7 +10,6 @@
package de.justjanne.libquassel.protocol.syncables
-import de.justjanne.libquassel.protocol.models.ChannelModeType
import de.justjanne.libquassel.protocol.models.ConnectionState
import de.justjanne.libquassel.protocol.models.NetworkInfo
import de.justjanne.libquassel.protocol.models.NetworkServer
@@ -23,16 +22,13 @@ import de.justjanne.libquassel.protocol.syncables.state.IrcChannelState
import de.justjanne.libquassel.protocol.syncables.state.IrcUserState
import de.justjanne.libquassel.protocol.syncables.state.NetworkState
import de.justjanne.libquassel.protocol.syncables.stubs.NetworkStub
-import de.justjanne.libquassel.protocol.util.collections.indices
-import de.justjanne.libquassel.protocol.util.irc.HostmaskHelper
-import de.justjanne.libquassel.protocol.util.irc.IrcISupport
import de.justjanne.libquassel.protocol.util.collections.transpose
+import de.justjanne.libquassel.protocol.util.irc.HostmaskHelper
import de.justjanne.libquassel.protocol.util.update
import de.justjanne.libquassel.protocol.variant.QVariantList
import de.justjanne.libquassel.protocol.variant.QVariantMap
import de.justjanne.libquassel.protocol.variant.into
import de.justjanne.libquassel.protocol.variant.qVariant
-import kotlinx.coroutines.flow.MutableStateFlow
import java.nio.ByteBuffer
open class Network(
@@ -322,7 +318,8 @@ open class Network(
}
val user = IrcUser(
- session, IrcUserState(
+ session,
+ IrcUserState(
network = networkId(),
nick = nick,
user = ident,
@@ -351,7 +348,8 @@ open class Network(
}
val channel = IrcChannel(
- session, IrcChannelState(
+ session,
+ IrcChannelState(
network = networkId(),
name = name
)
diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/StatefulSyncableObject.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/StatefulSyncableObject.kt
index b30b70c..70a5e93 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/StatefulSyncableObject.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/StatefulSyncableObject.kt
@@ -18,7 +18,7 @@ abstract class StatefulSyncableObject<T>(
state: T
) : SyncableObject(session, className) {
override fun toString(): String {
- return "$className(objectName=${objectName}, state=${state()})"
+ return "$className(objectName=$objectName, state=${state()})"
}
override fun equals(other: Any?): Boolean {
diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/util/collections/pairs.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/util/collections/pairs.kt
index 92e0668..b4f01da 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/util/collections/pairs.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/util/collections/pairs.kt
@@ -10,9 +10,6 @@
package de.justjanne.libquassel.protocol.util.collections
-import org.bouncycastle.util.io.Streams
-import java.util.stream.Stream
-
/**
* Returns a partitioned list of pairs
*/
diff --git a/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/qt/UuidSerializerTest.kt b/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/qt/UuidSerializerTest.kt
index 61da420..d0bbcac 100644
--- a/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/qt/UuidSerializerTest.kt
+++ b/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/qt/UuidSerializerTest.kt
@@ -41,7 +41,7 @@ class UuidSerializerTest {
UuidSerializer,
UUID.fromString("e4335bb0-ceef-4b9f-8ceb-be19b4da34fd"),
byteBufferOf(
- 0xE4u, 0x33u, 0x5Bu, 0xB0u, 0xCEu, 0xEFu, 0x4Bu, 0x9Fu, 0x8Cu, 0xEBu, 0xBEu, 0x19u, 0xB4u, 0xDAu, 0x34u, 0xFDu,
+ 0xE4u, 0x33u, 0x5Bu, 0xB0u, 0xCEu, 0xEFu, 0x4Bu, 0x9Fu, 0x8Cu, 0xEBu, 0xBEu, 0x19u, 0xB4u, 0xDAu, 0x34u, 0xFDu,
)
)
}
diff --git a/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/syncables/NetworkTest.kt b/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/syncables/NetworkTest.kt
index 75226e0..acecf40 100644
--- a/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/syncables/NetworkTest.kt
+++ b/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/syncables/NetworkTest.kt
@@ -62,11 +62,11 @@ fun Random.nextNetwork(networkId: NetworkId) = NetworkState(
capsEnabled = List(nextInt(20)) {
nextString()
}.toSet(),
- serverList = List(nextInt(20)) {
+ serverList = List(nextInt(20)) {
nextNetworkServer()
},
useRandomServer = nextBoolean(),
- perform = List(nextInt(20)) {
+ perform = List(nextInt(20)) {
nextString()
},
useAutoIdentify = nextBoolean(),
diff --git a/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/Random.kt b/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/Random.kt
index 29f8612..5cf9157 100644
--- a/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/Random.kt
+++ b/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/Random.kt
@@ -33,7 +33,7 @@ fun <T> Random.nextOf(vararg elements: T): T {
return nextOf(elements.toList())
}
-inline fun <reified T: Enum<T>> Random.nextEnum(): T {
+inline fun <reified T : Enum<T>> Random.nextEnum(): T {
return nextOf(EnumSet.allOf(T::class.java).toList())
}
diff --git a/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/handshakeSerializerTest.kt b/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/handshakeSerializerTest.kt
index d20a0e2..d79c6b5 100644
--- a/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/handshakeSerializerTest.kt
+++ b/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/handshakeSerializerTest.kt
@@ -19,7 +19,6 @@
package de.justjanne.libquassel.protocol.testutil
import de.justjanne.libquassel.protocol.features.FeatureSet
-import de.justjanne.libquassel.protocol.io.contentToString
import de.justjanne.libquassel.protocol.io.useChainedByteBuffer
import de.justjanne.libquassel.protocol.models.HandshakeMessage
import de.justjanne.libquassel.protocol.serializers.HandshakeMessageSerializer
@@ -27,9 +26,7 @@ import de.justjanne.libquassel.protocol.testutil.matchers.ByteBufferMatcher
import de.justjanne.libquassel.protocol.util.withRewind
import org.hamcrest.Matcher
import org.hamcrest.MatcherAssert.assertThat
-import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.Assertions.assertTrue
import java.nio.ByteBuffer
inline fun <reified T : HandshakeMessage> handshakeSerializerTest(
diff --git a/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testPrimitiveSerializerDirect.kt b/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testPrimitiveSerializerDirect.kt
index 7c9709d..18369ba 100644
--- a/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testPrimitiveSerializerDirect.kt
+++ b/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testPrimitiveSerializerDirect.kt
@@ -20,7 +20,6 @@ package de.justjanne.libquassel.protocol.testutil
import de.justjanne.libquassel.protocol.features.FeatureSet
import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
-import de.justjanne.libquassel.protocol.io.contentToString
import de.justjanne.libquassel.protocol.serializers.PrimitiveSerializer
import org.hamcrest.Matcher
import org.hamcrest.MatcherAssert.assertThat
--
GitLab