Merge pull request #6 from akhalikov/master

mihaicostin · web-flow · commit e062862cc07d · 2017-02-01T18:45:08.000+02:00
Support Hibernate 5.2.7
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # Hibernate - Memcached
 A library for using Memcached as a second level distributed cache in Hibernate.
 
+  * Hibernate 5.2.7.Final   : use version 5.2.7.0
   * Hibernate 5.2.1.Final   : use version 5.2.1.0
   * Hibernate 4.3.x         : use version 1.1.0
   * Uses spymemcached client
@@ -17,7 +18,7 @@ To install it, you just need to add the following Maven dependency:
 <dependency>
     <groupId>com.github.mihaicostin</groupId>
     <artifactId>hibernate-l2-memcached</artifactId>
-    <version>5.2.1.0</version>
+    <version>5.2.7.0</version>
 </dependency>
 ```
 
@@ -35,6 +36,9 @@ If memcached authentication is required, it can be specified using "hibernate.me
 
 #Versions
 
+## 5.2.7.0
+- Support Hibernate 5.2.7.Final
+
 ## 5.2.1.0
 
 - Switched to a new versioning schema, that goes hand in had with [hibernate](http://hibernate.org/orm/).
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.github.mihaicostin</groupId>
     <artifactId>hibernate-l2-memcached</artifactId>
-    <version>5.2.1.0</version>
+    <version>5.2.7.0</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,7 +39,7 @@
     </distributionManagement>
 
     <properties>
-        <hibernate-core.version>5.2.1.Final</hibernate-core.version>
+        <hibernate-core.version>5.2.7.Final</hibernate-core.version>
         <spymemcached.version>2.12.1</spymemcached.version>
         <slf4j-api.version>1.5.6</slf4j-api.version>
 
diff --git a/src/main/java/com/mc/hibernate/memcached/strategy/NonStrictReadWriteMemcachedCollectionRegionAccessStrategy.java b/src/main/java/com/mc/hibernate/memcached/strategy/NonStrictReadWriteMemcachedCollectionRegionAccessStrategy.java
@@ -70,12 +70,12 @@ public Object get(Object key, long txTimestamp) throws CacheException {
 
     @Override
     public Object generateCacheKey(Object id, CollectionPersister persister, SessionFactoryImplementor factory, String tenantIdentifier) {
-        return DefaultCacheKeysFactory.createCollectionKey(id, persister, factory, tenantIdentifier);
+        return DefaultCacheKeysFactory.INSTANCE.createCollectionKey(id, persister, factory, tenantIdentifier);
     }
 
     @Override
     public Object getCacheKeyId(Object cacheKey) {
-        return DefaultCacheKeysFactory.getCollectionId(cacheKey);
+        return DefaultCacheKeysFactory.INSTANCE.getCollectionId(cacheKey);
     }
 
 }
diff --git a/src/main/java/com/mc/hibernate/memcached/strategy/NonStrictReadWriteMemcachedEntityRegionAccessStrategy.java b/src/main/java/com/mc/hibernate/memcached/strategy/NonStrictReadWriteMemcachedEntityRegionAccessStrategy.java
@@ -125,12 +125,12 @@ public void remove(SharedSessionContractImplementor session, Object key) throws
 
     @Override
     public Object generateCacheKey(Object id, EntityPersister persister, SessionFactoryImplementor factory, String tenantIdentifier) {
-        return DefaultCacheKeysFactory.createEntityKey(id, persister, factory, tenantIdentifier);
+        return DefaultCacheKeysFactory.INSTANCE.createEntityKey(id, persister, factory, tenantIdentifier);
     }
 
     @Override
     public Object getCacheKeyId(Object cacheKey) {
-        return DefaultCacheKeysFactory.getEntityId(cacheKey);
+        return DefaultCacheKeysFactory.INSTANCE.getEntityId(cacheKey);
     }
 
 }
diff --git a/src/main/java/com/mc/hibernate/memcached/strategy/NonStrictReadWriteMemcachedNaturalIdRegionAccessStrategy.java b/src/main/java/com/mc/hibernate/memcached/strategy/NonStrictReadWriteMemcachedNaturalIdRegionAccessStrategy.java
@@ -117,11 +117,11 @@ public void remove(SharedSessionContractImplementor session, Object key) throws
 
     @Override
     public Object generateCacheKey(Object[] naturalIdValues, EntityPersister persister, SharedSessionContractImplementor session) {
-        return DefaultCacheKeysFactory.createNaturalIdKey(naturalIdValues, persister, session);
+        return DefaultCacheKeysFactory.INSTANCE.createNaturalIdKey(naturalIdValues, persister, session);
     }
 
     @Override
     public Object[] getNaturalIdValues(Object cacheKey) {
-        return DefaultCacheKeysFactory.getNaturalIdValues(cacheKey);
+        return DefaultCacheKeysFactory.INSTANCE.getNaturalIdValues(cacheKey);
     }
 }
diff --git a/src/main/java/com/mc/hibernate/memcached/strategy/ReadOnlyMemcachedCollectionRegionAccessStrategy.java b/src/main/java/com/mc/hibernate/memcached/strategy/ReadOnlyMemcachedCollectionRegionAccessStrategy.java
@@ -65,12 +65,12 @@ public void unlockItem(SharedSessionContractImplementor session, Object key, Sof
 
     @Override
     public Object generateCacheKey(Object id, CollectionPersister persister, SessionFactoryImplementor factory, String tenantIdentifier) {
-        return DefaultCacheKeysFactory.createCollectionKey(id, persister, factory, tenantIdentifier);
+        return DefaultCacheKeysFactory.INSTANCE.createCollectionKey(id, persister, factory, tenantIdentifier);
     }
 
     @Override
     public Object getCacheKeyId(Object cacheKey) {
-        return DefaultCacheKeysFactory.getCollectionId(cacheKey);
+        return DefaultCacheKeysFactory.INSTANCE.getCollectionId(cacheKey);
     }
 
 }
diff --git a/src/main/java/com/mc/hibernate/memcached/strategy/ReadOnlyMemcachedEntityRegionAccessStrategy.java b/src/main/java/com/mc/hibernate/memcached/strategy/ReadOnlyMemcachedEntityRegionAccessStrategy.java
@@ -108,12 +108,12 @@ public boolean afterUpdate(SharedSessionContractImplementor session, Object key,
 
     @Override
     public Object generateCacheKey(Object id, EntityPersister persister, SessionFactoryImplementor factory, String tenantIdentifier) {
-        return DefaultCacheKeysFactory.createEntityKey(id, persister, factory, tenantIdentifier);
+        return DefaultCacheKeysFactory.INSTANCE.createEntityKey(id, persister, factory, tenantIdentifier);
     }
 
     @Override
     public Object getCacheKeyId(Object cacheKey) {
-        return DefaultCacheKeysFactory.getEntityId(cacheKey);
+        return DefaultCacheKeysFactory.INSTANCE.getEntityId(cacheKey);
     }
 
 }
diff --git a/src/main/java/com/mc/hibernate/memcached/strategy/ReadOnlyMemcachedNaturalIdRegionAccessStrategy.java b/src/main/java/com/mc/hibernate/memcached/strategy/ReadOnlyMemcachedNaturalIdRegionAccessStrategy.java
@@ -107,11 +107,11 @@ public boolean afterUpdate(SharedSessionContractImplementor session, Object key,
 
     @Override
     public Object generateCacheKey(Object[] naturalIdValues, EntityPersister persister, SharedSessionContractImplementor session) {
-        return DefaultCacheKeysFactory.createNaturalIdKey(naturalIdValues, persister, session);
+        return DefaultCacheKeysFactory.INSTANCE.createNaturalIdKey(naturalIdValues, persister, session);
     }
 
     @Override
     public Object[] getNaturalIdValues(Object cacheKey) {
-        return DefaultCacheKeysFactory.getNaturalIdValues(cacheKey);
+        return DefaultCacheKeysFactory.INSTANCE.getNaturalIdValues(cacheKey);
     }
 }
diff --git a/src/main/java/com/mc/hibernate/memcached/strategy/ReadWriteMemcachedCollectionRegionAccessStrategy.java b/src/main/java/com/mc/hibernate/memcached/strategy/ReadWriteMemcachedCollectionRegionAccessStrategy.java
@@ -33,12 +33,12 @@ public ReadWriteMemcachedCollectionRegionAccessStrategy(MemcachedCollectionRegio
 
     @Override
     public Object generateCacheKey(Object id, CollectionPersister persister, SessionFactoryImplementor factory, String tenantIdentifier) {
-        return DefaultCacheKeysFactory.createCollectionKey(id, persister, factory, tenantIdentifier);
+        return DefaultCacheKeysFactory.INSTANCE.createCollectionKey(id, persister, factory, tenantIdentifier);
     }
 
     @Override
     public Object getCacheKeyId(Object cacheKey) {
-        return DefaultCacheKeysFactory.getCollectionId(cacheKey);
+        return DefaultCacheKeysFactory.INSTANCE.getCollectionId(cacheKey);
     }
 
 }
diff --git a/src/main/java/com/mc/hibernate/memcached/strategy/ReadWriteMemcachedEntityRegionAccessStrategy.java b/src/main/java/com/mc/hibernate/memcached/strategy/ReadWriteMemcachedEntityRegionAccessStrategy.java
@@ -110,12 +110,12 @@ public boolean afterUpdate(SharedSessionContractImplementor session, Object key,
 
     @Override
     public Object generateCacheKey(Object id, EntityPersister persister, SessionFactoryImplementor factory, String tenantIdentifier) {
-        return DefaultCacheKeysFactory.createEntityKey(id, persister, factory, tenantIdentifier);
+        return DefaultCacheKeysFactory.INSTANCE.createEntityKey(id, persister, factory, tenantIdentifier);
     }
 
     @Override
     public Object getCacheKeyId(Object cacheKey) {
-        return DefaultCacheKeysFactory.getEntityId(cacheKey);
+        return DefaultCacheKeysFactory.INSTANCE.getEntityId(cacheKey);
     }
 
 }
diff --git a/src/main/java/com/mc/hibernate/memcached/strategy/ReadWriteMemcachedNaturalIdRegionAccessStrategy.java b/src/main/java/com/mc/hibernate/memcached/strategy/ReadWriteMemcachedNaturalIdRegionAccessStrategy.java
@@ -109,11 +109,11 @@ public boolean afterUpdate(SharedSessionContractImplementor session, Object key,
 
     @Override
     public Object generateCacheKey(Object[] naturalIdValues, EntityPersister persister, SharedSessionContractImplementor session) {
-        return DefaultCacheKeysFactory.createNaturalIdKey(naturalIdValues, persister, session);
+        return DefaultCacheKeysFactory.INSTANCE.createNaturalIdKey(naturalIdValues, persister, session);
     }
 
     @Override
     public Object[] getNaturalIdValues(Object cacheKey) {
-        return DefaultCacheKeysFactory.getNaturalIdValues(cacheKey);
+        return DefaultCacheKeysFactory.INSTANCE.getNaturalIdValues(cacheKey);
     }
 }
diff --git a/src/main/java/com/mc/hibernate/memcached/strategy/TransactionalMemcachedCollectionRegionAccessStrategy.java b/src/main/java/com/mc/hibernate/memcached/strategy/TransactionalMemcachedCollectionRegionAccessStrategy.java
@@ -73,12 +73,12 @@ public void remove(SharedSessionContractImplementor session, Object key) throws
 
     @Override
     public Object generateCacheKey(Object id, CollectionPersister persister, SessionFactoryImplementor factory, String tenantIdentifier) {
-        return DefaultCacheKeysFactory.createCollectionKey(id, persister, factory, tenantIdentifier);
+        return DefaultCacheKeysFactory.INSTANCE.createCollectionKey(id, persister, factory, tenantIdentifier);
     }
 
     @Override
     public Object getCacheKeyId(Object cacheKey) {
-        return DefaultCacheKeysFactory.getCollectionId(cacheKey);
+        return DefaultCacheKeysFactory.INSTANCE.getCollectionId(cacheKey);
     }
 
 }
diff --git a/src/main/java/com/mc/hibernate/memcached/strategy/TransactionalMemcachedEntityRegionAccessStrategy.java b/src/main/java/com/mc/hibernate/memcached/strategy/TransactionalMemcachedEntityRegionAccessStrategy.java
@@ -124,11 +124,11 @@ public void unlockItem(SharedSessionContractImplementor session, Object key, Sof
 
     @Override
     public Object generateCacheKey(Object id, EntityPersister persister, SessionFactoryImplementor factory, String tenantIdentifier) {
-        return DefaultCacheKeysFactory.createEntityKey(id, persister, factory, tenantIdentifier);
+        return DefaultCacheKeysFactory.INSTANCE.createEntityKey(id, persister, factory, tenantIdentifier);
     }
 
     @Override
     public Object getCacheKeyId(Object cacheKey) {
-        return DefaultCacheKeysFactory.getEntityId(cacheKey);
+        return DefaultCacheKeysFactory.INSTANCE.getEntityId(cacheKey);
     }
 }
diff --git a/src/main/java/com/mc/hibernate/memcached/strategy/TransactionalMemcachedNaturalIdRegionAccessStrategy.java b/src/main/java/com/mc/hibernate/memcached/strategy/TransactionalMemcachedNaturalIdRegionAccessStrategy.java
@@ -97,11 +97,11 @@ public void unlockItem(SharedSessionContractImplementor session, Object key, Sof
 
     @Override
     public Object generateCacheKey(Object[] naturalIdValues, EntityPersister persister, SharedSessionContractImplementor session) {
-        return DefaultCacheKeysFactory.createNaturalIdKey(naturalIdValues, persister, session);
+        return DefaultCacheKeysFactory.INSTANCE.createNaturalIdKey(naturalIdValues, persister, session);
     }
 
     @Override
     public Object[] getNaturalIdValues(Object cacheKey) {
-        return DefaultCacheKeysFactory.getNaturalIdValues(cacheKey);
+        return DefaultCacheKeysFactory.INSTANCE.getNaturalIdValues(cacheKey);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -70,12 +70,12 @@ public Object get(Object key, long txTimestamp) throws CacheException {`
`70`	`70`
`71`	`71`	`@Override`
`72`	`72`	`public Object generateCacheKey(Object id, CollectionPersister persister, SessionFactoryImplementor factory, String tenantIdentifier) {`
`73`		`- return DefaultCacheKeysFactory.createCollectionKey(id, persister, factory, tenantIdentifier);`
	`73`	`+ return DefaultCacheKeysFactory.INSTANCE.createCollectionKey(id, persister, factory, tenantIdentifier);`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`@Override`
