Merge pull request #1552 from jackygurui/fix-#1544

Fix #1544 - global codec not registered

redisson/src/main/java/org/redisson/Redisson.java

@@ -711,4 +711,3 @@ public class Redisson implements RedissonClient {
 
 
 }
-

redisson/src/main/java/org/redisson/RedissonReactive.java

@@ -442,4 +442,3 @@ public class RedissonReactive implements RedissonReactiveClient {
         return new RedissonTransactionReactive(commandExecutor, options);
     }
 }
-

redisson/src/main/java/org/redisson/command/CommandAsyncService.java

@@ -55,6 +55,8 @@ import org.redisson.client.protocol.RedisCommands;
 import org.redisson.client.protocol.ScoredEntry;
 import org.redisson.client.protocol.decoder.ListScanResult;
 import org.redisson.client.protocol.decoder.MapScanResult;
+import org.redisson.codec.ReferenceCodecProvider;
+import org.redisson.config.Config;
 import org.redisson.config.MasterSlaveServersConfig;
 import org.redisson.connection.ConnectionManager;
 import org.redisson.connection.MasterSlaveEntry;
@@ -102,6 +104,7 @@ public class CommandAsyncService implements CommandAsyncExecutor {
     public CommandAsyncExecutor enableRedissonReferenceSupport(RedissonClient redisson) {
         if (redisson != null) {
             this.redisson = redisson;
+            enableRedissonReferenceSupport(redisson.getConfig());
             this.redissonReactive = null;
         }
         return this;
@@ -111,11 +114,18 @@ public class CommandAsyncService implements CommandAsyncExecutor {
     public CommandAsyncExecutor enableRedissonReferenceSupport(RedissonReactiveClient redissonReactive) {
         if (redissonReactive != null) {
             this.redissonReactive = redissonReactive;
+            enableRedissonReferenceSupport(redissonReactive.getConfig());
             this.redisson = null;
         }
         return this;
     }
 
+    private void enableRedissonReferenceSupport(Config config) {
+        Codec codec = config.getCodec();
+        ReferenceCodecProvider codecProvider = config.getReferenceCodecProvider();
+        codecProvider.registerCodec((Class<Codec>) codec.getClass(), codec);
+    }
+
     @Override
     public boolean isRedissonReferenceSupportEnabled() {
         return redisson != null || redissonReactive != null;

redisson/src/test/java/org/redisson/RedissonReferenceReactiveTest.java

@@ -2,13 +2,13 @@ package org.redisson;
 
 import java.util.List;
 import static org.junit.Assert.*;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;
-import org.redisson.api.BatchOptions;
-import org.redisson.api.RBatch;
-import org.redisson.api.RBatchReactive;
-import org.redisson.api.RBucket;
-import org.redisson.api.RBucketReactive;
-import org.redisson.api.RedissonClient;
+import org.redisson.api.*;
+import org.redisson.codec.JsonJacksonCodec;
+import org.redisson.config.Config;
 import org.redisson.reactive.RedissonBucketReactive;
 import org.redisson.reactive.RedissonMapCacheReactive;
 
@@ -78,4 +78,51 @@ public class RedissonReferenceReactiveTest extends BaseReactiveTest {
 
         lredisson.shutdown();
     }
+
+    @Test
+    public void shouldUseDefaultCodec() throws Exception {
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true);
+        objectMapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, false);
+        JsonJacksonCodec codec = new JsonJacksonCodec(objectMapper);
+
+        Config config = new Config();
+        config.setCodec(codec);
+        config.useSingleServer()
+                .setAddress(RedisRunner.getDefaultRedisServerBindAddressAndPort());
+
+        RedissonReactiveClient reactive = Redisson.createReactive(config);
+        RBucketReactive<Object> b1 = reactive.getBucket("b1");
+        sync(b1.set(new MyObject()));
+        RSetReactive<Object> s1 = reactive.getSet("s1");
+        assertTrue(sync(s1.add(b1)) == 1);
+        assertTrue(codec == b1.getCodec());
+
+        Config config1 = new Config();
+        config1.setCodec(codec);
+        config1.useSingleServer()
+                .setAddress(RedisRunner.getDefaultRedisServerBindAddressAndPort());
+        RedissonReactiveClient reactive1 = Redisson.createReactive(config1);
+
+        RSetReactive<RBucketReactive> s2 = reactive1.getSet("s1");
+        RBucketReactive<MyObject> b2 = sync(s2.iterator(1));
+        assertTrue(codec == b2.getCodec());
+        assertTrue(sync(b2.get()) instanceof MyObject);
+        reactive.shutdown();
+        reactive1.shutdown();
+    }
+
+    public static class MyObject {
+
+        private String name;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+    }
 }

redisson/src/test/java/org/redisson/RedissonReferenceTest.java

@@ -4,29 +4,14 @@ import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import static org.junit.Assert.*;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;
-import org.redisson.api.LocalCachedMapOptions;
-import org.redisson.api.RBatch;
-import org.redisson.api.RBatchReactive;
-import org.redisson.api.RBucket;
-import org.redisson.api.RBucketAsync;
-import org.redisson.api.RBucketReactive;
-import org.redisson.api.RDelayedQueue;
-import org.redisson.api.RGeo;
-import org.redisson.api.RList;
-import org.redisson.api.RListMultimap;
-import org.redisson.api.RLiveObject;
-import org.redisson.api.RLiveObjectService;
-import org.redisson.api.RLocalCachedMap;
-import org.redisson.api.RMap;
-import org.redisson.api.RMapCache;
-import org.redisson.api.RPriorityQueue;
-import org.redisson.api.RQueue;
-import org.redisson.api.RScoredSortedSet;
-import org.redisson.api.RSet;
-import org.redisson.api.RSetCache;
-import org.redisson.api.RSetMultimap;
+import org.redisson.api.*;
 import org.redisson.client.protocol.ScoredEntry;
+import org.redisson.codec.JsonJacksonCodec;
+import org.redisson.config.Config;
 
 /**
  *
@@ -233,4 +218,52 @@ public class RedissonReferenceTest extends BaseTest {
         assertNotEquals(1, redisson.getKeys().count());
         assertEquals(3, redisson.getKeys().count());
     }
+
+
+    @Test
+    public void shouldUseDefaultCodec() throws Exception {
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true);
+        objectMapper.configure(DeserializationFeature.UNWRAP_ROOT_VALUE, false);
+        JsonJacksonCodec codec = new JsonJacksonCodec(objectMapper);
+
+        Config config = new Config();
+        config.setCodec(codec);
+        config.useSingleServer()
+                .setAddress(RedisRunner.getDefaultRedisServerBindAddressAndPort());
+
+        RedissonClient redissonClient = Redisson.create(config);
+        RBucket<Object> b1 = redissonClient.getBucket("b1");
+        b1.set(new MyObject());
+        RSet<Object> s1 = redissonClient.getSet("s1");
+        assertTrue(s1.add(b1));
+        assertTrue(codec == b1.getCodec());
+
+        Config config1 = new Config();
+        config1.setCodec(codec);
+        config1.useSingleServer()
+                .setAddress(RedisRunner.getDefaultRedisServerBindAddressAndPort());
+        RedissonClient redissonClient1 = Redisson.create(config1);
+
+        RSet<RBucket> s2 = redissonClient1.getSet("s1");
+        RBucket<MyObject> b2 = s2.iterator(1).next();
+        assertTrue(codec == b2.getCodec());
+        assertTrue(b2.get() instanceof MyObject);
+        redissonClient.shutdown();
+        redissonClient1.shutdown();
+    }
+
+    public static class MyObject {
+
+        private String name;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+    }
 }