Merge branch 'master' of github.com:redisson/redisson

CHANGELOG.md

@@ -2,6 +2,21 @@ Redisson Releases History
 ================================
 ####Please Note: trunk is current development branch.
 
+####19-Jan-2016 - versions 2.7.3 and 3.2.3 released
+
+Redisson Team is pleased to announce __ULTRA-FAST__ Redisson PRO edition.  
+Performance measure results available in [Benchmark whitepaper](https://redisson.pro/Redisson%20PRO%20benchmark%20whitepaper.pdf)
+
+Feature - `RMap.getLock(key)` and `RMultimap.getLock(key)` methods added  
+Improvement - `RedissonSpringCacheManager` constructor with Redisson instance only added  
+Improvement - `CronSchedule` moved to `org.redisson.api` package  
+Fixed - RedissonBaseIterator.hasNext() doesn't return false in some cases  
+Fixed - NoSuchFieldError exception in `redisson-tomcat` modules  
+Fixed - ConnectionPool size not respected during redirect of cluster request  
+Fixed - `RSortedSet.removeAsync` and `RSortedSet.addAsync`  
+Fixed - `RBloomFilter.tryInit` were not validated properly  
+Fixed - CommandDecoder should print all replay body on error  
+
 ####19-Dec-2016 - versions 2.7.2 and 3.2.2 released
 
 Feature - `RList`, `RSet` and `RScoredSortedSet` implements `RSortable` interface with SORT command support  

README.md

@@ -6,8 +6,8 @@ Redis 2.8+ compatible.
 
 | Stable Release Version | JDK Version compatibility | Release Date |
 | ------------- | ------------- | ------------|
-| 3.2.2  | 1.8+ | 19.12.2016 |
+| 3.2.3  | 1.8+ | 19.01.2017 |
-| 2.7.2 | 1.6+ | 19.12.2016 |
+| 2.7.3 | 1.6+ | 19.01.2017 |
 
 __NOTE__: Both version lines have same features except `CompletionStage` interface supported by 3.x.x line
 
@@ -20,7 +20,7 @@ Licensed under the Apache License 2.0.
 
 Welcome to support chat [![Join the chat at https://gitter.im/mrniko/redisson](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mrniko/redisson?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-####Try [Redisson PRO](http://redisson.pro) version.  
+####Try ultra-fast [Redisson PRO](https://redisson.pro) version.  
 ####Redisson team offers commercial support. Please contact sales@redisson.pro for details.
 
 Features
@@ -76,13 +76,12 @@ Features
 
 Who uses Redisson
 ================================
-[Baidu](http://baidu.com), [Infor](http://www.infor.com/), [New Relic Synthetics](https://newrelic.com/synthetics), [Singtel](http://singtel.com), [Setronica](http://setronica.com/), [Monits](http://monits.com/), [Brookhaven National Laboratory](http://bnl.gov/), [Netflix Dyno client] (https://github.com/Netflix/dyno), [武林Q传](http://www.nbrpg.com/), [Ocous](http://www.ocous.com/), [Invaluable](http://www.invaluable.com/), [Clover](https://www.clover.com/) , [Apache Karaf Decanter](https://karaf.apache.org/projects.html#decanter), [Atmosphere Framework](http://async-io.org/), [BrandsEye](http://brandseye.com), [Datorama](http://datorama.com/), [BrightCloud](http://brightcloud.com/), [Azar](http://azarlive.com/)
+[Baidu](http://baidu.com), [Infor](http://www.infor.com/), [New Relic Synthetics](https://newrelic.com/synthetics), [Singtel](http://singtel.com), [Setronica](http://setronica.com/), [Monits](http://monits.com/), [Brookhaven National Laboratory](http://bnl.gov/), [Netflix Dyno client] (https://github.com/Netflix/dyno), [武林Q传](http://www.nbrpg.com/), [Ocous](http://www.ocous.com/), [Invaluable](http://www.invaluable.com/), [Clover](https://www.clover.com/) , [Apache Karaf Decanter](https://karaf.apache.org/projects.html#decanter), [Atmosphere Framework](http://async-io.org/), [BrandsEye](http://brandseye.com), [Datorama](http://datorama.com/), [BrightCloud](http://brightcloud.com/), [Azar](http://azarlive.com/), [Snapfish](http://snapfish.com)
 
 Articles
 ================================
 
-[Java data structures powered by Redis. Introduction to Redisson (pdf)](http://redisson.org/Redisson.pdf)  
+[Java data structures powered by Redis. Introduction to Redisson (pdf)](https://redisson.org/Redisson.pdf)  
-[Moving from Hazelcast to Redis](https://engineering.datorama.com/moving-from-hazelcast-to-redis-b90a0769d1cb)  
 [A Look at the Java Distributed In-Memory Data Model (Powered by Redis)](https://dzone.com/articles/java-distributed-in-memory-data-model-powered-by-r)  
 [Distributed tasks Execution and Scheduling in Java, powered by Redis](https://dzone.com/articles/distributed-tasks-execution-and-scheduling-in-java)  
 [Introducing Redisson Live Objects (Object Hash Mapping)](https://dzone.com/articles/introducing-redisson-live-object-object-hash-mappi)  
@@ -90,6 +89,11 @@ Articles
 [Java Multimaps With Redis](https://dzone.com/articles/multimaps-with-redis)  
 [Distributed lock with Redis](https://evuvatech.com/2016/02/05/distributed-lock-with-redis/)
 
+Success stories
+================================
+
+[Moving from Hazelcast to Redis](https://engineering.datorama.com/moving-from-hazelcast-to-redis-b90a0769d1cb)  
+
 Quick start
 ===============================
 
@@ -98,23 +102,23 @@ Quick start
     <dependency>
        <groupId>org.redisson</groupId>
        <artifactId>redisson</artifactId>
-       <version>3.2.2</version>
+       <version>3.2.3</version>
     </dependency>  
 
     <!-- JDK 1.6+ compatible -->
     <dependency>
        <groupId>org.redisson</groupId>
        <artifactId>redisson</artifactId>
-       <version>2.7.2</version>
+       <version>2.7.3</version>
     </dependency>
 
 
 #### Gradle
     // JDK 1.8+ compatible
-    compile 'org.redisson:redisson:3.2.2'  
+    compile 'org.redisson:redisson:3.2.3'  
 
     // JDK 1.6+ compatible
-    compile 'org.redisson:redisson:2.7.2'
+    compile 'org.redisson:redisson:2.7.3'
 
 #### Java
 
@@ -139,11 +143,11 @@ RExecutorService executor = redisson.getExecutorService("myExecutorService");
 Downloads
 ===============================
    
-[Redisson 3.2.2](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson&v=3.2.2&e=jar),
+[Redisson 3.2.3](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson&v=3.2.3&e=jar),
-[Redisson node 3.2.2](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson-all&v=3.2.2&e=jar)  
+[Redisson node 3.2.3](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson-all&v=3.2.3&e=jar)  
 
-[Redisson 2.7.2](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson&v=2.7.2&e=jar),
+[Redisson 2.7.3](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson&v=2.7.3&e=jar),
-[Redisson node 2.7.2](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson-all&v=2.7.2&e=jar)  
+[Redisson node 2.7.3](https://repository.sonatype.org/service/local/artifact/maven/redirect?r=central-proxy&g=org.redisson&a=redisson-all&v=2.7.3&e=jar)  
 
 ### Supported by
 

redisson/src/main/java/org/redisson/RedissonLocalCachedMap.java

@@ -15,6 +15,7 @@
  */
 package org.redisson;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.AbstractCollection;
 import java.util.AbstractMap;
@@ -65,11 +66,11 @@ import io.netty.util.internal.ThreadLocalRandom;
  */
 public class RedissonLocalCachedMap<K, V> extends RedissonMap<K, V> implements RLocalCachedMap<K, V> {
 
-    public static class LocalCachedMapClear {
+    public static class LocalCachedMapClear implements Serializable {
         
     }
     
-    public static class LocalCachedMapInvalidate {
+    public static class LocalCachedMapInvalidate implements Serializable {
         
         private byte[] excludedId;
         private byte[] keyHash;
@@ -93,7 +94,7 @@ public class RedissonLocalCachedMap<K, V> extends RedissonMap<K, V> implements R
         
     }
     
-    public static class CacheKey {
+    public static class CacheKey implements Serializable {
         
         private final byte[] keyHash;
 
@@ -135,7 +136,7 @@ public class RedissonLocalCachedMap<K, V> extends RedissonMap<K, V> implements R
         
     }
     
-    public static class CacheValue {
+    public static class CacheValue implements Serializable {
         
         private final Object key;
         private final Object value;

redisson/src/test/java/org/redisson/RedissonLocalCachedMapSerializationCodecTest.java

@@ -0,0 +1,52 @@
+package org.redisson;
+
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.redisson.api.RedissonClient;
+import org.redisson.codec.SerializationCodec;
+import org.redisson.config.Config;
+
+import java.io.IOException;
+
+/**
+ * Created by jribble on 1/12/17.
+ */
+public class RedissonLocalCachedMapSerializationCodecTest extends RedissonLocalCachedMapTest {
+    public static Config createConfig() {
+        Config config = RedissonLocalCachedMapTest.createConfig();
+        config.setCodec(new SerializationCodec());
+        return config;
+    }
+
+    public static RedissonClient createInstance() {
+        Config config = createConfig();
+        return Redisson.create(config);
+    }
+
+    @BeforeClass
+    public static void beforeClass() throws IOException, InterruptedException {
+        if (!RedissonRuntimeEnvironment.isTravis) {
+            RedisRunner.startDefaultRedisServerInstance();
+            defaultRedisson = createInstance();
+        }
+    }
+
+    @Before
+    public void before() throws IOException, InterruptedException {
+        if (RedissonRuntimeEnvironment.isTravis) {
+            RedisRunner.startDefaultRedisServerInstance();
+            redisson = createInstance();
+        } else {
+            if (redisson == null) {
+                redisson = defaultRedisson;
+            }
+            redisson.getKeys().flushall();
+        }
+    }
+
+    @Test @Override
+    public void testAddAndGet() throws InterruptedException {
+        // this method/test won't work with Java Serialization
+    }
+}

redisson/src/test/java/org/redisson/RedissonLocalCachedMapTest.java

@@ -27,7 +27,7 @@ import mockit.Deencapsulation;
 
 public class RedissonLocalCachedMapTest extends BaseTest {
 
-//    @Test
+    //    @Test
     public void testPerf() {
         LocalCachedMapOptions options = LocalCachedMapOptions.defaults().evictionPolicy(EvictionPolicy.LFU).cacheSize(100000).invalidateEntryOnChange(true);
         Map<String, Integer> map = redisson.getLocalCachedMap("test", options);