Merge pull request #3 from mihaicostin/hibernate-5.2

Hibernate 5.2.1.Final

Author: mihaicostin

README.md

@@ -8,20 +8,8 @@ A library for using Memcached as a second level distributed cache in Hibernate.
       * https://github.com/raykrueger/hibernate-memcached
       * https://github.com/kcarlson/hibernate-memcached
 
-#Versions
 
-## 1.1.0
-
-Memcached client now respects the region timeout property
- - [Issue #1](https://github.com/mihaicostin/hibernate-l2-memcached/issues/1)
-```xml
-<property name="hibernate.memcached.REGION.cacheTimeSeconds">10</property>
-```
-
-  
-## 1.0.0
-* Compatible with hibernate 4.3.x
-* Example config:
+#Example config:
 
 ```xml
 <property name="hibernate.cache.region.factory_class">com.mc.hibernate.memcached.MemcachedRegionFactory</property>
@@ -43,3 +31,27 @@ In order to use this library as a maven dependency, just add the following depen
         </dependency>
 ```
 
+
+#Versions
+
+## 5.2.1.0
+
+- Switched to a new versioning schema, that goes hand in had with [hibernate](http://hibernate.org/orm/).
+    - Version 5.2.1.x is developed for (and compatible with) hibernate 5.2.1.Final
+- Update [spymemcached](https://github.com/couchbase/spymemcached) to the latest version: 2.12.1
+
+
+### Known issues
+- SecondLevelCacheStatistics won't work with this adapter since it tries to get the cache content as a Map (and that's not easily done with memcached)
+
+## 1.1.0
+
+Memcached client now respects the region timeout property
+ - [Issue #1](https://github.com/mihaicostin/hibernate-l2-memcached/issues/1)
+```xml
+<property name="hibernate.memcached.REGION.cacheTimeSeconds">10</property>
+```
+
+## 1.0.0
+* Compatible with hibernate 4.3.x
+

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.github.mihaicostin</groupId>
     <artifactId>hibernate-l2-memcached</artifactId>
-    <version>1.1.0</version>
+    <version>5.2.1.0-SNAPSHOT</version>
     <name>hibernate-l2-memcached</name>
     <description>A library for using Memcached as a second level distributed cache in Hibernate.</description>
     <url>https://github.com/mihaicostin/hibernate-l2-memcached</url>
@@ -39,8 +39,8 @@
     </distributionManagement>
 
     <properties>
-        <hibernate-core.version>4.3.11.Final</hibernate-core.version>
-        <spymemcached.version>2.11.6</spymemcached.version>
+        <hibernate-core.version>5.2.1.Final</hibernate-core.version>
+        <spymemcached.version>2.12.1</spymemcached.version>
         <slf4j-api.version>1.5.6</slf4j-api.version>
 
         <junit.version>4.12</junit.version>

src/main/java/com/mc/hibernate/memcached/MemcachedRegionFactory.java

@@ -16,6 +16,7 @@
 package com.mc.hibernate.memcached;
 
 import com.mc.hibernate.memcached.region.*;
+import org.hibernate.boot.spi.SessionFactoryOptions;
 import org.hibernate.cache.CacheException;
 import org.hibernate.cache.spi.*;
 import org.hibernate.cache.spi.access.AccessType;
@@ -37,7 +38,7 @@ public class MemcachedRegionFactory implements RegionFactory {
 
     private Properties properties;
     private Memcache client;
-    private Settings settings;
+    private SessionFactoryOptions settings;
 
     public MemcachedRegionFactory(Properties properties) {
         this.properties = properties;
@@ -46,7 +47,9 @@ public MemcachedRegionFactory(Properties properties) {
     public MemcachedRegionFactory() {
     }
 
-    public void start(Settings settings, Properties properties) throws CacheException {
+    @Override
+    public void start(SessionFactoryOptions settings, Properties properties) throws CacheException {
+
         this.settings = settings;
         this.properties = properties;
         log.info("Starting MemcachedClient...");
@@ -57,6 +60,8 @@ public void start(Settings settings, Properties properties) throws CacheExceptio
         }
     }
 
+
+
     public void stop() {
         if (client != null) {
             log.debug("Shutting down Memcache client");
@@ -78,8 +83,7 @@ public long nextTimestamp() {
     }
 
     public EntityRegion buildEntityRegion(String regionName, Properties properties, CacheDataDescription metadata) throws CacheException {
-        return new MemcachedEntityRegion(getCache(regionName), settings,
-                metadata, properties, client);
+        return new MemcachedEntityRegion(getCache(regionName), settings, metadata, properties, client);
     }
 
     public NaturalIdRegion buildNaturalIdRegion(String regionName, Properties properties, CacheDataDescription metadata) throws CacheException {

src/main/java/com/mc/hibernate/memcached/keystrategy/AbstractKeyStrategy.java

@@ -29,7 +29,7 @@
  */
 public abstract class AbstractKeyStrategy implements KeyStrategy {
 
-    public static final int MAX_KEY_LENGTH = 250;
+    private static final int MAX_KEY_LENGTH = 250;
 
     protected final Logger log = LoggerFactory.getLogger(getClass());
 

src/main/java/com/mc/hibernate/memcached/region/AbstractMemcachedRegion.java

@@ -15,12 +15,11 @@
 
 package com.mc.hibernate.memcached.region;
 
-import java.util.Map;
-
+import com.mc.hibernate.memcached.MemcachedCache;
 import org.hibernate.cache.CacheException;
 import org.hibernate.cache.spi.Region;
 
-import com.mc.hibernate.memcached.MemcachedCache;
+import java.util.Map;
 
 public abstract class AbstractMemcachedRegion implements Region {
 
@@ -54,8 +53,9 @@ public long getElementCountOnDisk() {
         return cache.getElementCountOnDisk();
     }
 
+    @Override
     public Map toMap() {
-        return null;
+        return cache.toMap();
     }
 
     public long nextTimestamp() {

src/main/java/com/mc/hibernate/memcached/region/MemcachedCollectionRegion.java

@@ -15,31 +15,30 @@
 
 package com.mc.hibernate.memcached.region;
 
-import java.util.Properties;
-
+import com.mc.hibernate.memcached.Memcache;
+import com.mc.hibernate.memcached.MemcachedCache;
+import com.mc.hibernate.memcached.strategy.NonStrictReadWriteMemcachedCollectionRegionAccessStrategy;
+import com.mc.hibernate.memcached.strategy.ReadOnlyMemcachedCollectionRegionAccessStrategy;
+import com.mc.hibernate.memcached.strategy.ReadWriteMemcachedCollectionRegionAccessStrategy;
+import com.mc.hibernate.memcached.strategy.TransactionalMemcachedCollectionRegionAccessStrategy;
+import org.hibernate.boot.spi.SessionFactoryOptions;
 import org.hibernate.cache.CacheException;
 import org.hibernate.cache.spi.CacheDataDescription;
 import org.hibernate.cache.spi.CollectionRegion;
 import org.hibernate.cache.spi.access.AccessType;
 import org.hibernate.cache.spi.access.CollectionRegionAccessStrategy;
-import org.hibernate.cfg.Settings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.mc.hibernate.memcached.Memcache;
-import com.mc.hibernate.memcached.MemcachedCache;
-import com.mc.hibernate.memcached.strategy.NonStrictReadWriteMemcachedCollectionRegionAccessStrategy;
-import com.mc.hibernate.memcached.strategy.ReadOnlyMemcachedCollectionRegionAccessStrategy;
-import com.mc.hibernate.memcached.strategy.ReadWriteMemcachedCollectionRegionAccessStrategy;
-import com.mc.hibernate.memcached.strategy.TransactionalMemcachedCollectionRegionAccessStrategy;
+import java.util.Properties;
 
 public class MemcachedCollectionRegion extends AbstractMemcachedRegion implements CollectionRegion {
 
     private final Logger log = LoggerFactory.getLogger(MemcachedCollectionRegion.class);
     private final CacheDataDescription metadata;
-    private final Settings settings;
+    private final SessionFactoryOptions settings;
 
-    public MemcachedCollectionRegion(MemcachedCache cache, Settings settings, CacheDataDescription metadata, Properties properties, Memcache client) {
+    public MemcachedCollectionRegion(MemcachedCache cache, SessionFactoryOptions settings, CacheDataDescription metadata, Properties properties, Memcache client) {
         super(cache);
         this.metadata = metadata;
         this.settings = settings;

src/main/java/com/mc/hibernate/memcached/region/MemcachedEntityRegion.java

@@ -16,33 +16,32 @@
 package com.mc.hibernate.memcached.region;
 
 
-import java.util.Properties;
-
+import com.mc.hibernate.memcached.Memcache;
+import com.mc.hibernate.memcached.MemcachedCache;
+import com.mc.hibernate.memcached.strategy.NonStrictReadWriteMemcachedEntityRegionAccessStrategy;
+import com.mc.hibernate.memcached.strategy.ReadOnlyMemcachedEntityRegionAccessStrategy;
+import com.mc.hibernate.memcached.strategy.ReadWriteMemcachedEntityRegionAccessStrategy;
+import com.mc.hibernate.memcached.strategy.TransactionalMemcachedEntityRegionAccessStrategy;
+import org.hibernate.boot.spi.SessionFactoryOptions;
 import org.hibernate.cache.CacheException;
 import org.hibernate.cache.spi.CacheDataDescription;
 import org.hibernate.cache.spi.EntityRegion;
 import org.hibernate.cache.spi.access.AccessType;
 import org.hibernate.cache.spi.access.EntityRegionAccessStrategy;
-import org.hibernate.cfg.Settings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.mc.hibernate.memcached.Memcache;
-import com.mc.hibernate.memcached.MemcachedCache;
-import com.mc.hibernate.memcached.strategy.NonStrictReadWriteMemcachedEntityRegionAccessStrategy;
-import com.mc.hibernate.memcached.strategy.ReadOnlyMemcachedEntityRegionAccessStrategy;
-import com.mc.hibernate.memcached.strategy.ReadWriteMemcachedEntityRegionAccessStrategy;
-import com.mc.hibernate.memcached.strategy.TransactionalMemcachedEntityRegionAccessStrategy;
+import java.util.Properties;
 
 
 public class MemcachedEntityRegion extends AbstractMemcachedRegion implements EntityRegion {
 
     private final Logger log = LoggerFactory.getLogger(MemcachedEntityRegion.class);
 
     private final CacheDataDescription metadata;
-    private final Settings settings;
+    private final SessionFactoryOptions settings;
 
-    public MemcachedEntityRegion(MemcachedCache cache, Settings settings, CacheDataDescription metadata, Properties properties, Memcache client) {
+    public MemcachedEntityRegion(MemcachedCache cache, SessionFactoryOptions settings, CacheDataDescription metadata, Properties properties, Memcache client) {
         super(cache);
         this.metadata = metadata;
         this.settings = settings;

src/main/java/com/mc/hibernate/memcached/region/MemcachedNaturalIdRegion.java

@@ -15,32 +15,31 @@
 
 package com.mc.hibernate.memcached.region;
 
-import java.util.Properties;
-
+import com.mc.hibernate.memcached.Memcache;
+import com.mc.hibernate.memcached.MemcachedCache;
+import com.mc.hibernate.memcached.strategy.NonStrictReadWriteMemcachedNaturalIdRegionAccessStrategy;
+import com.mc.hibernate.memcached.strategy.ReadOnlyMemcachedNaturalIdRegionAccessStrategy;
+import com.mc.hibernate.memcached.strategy.ReadWriteMemcachedNaturalIdRegionAccessStrategy;
+import com.mc.hibernate.memcached.strategy.TransactionalMemcachedNaturalIdRegionAccessStrategy;
+import org.hibernate.boot.spi.SessionFactoryOptions;
 import org.hibernate.cache.CacheException;
 import org.hibernate.cache.spi.CacheDataDescription;
 import org.hibernate.cache.spi.NaturalIdRegion;
 import org.hibernate.cache.spi.access.AccessType;
 import org.hibernate.cache.spi.access.NaturalIdRegionAccessStrategy;
-import org.hibernate.cfg.Settings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.mc.hibernate.memcached.Memcache;
-import com.mc.hibernate.memcached.MemcachedCache;
-import com.mc.hibernate.memcached.strategy.NonStrictReadWriteMemcachedNaturalIdRegionAccessStrategy;
-import com.mc.hibernate.memcached.strategy.ReadOnlyMemcachedNaturalIdRegionAccessStrategy;
-import com.mc.hibernate.memcached.strategy.ReadWriteMemcachedNaturalIdRegionAccessStrategy;
-import com.mc.hibernate.memcached.strategy.TransactionalMemcachedNaturalIdRegionAccessStrategy;
+import java.util.Properties;
 
 public class MemcachedNaturalIdRegion extends AbstractMemcachedRegion implements NaturalIdRegion {
 
     private final Logger log = LoggerFactory.getLogger(MemcachedNaturalIdRegion.class);
 
     private final CacheDataDescription metadata;
-    private final Settings settings;
+    private final SessionFactoryOptions settings;
 
-    public MemcachedNaturalIdRegion(MemcachedCache cache, Settings settings, CacheDataDescription metadata, Properties properties, Memcache client) {
+    public MemcachedNaturalIdRegion(MemcachedCache cache, SessionFactoryOptions settings, CacheDataDescription metadata, Properties properties, Memcache client) {
         super(cache);
         this.metadata = metadata;
         this.settings = settings;

src/main/java/com/mc/hibernate/memcached/region/MemcachedQueryResultsRegion.java

@@ -15,13 +15,13 @@
 
 package com.mc.hibernate.memcached.region;
 
+import com.mc.hibernate.memcached.MemcachedCache;
 import org.hibernate.cache.CacheException;
 import org.hibernate.cache.spi.QueryResultsRegion;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.mc.hibernate.memcached.MemcachedCache;
-
 public class MemcachedQueryResultsRegion extends AbstractMemcachedRegion implements QueryResultsRegion {
 
     private final Logger log = LoggerFactory.getLogger(MemcachedQueryResultsRegion.class);
@@ -30,11 +30,13 @@ public MemcachedQueryResultsRegion(MemcachedCache cache) {
         super(cache);
     }
 
-    public Object get(Object key) throws CacheException {
+    @Override
+    public Object get(SharedSessionContractImplementor session, Object key) throws CacheException {
         return cache.get(key);
     }
 
-    public void put(Object key, Object value) throws CacheException {
+    @Override
+    public void put(SharedSessionContractImplementor session, Object key, Object value) throws CacheException {
         cache.put(key, value);
     }
 

src/main/java/com/mc/hibernate/memcached/region/MemcachedTimestampsRegion.java

@@ -15,13 +15,13 @@
 
 package com.mc.hibernate.memcached.region;
 
+import com.mc.hibernate.memcached.MemcachedCache;
 import org.hibernate.cache.CacheException;
 import org.hibernate.cache.spi.TimestampsRegion;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.mc.hibernate.memcached.MemcachedCache;
-
 public class MemcachedTimestampsRegion extends AbstractMemcachedRegion implements TimestampsRegion {
 
     private final Logger log = LoggerFactory.getLogger(MemcachedTimestampsRegion.class);
@@ -30,11 +30,13 @@ public MemcachedTimestampsRegion(MemcachedCache cache) {
         super(cache);
     }
 
-    public Object get(Object key) throws CacheException {
+    @Override
+    public Object get(SharedSessionContractImplementor session, Object key) throws CacheException {
         return cache.get(key);
     }
 
-    public void put(Object key, Object value) throws CacheException {
+    @Override
+    public void put(SharedSessionContractImplementor session, Object key, Object value) throws CacheException {
         cache.put(key, value);
     }