fix: compatibility kryo4

alibaba · Mar 22, 2024 · e9b0f62 · e9b0f62
1 parent a034df1
commit e9b0f62
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/jetcache-core/src/main/java/com/alicp/jetcache/support/KryoValueEncoder.java b/jetcache-core/src/main/java/com/alicp/jetcache/support/KryoValueEncoder.java
@@ -28,7 +28,7 @@ public KryoCache create() {
         @Override
         public void reset(KryoCache obj) {
             obj.getKryo().reset();
-            obj.getOutput().reset();
+            obj.getOutput().clear();
         }
     });
 

diff --git a/jetcache-test/src/test/java/com/alicp/jetcache/redisson/RedissonBroadcastManagerTest.java b/jetcache-test/src/test/java/com/alicp/jetcache/redisson/RedissonBroadcastManagerTest.java
@@ -11,6 +11,7 @@
 import org.junit.Test;
 import org.redisson.Redisson;
 import org.redisson.api.RedissonClient;
+import org.redisson.codec.KryoCodec;
 import org.redisson.config.Config;
 
 import java.util.Random;
@@ -27,6 +28,8 @@ public class RedissonBroadcastManagerTest extends AbstractBroadcastManagerTest {
     public void initRedissonClient() {
         final Config config = new Config();
         config.useSingleServer().setAddress("redis://127.0.0.1:6379").setDatabase(0);
+        // 兼容 kryo4
+        config.setCodec(new KryoCodec());
         this.client = Redisson.create(config);
     }
 

diff --git a/jetcache-test/src/test/java/com/alicp/jetcache/redisson/RedissonCacheTest.java b/jetcache-test/src/test/java/com/alicp/jetcache/redisson/RedissonCacheTest.java
@@ -11,6 +11,7 @@
 import org.junit.Test;
 import org.redisson.Redisson;
 import org.redisson.api.RedissonClient;
+import org.redisson.codec.KryoCodec;
 import org.redisson.config.Config;
 
 import java.util.Random;
@@ -27,6 +28,7 @@ public class RedissonCacheTest extends AbstractExternalCacheTest {
     public void redissonTest() throws Exception {
         final Config config = new Config();
         config.useSingleServer().setAddress("redis://127.0.0.1:6379").setDatabase(0);
+        config.setCodec(new KryoCodec());
         doTest(Redisson.create(config));
     }
 

diff --git a/jetcache-test/src/test/java/com/alicp/jetcache/support/SyncLocalTest.java b/jetcache-test/src/test/java/com/alicp/jetcache/support/SyncLocalTest.java
@@ -19,6 +19,7 @@
 import org.junit.jupiter.api.Test;
 import org.redisson.Redisson;
 import org.redisson.api.RedissonClient;
+import org.redisson.codec.KryoCodec;
 import org.redisson.config.Config;
 import redis.clients.jedis.HostAndPort;
 import redis.clients.jedis.UnifiedJedis;
@@ -78,6 +79,7 @@ public void testLettuce() throws Exception {
     public void testRedisson() throws Exception {
         final String keyPrefix = getClass().getSimpleName() + "testRedisson";
         final Config config = new Config();
+        config.setCodec(new KryoCodec());
         config.useSingleServer().setAddress("redis://127.0.0.1:6379").setDatabase(0);
         RedissonClient client1 = Redisson.create(config);
         RedissonClient client2 = Redisson.create(config);

diff --git a/pom.xml b/pom.xml
@@ -257,7 +257,6 @@
         <junit.version>5.9.3</junit.version>
         <slf4j.version>2.0.9</slf4j.version>
         <logback.version>1.4.11</logback.version>
-        <kryo5.version>5.5.0</kryo5.version>
     </properties>
 
     <dependencyManagement>
@@ -337,12 +336,12 @@
             <dependency>
                 <groupId>com.esotericsoftware</groupId>
                 <artifactId>kryo</artifactId>
-                <version>${kryo5.version}</version>
+                <version>4.0.3</version>
             </dependency>
             <dependency>
                 <groupId>com.esotericsoftware.kryo</groupId>
                 <artifactId>kryo5</artifactId>
-                <version>${kryo5.version}</version>
+                <version>5.5.0</version>
             </dependency>
             <dependency>
                 <groupId>com.github.ben-manes.caffeine</groupId>