diff --git a/README.md b/README.md
index 831b1b3..6bc6e24 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Maven Info
com.dorkbox
Serializers
- 2.3
+ 2.4
```
diff --git a/build.gradle.kts b/build.gradle.kts
index 91abfa9..3d84ace 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -38,7 +38,7 @@ object Extras {
// set for the project
const val description = "Kryo based serializers"
const val group = "com.dorkbox"
- const val version = "2.3"
+ const val version = "2.4"
// set as project.ext
const val name = "Serializers"
diff --git a/src/dorkbox/serializers/FileSerializer.kt b/src/dorkbox/serializers/FileSerializer.kt
index 316bd9d..1731ea2 100644
--- a/src/dorkbox/serializers/FileSerializer.kt
+++ b/src/dorkbox/serializers/FileSerializer.kt
@@ -25,6 +25,10 @@ import java.io.File
* Serialize the path of a file instead of the File object
*/
class FileSerializer : Serializer() {
+ init {
+ isImmutable = true
+ }
+
override fun write(kryo: Kryo, output: Output, file: File) {
output.writeString(file.path)
}
diff --git a/src/dorkbox/serializers/Inet4AddressSerializer.kt b/src/dorkbox/serializers/Inet4AddressSerializer.kt
index e7668f2..ff98981 100644
--- a/src/dorkbox/serializers/Inet4AddressSerializer.kt
+++ b/src/dorkbox/serializers/Inet4AddressSerializer.kt
@@ -8,6 +8,9 @@ import java.net.Inet4Address
import java.net.InetAddress
class Inet4AddressSerializer : Serializer() {
+ init {
+ isImmutable = true
+ }
override fun write(kryo: Kryo, output: Output, inetAddress: Inet4Address) {
output.writeBytes(inetAddress.address)
diff --git a/src/dorkbox/serializers/Inet6AddressSerializer.kt b/src/dorkbox/serializers/Inet6AddressSerializer.kt
index 421e99c..56c5437 100644
--- a/src/dorkbox/serializers/Inet6AddressSerializer.kt
+++ b/src/dorkbox/serializers/Inet6AddressSerializer.kt
@@ -8,6 +8,9 @@ import java.net.Inet6Address
import java.net.InetAddress
class Inet6AddressSerializer : Serializer() {
+ init {
+ isImmutable = true
+ }
override fun write(kryo: Kryo, output: Output, inetAddress: Inet6Address) {
output.writeBytes(inetAddress.address) // 16 bytes
diff --git a/src/dorkbox/serializers/PathSerializer.kt b/src/dorkbox/serializers/PathSerializer.kt
new file mode 100644
index 0000000..88c50af
--- /dev/null
+++ b/src/dorkbox/serializers/PathSerializer.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2021 dorkbox, llc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package dorkbox.serializers
+
+import com.esotericsoftware.kryo.Kryo
+import com.esotericsoftware.kryo.Serializer
+import com.esotericsoftware.kryo.io.Input
+import com.esotericsoftware.kryo.io.Output
+import java.nio.file.Path
+import java.nio.file.Paths
+
+
+/**
+ * Serialize the path of a file instead of the Path object
+ */
+class PathSerializer : Serializer() {
+ init {
+ isImmutable = true
+ }
+
+ override fun write(kryo: Kryo, output: Output, path: Path) {
+ output.writeString(path.toString())
+ }
+
+ override fun read(kryo: Kryo, input: Input, type: Class): Path {
+ val path = input.readString()
+ return Paths.get(path)
+ }
+}
diff --git a/src/dorkbox/serializers/SerializationDefaults.kt b/src/dorkbox/serializers/SerializationDefaults.kt
index 5a24b9f..b0b11c5 100644
--- a/src/dorkbox/serializers/SerializationDefaults.kt
+++ b/src/dorkbox/serializers/SerializationDefaults.kt
@@ -16,23 +16,45 @@
package dorkbox.serializers
import com.esotericsoftware.kryo.Kryo
+import java.io.File
import java.io.IOException
import java.math.BigDecimal
+import java.net.Inet4Address
+import java.net.Inet6Address
import java.net.URI
+import java.nio.file.Path
import java.util.*
import java.util.regex.Pattern
+@Suppress("MemberVisibilityCanBePrivate")
object SerializationDefaults {
/**
* Gets the version number.
*/
- const val version = "2.3"
+ const val version = "2.4"
init {
// Add this project to the updates system, which verifies this class + UUID + version information
dorkbox.updates.Updates.add(SerializationDefaults::class.java, "316353f5338341a8a3edc01d702703f8", version)
}
+ val regexSerializer by lazy { RegexSerializer() }
+ val uriSerializer by lazy { URISerializer() }
+ val uuidSerializer by lazy { UUIDSerializer() }
+
+ val collectionsSingletonMapSerializer by lazy { CollectionsSingletonMapSerializer() }
+ val collectionsSingletonListSerializer by lazy { CollectionsSingletonListSerializer() }
+ val collectionsSingletonSetSerializer by lazy { CollectionsSingletonSetSerializer() }
+
+ val enumSetSerializer by lazy { EnumSetSerializer() }
+ val enumMapSerializer by lazy { EnumMapSerializer() }
+ val arraysAsListSerializer by lazy { ArraysAsListSerializer() }
+
+ val inet4AddressSerializer by lazy { Inet4AddressSerializer() }
+ val inet6AddressSerializer by lazy { Inet6AddressSerializer() }
+ val fileSerializer by lazy { FileSerializer() }
+ val pathSerializer by lazy { PathSerializer() }
+
/**
* Allows for the kryo registration of sensible defaults in a common, well-used way.
*/
@@ -74,9 +96,9 @@ object SerializationDefaults {
kryo.register(HashMap::class.java)
kryo.register(HashSet::class.java)
- kryo.register(EnumSet::class.java, EnumSetSerializer())
- kryo.register(EnumMap::class.java, EnumMapSerializer())
- kryo.register(Arrays.asList("").javaClass, ArraysAsListSerializer())
+ kryo.register(EnumSet::class.java, enumSetSerializer)
+ kryo.register(EnumMap::class.java, enumMapSerializer)
+ kryo.register(Arrays.asList("").javaClass, arraysAsListSerializer)
kryo.register(emptyList().javaClass)
kryo.register(emptySet().javaClass)
@@ -88,13 +110,18 @@ object SerializationDefaults {
kryo.register(Collections.emptyNavigableSet().javaClass)
kryo.register(Collections.emptyNavigableMap().javaClass)
- kryo.register(Collections.singletonMap("", "").javaClass, CollectionsSingletonMapSerializer())
- kryo.register(listOf("").javaClass, CollectionsSingletonListSerializer())
- kryo.register(setOf("").javaClass, CollectionsSingletonSetSerializer())
+ kryo.register(Collections.singletonMap("", "").javaClass, collectionsSingletonMapSerializer)
+ kryo.register(listOf("").javaClass, collectionsSingletonListSerializer)
+ kryo.register(setOf("").javaClass, collectionsSingletonSetSerializer)
- kryo.register(Pattern::class.java, RegexSerializer())
- kryo.register(URI::class.java, URISerializer())
- kryo.register(UUID::class.java, UUIDSerializer())
+ kryo.register(Pattern::class.java, regexSerializer)
+ kryo.register(URI::class.java, uriSerializer)
+ kryo.register(UUID::class.java, uuidSerializer)
+
+ kryo.register(Inet4Address::class.java, inet4AddressSerializer)
+ kryo.register(Inet6Address::class.java, inet6AddressSerializer)
+ kryo.register(File::class.java, fileSerializer)
+ kryo.register(Path::class.java, pathSerializer)
UnmodifiableCollectionsSerializer.registerSerializers(kryo)
SynchronizedCollectionsSerializer.registerSerializers(kryo)