From 67771f7384bd2aafcd313039dacd8c7a77201617 Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Tue, 27 Aug 2024 08:06:53 +0300
Subject: [PATCH] Fixed - EnumMap handling by Kryo5Codec. #6104

---
 .../java/org/redisson/codec/Kryo5Codec.java   |  1 +
 .../org/redisson/codec/Kryo5CodecTest.java    | 39 ++++++++++++++-----
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/redisson/src/main/java/org/redisson/codec/Kryo5Codec.java b/redisson/src/main/java/org/redisson/codec/Kryo5Codec.java
index afef28272..04415960a 100644
--- a/redisson/src/main/java/org/redisson/codec/Kryo5Codec.java
+++ b/redisson/src/main/java/org/redisson/codec/Kryo5Codec.java
@@ -163,6 +163,7 @@ public class Kryo5Codec extends BaseCodec {
         } catch (Exception e) {
             logger.warn("Unable to register Collections serializer", e);
         }
+        kryo.addDefaultSerializer(EnumMap.class, new JavaSerializer());
         kryo.addDefaultSerializer(Throwable.class, new JavaSerializer());
         kryo.addDefaultSerializer(UUID.class, new DefaultSerializers.UUIDSerializer());
         kryo.addDefaultSerializer(URI.class, new DefaultSerializers.URISerializer());
diff --git a/redisson/src/test/java/org/redisson/codec/Kryo5CodecTest.java b/redisson/src/test/java/org/redisson/codec/Kryo5CodecTest.java
index 39499b1a1..b37099cb6 100644
--- a/redisson/src/test/java/org/redisson/codec/Kryo5CodecTest.java
+++ b/redisson/src/test/java/org/redisson/codec/Kryo5CodecTest.java
@@ -1,12 +1,15 @@
 package org.redisson.codec;
 
 import io.netty.buffer.ByteBuf;
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
+import java.util.EnumMap;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class Kryo5CodecTest {
 
@@ -30,28 +33,44 @@ public class Kryo5CodecTest {
         v11.add("123");
         ByteBuf v1 = cc.getValueEncoder().encode(v11);
         LinkedHashSet<String> v11_1 = (LinkedHashSet<String>) cc.getValueDecoder().decode(v1, null);
-        Assertions.assertThat(v11_1).containsOnly("123");
+        assertThat(v11_1).containsOnly("123");
 
         LinkedHashMap<String, String> v12 = new LinkedHashMap<>();
         v12.put("1", "2");
         ByteBuf v2 = cc.getValueEncoder().encode(v12);
         LinkedHashMap<String, String> v12_1 = (LinkedHashMap<String, String>) cc.getValueDecoder().decode(v2, null);
-        Assertions.assertThat(v12_1).containsEntry("1", "2");
+        assertThat(v12_1).containsEntry("1", "2");
 
         TestData v13 = new TestData("123");
         ByteBuf v3 = cc.getValueEncoder().encode(v13);
         TestData v13_3 = (TestData) cc.getValueDecoder().decode(v3, null);
-        Assertions.assertThat(v13_3.getValue()).isEqualTo("123");
+        assertThat(v13_3.getValue()).isEqualTo("123");
 
     }
 
-    @Test
-    public void testCustomClassloader()  {
-        ClassLoader customClassLoader = new ClassLoader() {
-        };
+    public enum TestEnum {
+        VAL1("A"),
+        VAL2("B");
+
+        private final String value;
+
+        TestEnum(final String value) {
+            this.value = value;
+        }
 
-        Kryo5Codec cc = new Kryo5Codec(customClassLoader);
+        public String getValue() {
+            return this.value;
+        }
+    }
 
-        Assertions.assertThat(cc.getClassLoader()).isEqualTo(customClassLoader);
+    @Test
+    public void testEnumMap() throws IOException {
+        Kryo5Codec cc = new Kryo5Codec();
+        Map<TestEnum, String> map = new EnumMap<>(TestEnum.class);
+        map.put(TestEnum.VAL1, "abc");
+        ByteBuf r = cc.getValueEncoder().encode(map);
+        Map mm = (Map) cc.getValueDecoder().decode(r, null);
+        assertThat(mm).isEqualTo(map);
     }
+
 }