diff --git a/redisson-hibernate/redisson-hibernate-4/src/main/java/org/redisson/hibernate/RedissonRegionFactory.java b/redisson-hibernate/redisson-hibernate-4/src/main/java/org/redisson/hibernate/RedissonRegionFactory.java index 285bbcc8f..6a24f06d5 100644 --- a/redisson-hibernate/redisson-hibernate-4/src/main/java/org/redisson/hibernate/RedissonRegionFactory.java +++ b/redisson-hibernate/redisson-hibernate-4/src/main/java/org/redisson/hibernate/RedissonRegionFactory.java @@ -19,7 +19,6 @@ import org.hibernate.cache.CacheException; import org.hibernate.cache.spi.*; import org.hibernate.cache.spi.access.AccessType; import org.hibernate.cfg.Settings; -import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.config.ConfigurationHelper; import org.jboss.logging.Logger; import org.redisson.Redisson; @@ -169,7 +168,7 @@ public class RedissonRegionFactory implements RegionFactory { + "local nextValue = math.max(tonumber(ARGV[1]), tonumber(currentTime) + 1); " + "redis.call('set', KEYS[1], nextValue); " + "return nextValue;", - RScript.ReturnType.INTEGER, Collections.singletonList(qualifyName("redisson-hibernate-timestamp")), time); + RScript.ReturnType.INTEGER, Collections.singletonList("redisson-hibernate-timestamp"), time); } catch (Exception e) { if (fallback) { while (true) { @@ -190,14 +189,6 @@ public class RedissonRegionFactory implements RegionFactory { } } - private String qualifyName(String name) { - String prefix = settings.getCacheRegionPrefix(); - if (StringHelper.isEmpty(prefix)) { - return name; - } - return prefix + "." + name; - } - @Override public EntityRegion buildEntityRegion(String regionName, Properties properties, CacheDataDescription metadata) throws CacheException { diff --git a/redisson-hibernate/redisson-hibernate-5/src/main/java/org/redisson/hibernate/RedissonRegionFactory.java b/redisson-hibernate/redisson-hibernate-5/src/main/java/org/redisson/hibernate/RedissonRegionFactory.java index 2e8b22f64..e62a8835c 100644 --- a/redisson-hibernate/redisson-hibernate-5/src/main/java/org/redisson/hibernate/RedissonRegionFactory.java +++ b/redisson-hibernate/redisson-hibernate-5/src/main/java/org/redisson/hibernate/RedissonRegionFactory.java @@ -22,7 +22,6 @@ import org.hibernate.cache.spi.*; import org.hibernate.cache.spi.access.AccessType; import org.hibernate.cfg.Environment; import org.hibernate.cfg.Settings; -import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.config.ConfigurationHelper; import org.jboss.logging.Logger; import org.redisson.Redisson; @@ -176,7 +175,7 @@ import java.util.concurrent.atomic.AtomicLong; + "local nextValue = math.max(tonumber(ARGV[1]), tonumber(currentTime) + 1); " + "redis.call('set', KEYS[1], nextValue); " + "return nextValue;", - RScript.ReturnType.INTEGER, Collections.singletonList(qualifyName("redisson-hibernate-timestamp")), time); + RScript.ReturnType.INTEGER, Collections.singletonList("redisson-hibernate-timestamp"), time); } catch (Exception e) { if (fallback) { while (true) { @@ -197,14 +196,6 @@ import java.util.concurrent.atomic.AtomicLong; } } - private String qualifyName(String name) { - String prefix = settings.getCacheRegionPrefix(); - if (StringHelper.isEmpty(prefix)) { - return name; - } - return prefix + "." + name; - } - @Override public EntityRegion buildEntityRegion(String regionName, Properties properties, CacheDataDescription metadata) throws CacheException { diff --git a/redisson-hibernate/redisson-hibernate-52/src/main/java/org/redisson/hibernate/RedissonRegionFactory.java b/redisson-hibernate/redisson-hibernate-52/src/main/java/org/redisson/hibernate/RedissonRegionFactory.java index a7720f04b..89b3b98cd 100644 --- a/redisson-hibernate/redisson-hibernate-52/src/main/java/org/redisson/hibernate/RedissonRegionFactory.java +++ b/redisson-hibernate/redisson-hibernate-52/src/main/java/org/redisson/hibernate/RedissonRegionFactory.java @@ -22,7 +22,6 @@ import org.hibernate.cache.spi.*; import org.hibernate.cache.spi.access.AccessType; import org.hibernate.cfg.Environment; import org.hibernate.cfg.Settings; -import org.hibernate.internal.util.StringHelper; import org.hibernate.internal.util.config.ConfigurationHelper; import org.jboss.logging.Logger; import org.redisson.Redisson; @@ -177,7 +176,7 @@ public class RedissonRegionFactory implements RegionFactory { + "local nextValue = math.max(tonumber(ARGV[1]), tonumber(currentTime) + 1); " + "redis.call('set', KEYS[1], nextValue); " + "return nextValue;", - RScript.ReturnType.INTEGER, Collections.singletonList(qualifyName("redisson-hibernate-timestamp")), time); + RScript.ReturnType.INTEGER, Collections.singletonList("redisson-hibernate-timestamp"), time); } catch (Exception e) { if (fallback) { while (true) { @@ -198,14 +197,6 @@ public class RedissonRegionFactory implements RegionFactory { } } - private String qualifyName(String name) { - String prefix = settings.getCacheRegionPrefix(); - if (StringHelper.isEmpty(prefix)) { - return name; - } - return prefix + "." + name; - } - @Override public EntityRegion buildEntityRegion(String regionName, Properties properties, CacheDataDescription metadata) throws CacheException {