minor code improvements

doip-sim-ecu · Apr 15, 2022 · 221215d · 221215d
1 parent 244f908
commit 221215d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/src/main/kotlin/DataStorage.kt b/src/main/kotlin/DataStorage.kt
@@ -1,4 +1,3 @@
-import java.util.concurrent.ConcurrentHashMap
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 
@@ -20,7 +19,7 @@ class StoragePropertyDelegate<T>(
 }
 
 open class DataStorage {
-    private val internalDataStorage: MutableMap<String, Any?> = ConcurrentHashMap()
+    private val internalDataStorage: MutableMap<String, Any?> = mutableMapOf()
 
     /**
      * Create a persistent property by means of delegation, with an initival value

diff --git a/src/main/kotlin/library/DefaultDoipEntityTcpConnectionMessageHandler.kt b/src/main/kotlin/library/DefaultDoipEntityTcpConnectionMessageHandler.kt
@@ -1,5 +1,7 @@
 package library
 
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.slf4j.MDC
@@ -143,5 +145,7 @@ fun DoipEntity.hasAlreadyActiveConnection(sourceAddress: Short, exclude: DoipTcp
                 && it != exclude
     }
 
-fun OutputStream.writeFully(byteArray: ByteArray) =
-    this.write(byteArray)
+suspend fun OutputStream.writeFully(byteArray: ByteArray) =
+    withContext(Dispatchers.IO) {
+        this@writeFully.write(byteArray)
+    }
diff --git a/src/main/kotlin/library/DoipClient.kt b/src/main/kotlin/library/DoipClient.kt
@@ -12,7 +12,6 @@ import java.nio.ByteBuffer
 import kotlin.concurrent.fixedRateTimer
 import kotlin.concurrent.thread
 import kotlin.time.Duration
-import kotlin.time.ExperimentalTime
 
 class DoipClient(
     private val broadcastAddress: SocketAddress = InetSocketAddress("255.255.255.255", 13400),
@@ -38,7 +37,6 @@ class DoipClient(
         }
     }
 
-    @OptIn(ExperimentalTime::class)
     fun waitForVAM(timeout: Duration = Duration.INFINITE, logicalAddress: Short? = null): Boolean =
         runBlocking {
             withTimeoutOrNull(timeout) {
@@ -126,7 +124,6 @@ class DoipTcpConnection(socket: Socket, private val testerAddress: Short) {
         }
     }
 
-    @OptIn(ExperimentalTime::class)
     fun sendDiagnosticMessage(
         targetAddress: Short,
         message: ByteArray,

diff --git a/src/main/kotlin/library/DoipUdpMessageParser.kt b/src/main/kotlin/library/DoipUdpMessageParser.kt
@@ -1,7 +1,7 @@
 package library
 
 import io.ktor.utils.io.core.*
-import kotlin.experimental.xor
+import kotlin.experimental.inv
 
 open class HeaderNegAckException(message: String) : RuntimeException(message)
 
@@ -12,8 +12,7 @@ class UnknownPayloadType(message: String) : HeaderNegAckException(message)
 
 object DoipUdpMessageParser {
     private fun checkSyncPattern(protocolVersion: Byte, inverseProtocolVersion: Byte): Boolean {
-        if (protocolVersion != inverseProtocolVersion xor 0xFF.toByte()
-        ) {
+        if (protocolVersion != inverseProtocolVersion.inv()) {
             return false
         }
         return true