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 index a9a31261a..198d440ed 100644 --- 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 index e46910503..25b8c4537 100644 --- 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 index 3692c7d78..b7caf321d 100644 --- 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 index e8ed82a74..18e33af27 100644 --- 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 index 3bddd7566..31f6343c9 100644 --- a/pom.xml +++ b/pom.xml @@ -257,7 +257,6 @@ 5.9.3 2.0.9 1.4.11 - 5.5.0 @@ -337,12 +336,12 @@ com.esotericsoftware kryo - ${kryo5.version} + 4.0.3 com.esotericsoftware.kryo kryo5 - ${kryo5.version} + 5.5.0 com.github.ben-manes.caffeine