`77`	`77`	`public Object getCacheKeyId(Object cacheKey) {`
`78`		`- return DefaultCacheKeysFactory.getCollectionId(cacheKey);`
	`78`	`+ return DefaultCacheKeysFactory.INSTANCE.getCollectionId(cacheKey);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,12 +125,12 @@ public void remove(SharedSessionContractImplementor session, Object key) throws`
`125`	`125`
`126`	`126`	`@Override`
`127`	`127`	`public Object generateCacheKey(Object id, EntityPersister persister, SessionFactoryImplementor factory, String tenantIdentifier) {`
`128`		`- return DefaultCacheKeysFactory.createEntityKey(id, persister, factory, tenantIdentifier);`
	`128`	`+ return DefaultCacheKeysFactory.INSTANCE.createEntityKey(id, persister, factory, tenantIdentifier);`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`@Override`
`132`	`132`	`public Object getCacheKeyId(Object cacheKey) {`
`133`		`- return DefaultCacheKeysFactory.getEntityId(cacheKey);`
	`133`	`+ return DefaultCacheKeysFactory.INSTANCE.getEntityId(cacheKey);`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,11 +117,11 @@ public void remove(SharedSessionContractImplementor session, Object key) throws`
`117`	`117`
`118`	`118`	`@Override`
`119`	`119`	`public Object generateCacheKey(Object[] naturalIdValues, EntityPersister persister, SharedSessionContractImplementor session) {`
`120`		`- return DefaultCacheKeysFactory.createNaturalIdKey(naturalIdValues, persister, session);`
	`120`	`+ return DefaultCacheKeysFactory.INSTANCE.createNaturalIdKey(naturalIdValues, persister, session);`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`@Override`
`124`	`124`	`public Object[] getNaturalIdValues(Object cacheKey) {`
`125`		`- return DefaultCacheKeysFactory.getNaturalIdValues(cacheKey);`
	`125`	`+ return DefaultCacheKeysFactory.INSTANCE.getNaturalIdValues(cacheKey);`
`126`	`126`	`}`
`127`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,12 +65,12 @@ public void unlockItem(SharedSessionContractImplementor session, Object key, Sof`
`65`	`65`
`66`	`66`	`@Override`
`67`	`67`	`public Object generateCacheKey(Object id, CollectionPersister persister, SessionFactoryImplementor factory, String tenantIdentifier) {`
`68`		`- return DefaultCacheKeysFactory.createCollectionKey(id, persister, factory, tenantIdentifier);`
	`68`	`+ return DefaultCacheKeysFactory.INSTANCE.createCollectionKey(id, persister, factory, tenantIdentifier);`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`@Override`
`72`	`72`	`public Object getCacheKeyId(Object cacheKey) {`
`73`		`- return DefaultCacheKeysFactory.getCollectionId(cacheKey);`
	`73`	`+ return DefaultCacheKeysFactory.INSTANCE.getCollectionId(cacheKey);`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,12 +108,12 @@ public boolean afterUpdate(SharedSessionContractImplementor session, Object key,`
`108`	`108`
`109`	`109`	`@Override`
`110`	`110`	`public Object generateCacheKey(Object id, EntityPersister persister, SessionFactoryImplementor factory, String tenantIdentifier) {`
`111`		`- return DefaultCacheKeysFactory.createEntityKey(id, persister, factory, tenantIdentifier);`
	`111`	`+ return DefaultCacheKeysFactory.INSTANCE.createEntityKey(id, persister, factory, tenantIdentifier);`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`@Override`
`115`	`115`	`public Object getCacheKeyId(Object cacheKey) {`
`116`		`- return DefaultCacheKeysFactory.getEntityId(cacheKey);`
	`116`	`+ return DefaultCacheKeysFactory.INSTANCE.getEntityId(cacheKey);`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,11 +107,11 @@ public boolean afterUpdate(SharedSessionContractImplementor session, Object key,`
`107`	`107`
`108`	`108`	`@Override`
`109`	`109`	`public Object generateCacheKey(Object[] naturalIdValues, EntityPersister persister, SharedSessionContractImplementor session) {`
`110`		`- return DefaultCacheKeysFactory.createNaturalIdKey(naturalIdValues, persister, session);`
	`110`	`+ return DefaultCacheKeysFactory.INSTANCE.createNaturalIdKey(naturalIdValues, persister, session);`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`@Override`
`114`	`114`	`public Object[] getNaturalIdValues(Object cacheKey) {`
`115`		`- return DefaultCacheKeysFactory.getNaturalIdValues(cacheKey);`
	`115`	`+ return DefaultCacheKeysFactory.INSTANCE.getNaturalIdValues(cacheKey);`
`116`	`116`	`}`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,12 +33,12 @@ public ReadWriteMemcachedCollectionRegionAccessStrategy(MemcachedCollectionRegio`
`33`	`33`
`34`	`34`	`@Override`
`35`	`35`	`public Object generateCacheKey(Object id, CollectionPersister persister, SessionFactoryImplementor factory, String tenantIdentifier) {`
`36`		`- return DefaultCacheKeysFactory.createCollectionKey(id, persister, factory, tenantIdentifier);`
	`36`	`+ return DefaultCacheKeysFactory.INSTANCE.createCollectionKey(id, persister, factory, tenantIdentifier);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@Override`
`40`	`40`	`public Object getCacheKeyId(Object cacheKey) {`
`41`		`- return DefaultCacheKeysFactory.getCollectionId(cacheKey);`
	`41`	`+ return DefaultCacheKeysFactory.INSTANCE.getCollectionId(cacheKey);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,12 +110,12 @@ public boolean afterUpdate(SharedSessionContractImplementor session, Object key,`
`110`	`110`
`111`	`111`	`@Override`
`112`	`112`	`public Object generateCacheKey(Object id, EntityPersister persister, SessionFactoryImplementor factory, String tenantIdentifier) {`
`113`		`- return DefaultCacheKeysFactory.createEntityKey(id, persister, factory, tenantIdentifier);`
	`113`	`+ return DefaultCacheKeysFactory.INSTANCE.createEntityKey(id, persister, factory, tenantIdentifier);`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`@Override`
`117`	`117`	`public Object getCacheKeyId(Object cacheKey) {`
`118`		`- return DefaultCacheKeysFactory.getEntityId(cacheKey);`
	`118`	`+ return DefaultCacheKeysFactory.INSTANCE.getEntityId(cacheKey);`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`}`