refactoring

redisson-hibernate/README.md

@@ -3,6 +3,7 @@ Redis based Hibernate Cache implementation
 
 Implements Hibernate 2nd level Cache provider based on Redisson.  
 Supports all Hibernate cache strategies: `READ_ONLY`, `NONSTRICT_READ_WRITE`, `READ_WRITE` and `TRANSACTIONAL`.
+It's recommended to use FST or Snappy as [codec](https://github.com/redisson/redisson/wiki/4.-data-serialization).
 
 Compatible with Hibernate 4.x, 5.x
 
@@ -21,8 +22,6 @@ Below is the list of all available factories with local cache and/or data partit
 |RedissonClusteredRegionFactory<br/><sub><i>available only in [Redisson PRO](http://redisson.pro) edition</i></sub> | No | **Yes** |
 |RedissonClusteredLocalCachedRegionFactory<br/><sub><i>available only in [Redisson PRO](http://redisson.pro) edition</i></sub> | **Yes** | **Yes** |
 
-<sub>Please consider __[Redisson PRO](https://redisson.pro)__ version for advanced features and support by SLA.</sub>
-
 Usage
 ===
 

redisson-hibernate/redisson-hibernate-4/src/main/java/org/redisson/hibernate/region/BaseRegion.java

@@ -35,9 +35,9 @@ import org.redisson.hibernate.RedissonRegionFactory;
  */
 public class BaseRegion implements TransactionalDataRegion, GeneralDataRegion {
 
-    RMapCache<Object, Object> mapCache;
-    RegionFactory regionFactory;
-    CacheDataDescription metadata;
+    final RMapCache<Object, Object> mapCache;
+    final RegionFactory regionFactory;
+    final CacheDataDescription metadata;
     
     int ttl;
     int maxIdle;
@@ -135,9 +135,10 @@ public class BaseRegion implements TransactionalDataRegion, GeneralDataRegion {
 
     @Override
     public int getTimeout() {
+        // 60 seconds (normalized value)
         return (1 << 12) * 60000;
     }
-
+    
     @Override
     public Object get(Object key) throws CacheException {
         try {

redisson-hibernate/redisson-hibernate-4/src/main/java/org/redisson/hibernate/region/RedissonCollectionRegion.java

@@ -37,7 +37,7 @@ import org.redisson.hibernate.strategy.TransactionalCollectionRegionAccessStrate
  */
 public class RedissonCollectionRegion extends BaseRegion implements CollectionRegion {
 
-    private Settings settings;
+    private final Settings settings;
     
     public RedissonCollectionRegion(RMapCache<Object, Object> mapCache, RegionFactory regionFactory,
             CacheDataDescription metadata, Settings settings, Properties properties, String defaultKey) {

redisson-hibernate/redisson-hibernate-4/src/main/java/org/redisson/hibernate/region/RedissonEntityRegion.java

@@ -37,7 +37,7 @@ import org.redisson.hibernate.strategy.TransactionalEntityRegionAccessStrategy;
  */
 public class RedissonEntityRegion extends BaseRegion implements EntityRegion {
 
-    private Settings settings;
+    private final Settings settings;
     
     public RedissonEntityRegion(RMapCache<Object, Object> mapCache, RegionFactory regionFactory,
             CacheDataDescription metadata, Settings settings, Properties properties, String defaultKey) {

redisson-hibernate/redisson-hibernate-4/src/main/java/org/redisson/hibernate/region/RedissonNaturalIdRegion.java

@@ -37,7 +37,7 @@ import org.redisson.hibernate.strategy.TransactionalNaturalIdRegionAccessStrateg
  */
 public class RedissonNaturalIdRegion extends BaseRegion implements NaturalIdRegion {
 
-    private Settings settings;
+    private final Settings settings;
     
     public RedissonNaturalIdRegion(RMapCache<Object, Object> mapCache, RegionFactory regionFactory,
             CacheDataDescription metadata, Settings settings, Properties properties, String defaultKey) {

redisson-hibernate/redisson-hibernate-4/src/main/java/org/redisson/hibernate/strategy/AbstractReadWriteAccessStrategy.java

@@ -61,7 +61,7 @@ public class AbstractReadWriteAccessStrategy extends BaseRegionAccessStrategy {
 
     private final UUID uuid = UUID.randomUUID();
     private final AtomicLong nextLockId = new AtomicLong();
-    RMapCache<Object, Object> mapCache;
+    final RMapCache<Object, Object> mapCache;
     
     public AbstractReadWriteAccessStrategy(Settings settings, GeneralDataRegion region, RMapCache<Object, Object> mapCache) {
         super(settings, region);

redisson-hibernate/redisson-hibernate-4/src/main/java/org/redisson/hibernate/strategy/BaseRegionAccessStrategy.java

@@ -28,8 +28,8 @@ import org.hibernate.cfg.Settings;
  */
 abstract class BaseRegionAccessStrategy implements RegionAccessStrategy {
 
-    GeneralDataRegion region;
-    Settings settings;
+    final GeneralDataRegion region;
+    final Settings settings;
     
     BaseRegionAccessStrategy(Settings settings, GeneralDataRegion region) {
         this.settings = settings;

redisson-hibernate/redisson-hibernate-5/src/main/java/org/redisson/hibernate/region/BaseRegion.java

@@ -36,9 +36,9 @@ import org.redisson.hibernate.RedissonRegionFactory;
  */
 public class BaseRegion implements TransactionalDataRegion, GeneralDataRegion {
 
-    RMapCache<Object, Object> mapCache;
-    RegionFactory regionFactory;
-    CacheDataDescription metadata;
+    final RMapCache<Object, Object> mapCache;
+    final RegionFactory regionFactory;
+    final CacheDataDescription metadata;
     
     int ttl;
     int maxIdle;
@@ -136,6 +136,7 @@ public class BaseRegion implements TransactionalDataRegion, GeneralDataRegion {
 
     @Override
     public int getTimeout() {
+        // 60 seconds (normalized value)
         return (1 << 12) * 60000;
     }
 

redisson-hibernate/redisson-hibernate-5/src/main/java/org/redisson/hibernate/region/RedissonCollectionRegion.java

@@ -37,7 +37,7 @@ import org.redisson.hibernate.strategy.TransactionalCollectionRegionAccessStrate
  */
 public class RedissonCollectionRegion extends BaseRegion implements CollectionRegion {
 
-    private Settings settings;
+    private final Settings settings;
     
     public RedissonCollectionRegion(RMapCache<Object, Object> mapCache, RegionFactory regionFactory,
             CacheDataDescription metadata, Settings settings, Properties properties, String defaultKey) {

redisson-hibernate/redisson-hibernate-5/src/main/java/org/redisson/hibernate/region/RedissonEntityRegion.java

@@ -37,7 +37,7 @@ import org.redisson.hibernate.strategy.TransactionalEntityRegionAccessStrategy;
  */
 public class RedissonEntityRegion extends BaseRegion implements EntityRegion {
 
-    private Settings settings;
+    private final Settings settings;
     
     public RedissonEntityRegion(RMapCache<Object, Object> mapCache, RegionFactory regionFactory,
             CacheDataDescription metadata, Settings settings, Properties properties, String defaultKey) {

redisson-hibernate/redisson-hibernate-5/src/main/java/org/redisson/hibernate/region/RedissonNaturalIdRegion.java

@@ -37,7 +37,7 @@ import org.redisson.hibernate.strategy.TransactionalNaturalIdRegionAccessStrateg
  */
 public class RedissonNaturalIdRegion extends BaseRegion implements NaturalIdRegion {
 
-    private Settings settings;
+    private final Settings settings;
     
     public RedissonNaturalIdRegion(RMapCache<Object, Object> mapCache, RegionFactory regionFactory,
             CacheDataDescription metadata, Settings settings, Properties properties, String defaultKey) {

redisson-hibernate/redisson-hibernate-5/src/main/java/org/redisson/hibernate/strategy/AbstractReadWriteAccessStrategy.java

@@ -62,7 +62,7 @@ public class AbstractReadWriteAccessStrategy extends BaseRegionAccessStrategy {
 
     private final UUID uuid = UUID.randomUUID();
     private final AtomicLong nextLockId = new AtomicLong();
-    RMapCache<Object, Object> mapCache;
+    final RMapCache<Object, Object> mapCache;
     
     public AbstractReadWriteAccessStrategy(Settings settings, GeneralDataRegion region, RMapCache<Object, Object> mapCache) {
         super(settings, region);

redisson-hibernate/redisson-hibernate-5/src/main/java/org/redisson/hibernate/strategy/BaseRegionAccessStrategy.java

@@ -29,8 +29,8 @@ import org.hibernate.engine.spi.SessionImplementor;
  */
 abstract class BaseRegionAccessStrategy implements RegionAccessStrategy {
 
-    GeneralDataRegion region;
-    Settings settings;
+    final GeneralDataRegion region;
+    final Settings settings;
     
     BaseRegionAccessStrategy(Settings settings, GeneralDataRegion region) {
         this.settings = settings;

redisson-hibernate/redisson-hibernate-52/src/main/java/org/redisson/hibernate/region/BaseRegion.java

@@ -36,9 +36,9 @@ import org.redisson.hibernate.RedissonRegionFactory;
  */
 public class BaseRegion implements TransactionalDataRegion, GeneralDataRegion {
 
-    RMapCache<Object, Object> mapCache;
-    RegionFactory regionFactory;
-    CacheDataDescription metadata;
+    final RMapCache<Object, Object> mapCache;
+    final RegionFactory regionFactory;
+    final CacheDataDescription metadata;
     
     int ttl;
     int maxIdle;
@@ -136,6 +136,7 @@ public class BaseRegion implements TransactionalDataRegion, GeneralDataRegion {
 
     @Override
     public int getTimeout() {
+        // 60 seconds (normalized value)
         return (1 << 12) * 60000;
     }
 

redisson-hibernate/redisson-hibernate-52/src/main/java/org/redisson/hibernate/region/RedissonCollectionRegion.java

@@ -37,7 +37,7 @@ import org.redisson.hibernate.strategy.TransactionalCollectionRegionAccessStrate
  */
 public class RedissonCollectionRegion extends BaseRegion implements CollectionRegion {
 
-    private Settings settings;
+    private final Settings settings;
     
     public RedissonCollectionRegion(RMapCache<Object, Object> mapCache, RegionFactory regionFactory,
             CacheDataDescription metadata, Settings settings, Properties properties, String defaultKey) {

redisson-hibernate/redisson-hibernate-52/src/main/java/org/redisson/hibernate/region/RedissonEntityRegion.java

@@ -37,7 +37,7 @@ import org.redisson.hibernate.strategy.TransactionalEntityRegionAccessStrategy;
  */
 public class RedissonEntityRegion extends BaseRegion implements EntityRegion {
 
-    private Settings settings;
+    private final Settings settings;
     
     public RedissonEntityRegion(RMapCache<Object, Object> mapCache, RegionFactory regionFactory,
             CacheDataDescription metadata, Settings settings, Properties properties, String defaultKey) {

redisson-hibernate/redisson-hibernate-52/src/main/java/org/redisson/hibernate/region/RedissonNaturalIdRegion.java

@@ -37,7 +37,7 @@ import org.redisson.hibernate.strategy.TransactionalNaturalIdRegionAccessStrateg
  */
 public class RedissonNaturalIdRegion extends BaseRegion implements NaturalIdRegion {
 
-    private Settings settings;
+    private final Settings settings;
     
     public RedissonNaturalIdRegion(RMapCache<Object, Object> mapCache, RegionFactory regionFactory,
             CacheDataDescription metadata, Settings settings, Properties properties, String defaultKey) {

redisson-hibernate/redisson-hibernate-52/src/main/java/org/redisson/hibernate/strategy/AbstractReadWriteAccessStrategy.java

@@ -62,7 +62,7 @@ public class AbstractReadWriteAccessStrategy extends BaseRegionAccessStrategy {
 
     private final UUID uuid = UUID.randomUUID();
     private final AtomicLong nextLockId = new AtomicLong();
-    RMapCache<Object, Object> mapCache;
+    final RMapCache<Object, Object> mapCache;
     
     public AbstractReadWriteAccessStrategy(Settings settings, GeneralDataRegion region, RMapCache<Object, Object> mapCache) {
         super(settings, region);

redisson-hibernate/redisson-hibernate-52/src/main/java/org/redisson/hibernate/strategy/BaseRegionAccessStrategy.java

@@ -29,8 +29,8 @@ import org.hibernate.engine.spi.SharedSessionContractImplementor;
  */
 abstract class BaseRegionAccessStrategy implements RegionAccessStrategy {
 
-    GeneralDataRegion region;
-    Settings settings;
+    final GeneralDataRegion region;
+    final Settings settings;
     
     BaseRegionAccessStrategy(Settings settings, GeneralDataRegion region) {
         this.settings = settings;

redisson-hibernate/redisson-hibernate-53/src/main/java/org/redisson/hibernate/RedissonStorage.java

@@ -29,7 +29,7 @@ import org.redisson.api.RMapCache;
  */
 public class RedissonStorage implements DomainDataStorageAccess {
 
-    private RMapCache<Object, Object> mapCache;
+    private final RMapCache<Object, Object> mapCache;
     
     int ttl;
     int maxIdle;