Skip to content

Commit

Permalink
fix: compatibility kryo4
Browse files Browse the repository at this point in the history
  • Loading branch information
Roiocam committed Mar 22, 2024
1 parent 62423d2 commit 418a70d
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 7 deletions.
8 changes: 7 additions & 1 deletion jetcache-starter/jetcache-autoconfigure/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,16 @@
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
<version>${redisson.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>

</dependencies>
</project>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
import com.alicp.jetcache.external.ExternalCacheBuilder;
import com.alicp.jetcache.redisson.RedissonCacheBuilder;
import org.redisson.api.RedissonClient;
import org.redisson.codec.KryoCodec;
import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
Expand Down Expand Up @@ -70,4 +72,9 @@ public void setApplicationContext(final ApplicationContext context) throws Beans
this.context = context;
}
}

@Bean("redissonCodecCustomizer")
public RedissonAutoConfigurationCustomizer redissonCodecCustomizer() {
return config -> config.setCodec(new KryoCodec());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import com.alicp.jetcache.test.spring.SpringTest;
import org.junit.Assert;
import org.junit.Test;
import org.redisson.spring.starter.RedissonAutoConfigurationV2;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.Bean;
Expand All @@ -27,7 +28,7 @@
* @author huangli
*/
@Configuration
@EnableAutoConfiguration
@EnableAutoConfiguration(exclude = {RedissonAutoConfigurationV2.class})
@ComponentScan(basePackages = {"com.alicp.jetcache.test.beans", "com.alicp.jetcache.anno.inittestbeans"})
@EnableMethodCache(basePackages = {"com.alicp.jetcache.test.beans", "com.alicp.jetcache.anno.inittestbeans"})
@EnableCreateCacheAnnotation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
import com.alicp.jetcache.anno.CreateCache;
import com.alicp.jetcache.anno.config.EnableCreateCacheAnnotation;
import com.alicp.jetcache.anno.config.EnableMethodCache;
import com.alicp.jetcache.redis.lettuce.RedisLettuceCacheTest;
import com.alicp.jetcache.redis.lettuce.RedisLettuceCacheConfig;
import com.alicp.jetcache.support.FastjsonKeyConvertor;
import com.alicp.jetcache.redis.lettuce.RedisLettuceCacheTest;
import com.alicp.jetcache.test.beans.MyFactoryBean;
import com.alicp.jetcache.test.spring.SpringTest;
import io.lettuce.core.RedisClient;
Expand All @@ -20,6 +19,7 @@
import io.lettuce.core.cluster.api.sync.RedisClusterCommands;
import org.junit.Assert;
import org.junit.Test;
import org.redisson.spring.starter.RedissonAutoConfigurationV2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
Expand All @@ -37,7 +37,7 @@
* @author huangli
*/
@Configuration
@EnableAutoConfiguration
@EnableAutoConfiguration(exclude = {RedissonAutoConfigurationV2.class})
@ComponentScan(basePackages = {"com.alicp.jetcache.test.beans", "com.alicp.jetcache.anno.inittestbeans"})
@EnableMethodCache(basePackages = {"com.alicp.jetcache.test.beans", "com.alicp.jetcache.anno.inittestbeans"})
@EnableCreateCacheAnnotation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.alicp.jetcache.test.spring.SpringTest;
import org.junit.Assert;
import org.junit.Test;
import org.redisson.spring.starter.RedissonAutoConfigurationV2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
Expand All @@ -35,7 +36,7 @@
* @author huangli
*/
@Configuration
@EnableAutoConfiguration
@EnableAutoConfiguration(exclude = RedissonAutoConfigurationV2.class)
@ComponentScan(basePackages = {"com.alicp.jetcache.test.beans", "com.alicp.jetcache.anno.inittestbeans"})
@EnableMethodCache(basePackages = {"com.alicp.jetcache.test.beans", "com.alicp.jetcache.anno.inittestbeans"})
@EnableCreateCacheAnnotation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.alicp.jetcache.test.spring.SpringTest;
import org.junit.Assert;
import org.junit.Test;
import org.redisson.spring.starter.RedissonAutoConfigurationV2;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.Bean;
Expand All @@ -26,7 +27,7 @@
* @author huangli
*/
@Configuration
@EnableAutoConfiguration
@EnableAutoConfiguration(exclude = RedissonAutoConfigurationV2.class)
@ComponentScan(basePackages = {"com.alicp.jetcache.test.beans", "com.alicp.jetcache.anno.inittestbeans"})
@EnableMethodCache(basePackages = {"com.alicp.jetcache.test.beans", "com.alicp.jetcache.anno.inittestbeans"})
@EnableCreateCacheAnnotation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 418a70d

Please sign in to comment.