From b34a9da9f3345bdcad8087a159fb79cdbc61fa4d Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Tue, 22 Jan 2019 18:11:00 +0300
Subject: [PATCH] refactoring

---
 .../org/redisson/hibernate/JndiRedissonRegionFactory.java     | 4 ++--
 .../org/redisson/hibernate/JndiRedissonRegionFactory.java     | 4 ++--
 .../org/redisson/hibernate/JndiRedissonRegionFactory.java     | 3 ++-
 .../org/redisson/hibernate/JndiRedissonRegionFactory.java     | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/redisson-hibernate/redisson-hibernate-4/src/main/java/org/redisson/hibernate/JndiRedissonRegionFactory.java b/redisson-hibernate/redisson-hibernate-4/src/main/java/org/redisson/hibernate/JndiRedissonRegionFactory.java
index e77e863d4..ad3d11549 100644
--- a/redisson-hibernate/redisson-hibernate-4/src/main/java/org/redisson/hibernate/JndiRedissonRegionFactory.java
+++ b/redisson-hibernate/redisson-hibernate-4/src/main/java/org/redisson/hibernate/JndiRedissonRegionFactory.java
@@ -21,8 +21,8 @@ import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
 import org.hibernate.cache.CacheException;
+import org.hibernate.engine.jndi.internal.JndiServiceImpl;
 import org.hibernate.internal.util.config.ConfigurationHelper;
-import org.hibernate.internal.util.jndi.JndiHelper;
 import org.redisson.api.RedissonClient;
 
 /**
@@ -45,7 +45,7 @@ public class JndiRedissonRegionFactory extends RedissonRegionFactory {
             throw new CacheException(JNDI_NAME + " property not set");
         }
         
-        Properties jndiProperties = JndiHelper.extractJndiProperties(properties);
+        Properties jndiProperties = JndiServiceImpl.extractJndiProperties(properties);
         InitialContext context = null;
         try {
             context = new InitialContext(jndiProperties);
diff --git a/redisson-hibernate/redisson-hibernate-5/src/main/java/org/redisson/hibernate/JndiRedissonRegionFactory.java b/redisson-hibernate/redisson-hibernate-5/src/main/java/org/redisson/hibernate/JndiRedissonRegionFactory.java
index e77e863d4..ad3d11549 100644
--- a/redisson-hibernate/redisson-hibernate-5/src/main/java/org/redisson/hibernate/JndiRedissonRegionFactory.java
+++ b/redisson-hibernate/redisson-hibernate-5/src/main/java/org/redisson/hibernate/JndiRedissonRegionFactory.java
@@ -21,8 +21,8 @@ import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
 import org.hibernate.cache.CacheException;
+import org.hibernate.engine.jndi.internal.JndiServiceImpl;
 import org.hibernate.internal.util.config.ConfigurationHelper;
-import org.hibernate.internal.util.jndi.JndiHelper;
 import org.redisson.api.RedissonClient;
 
 /**
@@ -45,7 +45,7 @@ public class JndiRedissonRegionFactory extends RedissonRegionFactory {
             throw new CacheException(JNDI_NAME + " property not set");
         }
         
-        Properties jndiProperties = JndiHelper.extractJndiProperties(properties);
+        Properties jndiProperties = JndiServiceImpl.extractJndiProperties(properties);
         InitialContext context = null;
         try {
             context = new InitialContext(jndiProperties);
diff --git a/redisson-hibernate/redisson-hibernate-52/src/main/java/org/redisson/hibernate/JndiRedissonRegionFactory.java b/redisson-hibernate/redisson-hibernate-52/src/main/java/org/redisson/hibernate/JndiRedissonRegionFactory.java
index e77e863d4..c98b58648 100644
--- a/redisson-hibernate/redisson-hibernate-52/src/main/java/org/redisson/hibernate/JndiRedissonRegionFactory.java
+++ b/redisson-hibernate/redisson-hibernate-52/src/main/java/org/redisson/hibernate/JndiRedissonRegionFactory.java
@@ -21,6 +21,7 @@ import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
 import org.hibernate.cache.CacheException;
+import org.hibernate.engine.jndi.internal.JndiServiceImpl;
 import org.hibernate.internal.util.config.ConfigurationHelper;
 import org.hibernate.internal.util.jndi.JndiHelper;
 import org.redisson.api.RedissonClient;
@@ -45,7 +46,7 @@ public class JndiRedissonRegionFactory extends RedissonRegionFactory {
             throw new CacheException(JNDI_NAME + " property not set");
         }
         
-        Properties jndiProperties = JndiHelper.extractJndiProperties(properties);
+        Properties jndiProperties = JndiServiceImpl.extractJndiProperties(properties);
         InitialContext context = null;
         try {
             context = new InitialContext(jndiProperties);
diff --git a/redisson-hibernate/redisson-hibernate-53/src/main/java/org/redisson/hibernate/JndiRedissonRegionFactory.java b/redisson-hibernate/redisson-hibernate-53/src/main/java/org/redisson/hibernate/JndiRedissonRegionFactory.java
index 4a15bd5f7..91138002c 100644
--- a/redisson-hibernate/redisson-hibernate-53/src/main/java/org/redisson/hibernate/JndiRedissonRegionFactory.java
+++ b/redisson-hibernate/redisson-hibernate-53/src/main/java/org/redisson/hibernate/JndiRedissonRegionFactory.java
@@ -22,8 +22,8 @@ import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
 import org.hibernate.cache.CacheException;
+import org.hibernate.engine.jndi.internal.JndiServiceImpl;
 import org.hibernate.internal.util.config.ConfigurationHelper;
-import org.hibernate.internal.util.jndi.JndiHelper;
 import org.redisson.api.RedissonClient;
 
 /**
@@ -46,7 +46,7 @@ public class JndiRedissonRegionFactory extends RedissonRegionFactory {
             throw new CacheException(JNDI_NAME + " property not set");
         }
         
-        Properties jndiProperties = JndiHelper.extractJndiProperties(properties);
+        Properties jndiProperties = JndiServiceImpl.extractJndiProperties(properties);
         InitialContext context = null;
         try {
             context = new InitialContext(jndiProperties);