Use stdlib toHexString

Author: twyatt

kable-core/src/commonMain/kotlin/ByteArray.kt

@@ -3,28 +3,6 @@ package com.juul.kable
 import com.juul.kable.Endianness.BigEndian
 import com.juul.kable.Endianness.LittleEndian
 
-/**
- * Copied from Tuulbox.
- * https://github.com/JuulLabs/tuulbox/blob/fde4eb74d2aeb37b6aaac2002bccc553adc02c5a/encoding/src/commonMain/kotlin/HexString.kt
- */
-internal fun ByteArray.toHexString(
-    separator: String? = null,
-    prefix: String? = null,
-    lowerCase: Boolean = false,
-): String {
-    if (isEmpty()) return ""
-    val hexCode = if (lowerCase) "0123456789abcdef" else "0123456789ABCDEF"
-    val capacity = size * (2 + (prefix?.length ?: 0)) + (size - 1) * (separator?.length ?: 0)
-    val r = StringBuilder(capacity)
-    for (b in this) {
-        if (separator != null && r.isNotEmpty()) r.append(separator)
-        if (prefix != null) r.append(prefix)
-        r.append(hexCode[b.toInt() shr 4 and 0xF])
-        r.append(hexCode[b.toInt() and 0xF])
-    }
-    return r.toString()
-}
-
 internal fun ByteArray.toShort(): Int {
     require(size == 2) { "ByteArray must be size of 2 to be converted to a short, was $size" }
     return this[0] and 0xFF shl 8 or (this[1] and 0xFF)

kable-core/src/commonMain/kotlin/Filter.kt

@@ -3,6 +3,7 @@ package com.juul.kable
 import com.juul.kable.Filter.Name.Exact
 import com.juul.kable.Filter.Name.Prefix
 import kotlin.experimental.and
+import kotlin.text.HexFormat.Companion.UpperCase
 import kotlin.uuid.Uuid
 
 /**
@@ -126,7 +127,7 @@ public sealed class Filter {
         }
 
         override fun toString(): String =
-            "ManufacturerData(id=$id, data=${data?.toHexString()}, dataMask=${dataMask?.toHexString()})"
+            "ManufacturerData(id=$id, data=${data?.toHexString(UpperCase)}, dataMask=${dataMask?.toHexString()})"
     }
 
     /**

kable-core/src/commonMain/kotlin/logs/Hex.kt

@@ -1,7 +1,5 @@
 package com.juul.kable.logs
 
-import com.juul.kable.toHexString
-
 public val Hex: Logging.DataProcessor = Hex()
 
 public class HexBuilder internal constructor() {
@@ -15,7 +13,13 @@ public class HexBuilder internal constructor() {
 
 public fun Hex(init: HexBuilder.() -> Unit = {}): Logging.DataProcessor {
     val config = HexBuilder().apply(init)
+    val format = HexFormat {
+        upperCase = !config.lowerCase
+        bytes {
+            byteSeparator = config.separator
+        }
+    }
     return Logging.DataProcessor { data, _, _, _, _ ->
-        data.toHexString(separator = config.separator, lowerCase = config.lowerCase)
+        data.toHexString(format)
     }
 }