Skip to content
Snippets Groups Projects
Verified Commit 174e3c46 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Reformat sources

parent be20250e
Branches
Tags
No related merge requests found
Showing
with 18 additions and 28 deletions
......@@ -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
/**
......
......@@ -10,7 +10,6 @@
package de.justjanne.libquassel.protocol.models.ids
import de.justjanne.libquassel.annotations.Generated
import java.io.Serializable
/**
......
......@@ -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
)
......
......@@ -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
......
......@@ -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
......
......@@ -52,7 +52,8 @@ open class BufferViewManager(
}
val config = BufferViewConfig(
session, BufferViewConfigState(
session,
BufferViewConfigState(
bufferViewId = bufferViewConfigId
)
)
......
......@@ -9,4 +9,3 @@
*/
package de.justjanne.libquassel.protocol.syncables
......@@ -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
)
......
......@@ -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 {
......
......@@ -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
*/
......
......@@ -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,
)
)
}
......@@ -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(),
......
......@@ -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())
}
......
......@@ -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(
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment