Skip to content

Commit 1acba0d

Browse files
lion7gklijs
authored andcommitted
fix JDK 8 and JDK 11 compatibility
1 parent 55ffddf commit 1acba0d

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

kotlin/src/test/kotlin/org/axonframework/extensions/kotlin/serializer/KotlinSerializerCborTest.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ import kotlinx.serialization.cbor.Cbor
55
import org.axonframework.extensions.kotlin.serialization.KotlinSerializer
66
import org.junit.jupiter.api.Assertions.assertEquals
77
import org.junit.jupiter.api.Test
8-
import java.util.HexFormat
98

109
class KotlinSerializerCborTest {
1110
@OptIn(ExperimentalSerializationApi::class)
1211
private val sut = KotlinSerializer(Cbor)
13-
private val format = HexFormat.of()
1412

1513
@Test
1614
fun testStandardList() {
@@ -21,7 +19,7 @@ class KotlinSerializerCborTest {
2119
val actual = sut.serialize(items, ByteArray::class.java)
2220
val expected = "9fbf646e616d65616163666f6f01ffbf646e616d65616263666f6f02ffff"
2321
assertEquals("List:org.axonframework.extensions.kotlin.serializer.TypeOne", actual.type.name)
24-
assertEquals(expected, format.formatHex(actual.data))
22+
assertEquals(expected, actual.data.toHex())
2523
}
2624

2725
@Test
@@ -35,6 +33,6 @@ class KotlinSerializerCborTest {
3533
val actual = sut.serialize(items, ByteArray::class.java)
3634
val expected = "9f9f636f6e65bf646e616d65616163666f6f01ffff9f636f6e65bf646e616d65616263666f6f02ffff9f6374776fbf646e616d656163636261729f0304ffffff9f636f6e65bf646e616d65616463666f6f05ffffff"
3735
assertEquals("List:org.axonframework.extensions.kotlin.serializer.SuperType", actual.type.name)
38-
assertEquals(expected, format.formatHex(actual.data))
36+
assertEquals(expected, actual.data.toHex())
3937
}
4038
}

kotlin/src/test/kotlin/org/axonframework/extensions/kotlin/serializer/KotlinSerializerProtobufTest.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ import kotlinx.serialization.protobuf.ProtoBuf
55
import org.axonframework.extensions.kotlin.serialization.KotlinSerializer
66
import org.junit.jupiter.api.Assertions.assertEquals
77
import org.junit.jupiter.api.Test
8-
import java.util.HexFormat
98

109
class KotlinSerializerProtobufTest {
1110
@OptIn(ExperimentalSerializationApi::class)
1211
private val sut = KotlinSerializer(ProtoBuf)
13-
private val format = HexFormat.of()
1412

1513
@Test
1614
fun testStandardList() {
@@ -21,7 +19,7 @@ class KotlinSerializerProtobufTest {
2119
val actual = sut.serialize(items, ByteArray::class.java)
2220
val expected = "02050a01611001050a01621002"
2321
assertEquals("List:org.axonframework.extensions.kotlin.serializer.TypeOne", actual.type.name)
24-
assertEquals(expected, format.formatHex(actual.data))
22+
assertEquals(expected, actual.data.toHex())
2523
}
2624

2725
@Test
@@ -35,6 +33,6 @@ class KotlinSerializerProtobufTest {
3533
val actual = sut.serialize(items, ByteArray::class.java)
3634
val expected = "040c0a036f6e6512050a016110010c0a036f6e6512050a016210020e0a0374776f12070a0163100310040c0a036f6e6512050a01641005"
3735
assertEquals("List:org.axonframework.extensions.kotlin.serializer.SuperType", actual.type.name)
38-
assertEquals(expected, format.formatHex(actual.data))
36+
assertEquals(expected, actual.data.toHex())
3937
}
4038
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package org.axonframework.extensions.kotlin.serializer
2+
3+
// copied from https://www.baeldung.com/kotlin/byte-arrays-to-hex-strings#1-formatter
4+
fun ByteArray.toHex(): String =
5+
joinToString("") { eachByte -> "%02x".format(eachByte) }

0 commit comments

Comments
 (0)