diff --git a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/NonStrictCollectionRegionAccessStrategy.java b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/NonStrictCollectionRegionAccessStrategy.java index 827185aa5f..716e1d7c5d 100644 --- a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/NonStrictCollectionRegionAccessStrategy.java +++ b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/NonStrictCollectionRegionAccessStrategy.java @@ -28,12 +28,12 @@ public class NonStrictCollectionRegionAccessStrategy @Override public Object generateCacheKey(Object id, CollectionPersister persister, SessionFactoryImplementor factory, String tenantIdentifier) { - return DefaultCacheKeysFactory.createCollectionKey( id, persister, factory, tenantIdentifier ); + return DefaultCacheKeysFactory.staticCreateCollectionKey( id, persister, factory, tenantIdentifier ); } @Override public Object getCacheKeyId(Object cacheKey) { - return DefaultCacheKeysFactory.getCollectionId( cacheKey ); + return DefaultCacheKeysFactory.staticGetCollectionId( cacheKey ); } @Override diff --git a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/NonStrictEntityRegionAccessStrategy.java b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/NonStrictEntityRegionAccessStrategy.java index b3617707f4..727b60e3fc 100644 --- a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/NonStrictEntityRegionAccessStrategy.java +++ b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/NonStrictEntityRegionAccessStrategy.java @@ -53,12 +53,12 @@ public class NonStrictEntityRegionAccessStrategy extends JCacheRegionAccessStrat @Override public Object generateCacheKey(Object id, EntityPersister persister, SessionFactoryImplementor factory, String tenantIdentifier) { - return DefaultCacheKeysFactory.createEntityKey( id, persister, factory, tenantIdentifier ); + return DefaultCacheKeysFactory.staticCreateEntityKey( id, persister, factory, tenantIdentifier ); } @Override public Object getCacheKeyId(Object cacheKey) { - return DefaultCacheKeysFactory.getEntityId( cacheKey ); + return DefaultCacheKeysFactory.staticGetEntityId( cacheKey ); } @Override diff --git a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/NonStrictNaturalIdRegionAccessStrategy.java b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/NonStrictNaturalIdRegionAccessStrategy.java index 747a7de7da..23317ac585 100644 --- a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/NonStrictNaturalIdRegionAccessStrategy.java +++ b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/NonStrictNaturalIdRegionAccessStrategy.java @@ -50,11 +50,11 @@ public class NonStrictNaturalIdRegionAccessStrategy @Override public Object generateCacheKey(Object[] naturalIdValues, EntityPersister persister, SharedSessionContractImplementor session) { - return DefaultCacheKeysFactory.createNaturalIdKey( naturalIdValues, persister, session ); + return DefaultCacheKeysFactory.staticCreateNaturalIdKey( naturalIdValues, persister, session ); } @Override public Object[] getNaturalIdValues(Object cacheKey) { - return DefaultCacheKeysFactory.getNaturalIdValues( cacheKey ); + return DefaultCacheKeysFactory.staticGetNaturalIdValues( cacheKey ); } } diff --git a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/ReadOnlyCollectionRegionAccessStrategy.java b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/ReadOnlyCollectionRegionAccessStrategy.java index 1139896dc5..2279170316 100644 --- a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/ReadOnlyCollectionRegionAccessStrategy.java +++ b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/ReadOnlyCollectionRegionAccessStrategy.java @@ -26,11 +26,11 @@ public class ReadOnlyCollectionRegionAccessStrategy @Override public Object generateCacheKey(Object id, CollectionPersister persister, SessionFactoryImplementor factory, String tenantIdentifier) { - return DefaultCacheKeysFactory.createCollectionKey( id, persister, factory, tenantIdentifier ); + return DefaultCacheKeysFactory.staticCreateCollectionKey( id, persister, factory, tenantIdentifier ); } @Override public Object getCacheKeyId(Object cacheKey) { - return DefaultCacheKeysFactory.getCollectionId( cacheKey ); + return DefaultCacheKeysFactory.staticGetCollectionId( cacheKey ); } } diff --git a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/ReadOnlyEntityRegionAccessStrategy.java b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/ReadOnlyEntityRegionAccessStrategy.java index 48177528fd..bdbd28243f 100644 --- a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/ReadOnlyEntityRegionAccessStrategy.java +++ b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/ReadOnlyEntityRegionAccessStrategy.java @@ -50,11 +50,11 @@ public class ReadOnlyEntityRegionAccessStrategy extends JCacheRegionAccessStrate @Override public Object generateCacheKey(Object id, EntityPersister persister, SessionFactoryImplementor factory, String tenantIdentifier) { - return DefaultCacheKeysFactory.createEntityKey( id, persister, factory, tenantIdentifier ); + return DefaultCacheKeysFactory.staticCreateEntityKey( id, persister, factory, tenantIdentifier ); } @Override public Object getCacheKeyId(Object cacheKey) { - return DefaultCacheKeysFactory.getEntityId( cacheKey ); + return DefaultCacheKeysFactory.staticGetEntityId( cacheKey ); } } diff --git a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/ReadOnlyNaturalIdRegionAccessStrategy.java b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/ReadOnlyNaturalIdRegionAccessStrategy.java index 302ba5f61a..625dc87a2c 100644 --- a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/ReadOnlyNaturalIdRegionAccessStrategy.java +++ b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/ReadOnlyNaturalIdRegionAccessStrategy.java @@ -49,11 +49,11 @@ public class ReadOnlyNaturalIdRegionAccessStrategy @Override public Object generateCacheKey(Object[] naturalIdValues, EntityPersister persister, SharedSessionContractImplementor session) { - return DefaultCacheKeysFactory.createNaturalIdKey( naturalIdValues, persister, session ); + return DefaultCacheKeysFactory.staticCreateNaturalIdKey( naturalIdValues, persister, session ); } @Override public Object[] getNaturalIdValues(Object cacheKey) { - return DefaultCacheKeysFactory.getNaturalIdValues( cacheKey ); + return DefaultCacheKeysFactory.staticGetNaturalIdValues( cacheKey ); } } diff --git a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/ReadWriteCollectionRegionAccessStrategy.java b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/ReadWriteCollectionRegionAccessStrategy.java index 3635db6d24..c7611f2512 100644 --- a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/ReadWriteCollectionRegionAccessStrategy.java +++ b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/ReadWriteCollectionRegionAccessStrategy.java @@ -26,12 +26,12 @@ public class ReadWriteCollectionRegionAccessStrategy @Override public Object generateCacheKey(Object id, CollectionPersister persister, SessionFactoryImplementor factory, String tenantIdentifier) { - return DefaultCacheKeysFactory.createCollectionKey( id, persister, factory, tenantIdentifier ); + return DefaultCacheKeysFactory.staticCreateCollectionKey( id, persister, factory, tenantIdentifier ); } @Override public Object getCacheKeyId(Object cacheKey) { - return DefaultCacheKeysFactory.getCollectionId( cacheKey ); + return DefaultCacheKeysFactory.staticGetCollectionId( cacheKey ); } } diff --git a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/ReadWriteEntityRegionAccessStrategy.java b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/ReadWriteEntityRegionAccessStrategy.java index b5404e9d44..75f8f271b0 100644 --- a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/ReadWriteEntityRegionAccessStrategy.java +++ b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/ReadWriteEntityRegionAccessStrategy.java @@ -72,11 +72,11 @@ public class ReadWriteEntityRegionAccessStrategy @Override public Object generateCacheKey(Object id, EntityPersister persister, SessionFactoryImplementor factory, String tenantIdentifier) { - return DefaultCacheKeysFactory.createEntityKey( id, persister, factory, tenantIdentifier ); + return DefaultCacheKeysFactory.staticCreateEntityKey( id, persister, factory, tenantIdentifier ); } @Override public Object getCacheKeyId(Object cacheKey) { - return DefaultCacheKeysFactory.getEntityId( cacheKey ); + return DefaultCacheKeysFactory.staticGetEntityId( cacheKey ); } } diff --git a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/ReadWriteNaturalIdRegionAccessStrategy.java b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/ReadWriteNaturalIdRegionAccessStrategy.java index d92ae39bdc..722cb49c2c 100644 --- a/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/ReadWriteNaturalIdRegionAccessStrategy.java +++ b/hibernate-jcache/src/main/java/org/hibernate/cache/jcache/access/ReadWriteNaturalIdRegionAccessStrategy.java @@ -71,11 +71,11 @@ public class ReadWriteNaturalIdRegionAccessStrategy @Override public Object generateCacheKey(Object[] naturalIdValues, EntityPersister persister, SharedSessionContractImplementor session) { - return DefaultCacheKeysFactory.createNaturalIdKey( naturalIdValues, persister, session ); + return DefaultCacheKeysFactory.staticCreateNaturalIdKey( naturalIdValues, persister, session ); } @Override public Object[] getNaturalIdValues(Object cacheKey) { - return DefaultCacheKeysFactory.getNaturalIdValues( cacheKey ); + return DefaultCacheKeysFactory.staticGetNaturalIdValues( cacheKey ); } }