From b38fa0134344cdb72d48daf9b5cc40f481e7bcfa Mon Sep 17 00:00:00 2001
From: alexy <alex.yang@ehealth.com>
Date: Mon, 7 Sep 2020 09:23:39 -0700
Subject: [PATCH] Move IRedisManager back to root

---
 .../java/org/crazycake/shiro/{common => }/IRedisManager.java    | 2 +-
 src/main/java/org/crazycake/shiro/RedisCache.java               | 2 --
 src/main/java/org/crazycake/shiro/RedisCacheManager.java        | 1 -
 src/main/java/org/crazycake/shiro/RedisClusterManager.java      | 1 -
 src/main/java/org/crazycake/shiro/RedisManager.java             | 1 -
 src/main/java/org/crazycake/shiro/RedisSentinelManager.java     | 1 -
 src/main/java/org/crazycake/shiro/RedisSessionDAO.java          | 1 -
 .../java/org/crazycake/shiro/common/WorkAloneRedisManager.java  | 1 +
 src/test/java/org/crazycake/shiro/RedisCacheManagerTest.java    | 1 -
 src/test/java/org/crazycake/shiro/RedisCacheTest.java           | 2 --
 src/test/java/org/crazycake/shiro/RedisSessionDAOTest.java      | 1 -
 11 files changed, 2 insertions(+), 12 deletions(-)
 rename src/main/java/org/crazycake/shiro/{common => }/IRedisManager.java (95%)

diff --git a/src/main/java/org/crazycake/shiro/common/IRedisManager.java b/src/main/java/org/crazycake/shiro/IRedisManager.java
similarity index 95%
rename from src/main/java/org/crazycake/shiro/common/IRedisManager.java
rename to src/main/java/org/crazycake/shiro/IRedisManager.java
index 6dce5e02e..b3dcf39b3 100644
--- a/src/main/java/org/crazycake/shiro/common/IRedisManager.java
+++ b/src/main/java/org/crazycake/shiro/IRedisManager.java
@@ -1,4 +1,4 @@
-package org.crazycake.shiro.common;
+package org.crazycake.shiro;
 
 import java.util.Set;
 
diff --git a/src/main/java/org/crazycake/shiro/RedisCache.java b/src/main/java/org/crazycake/shiro/RedisCache.java
index 1efaec0b5..1220167aa 100644
--- a/src/main/java/org/crazycake/shiro/RedisCache.java
+++ b/src/main/java/org/crazycake/shiro/RedisCache.java
@@ -4,12 +4,10 @@
 import org.apache.shiro.cache.CacheException;
 import org.apache.shiro.subject.PrincipalCollection;
 import org.apache.shiro.util.CollectionUtils;
-import org.crazycake.shiro.common.IRedisManager;
 import org.crazycake.shiro.exception.CacheManagerPrincipalIdNotAssignedException;
 import org.crazycake.shiro.exception.PrincipalIdNullException;
 import org.crazycake.shiro.exception.PrincipalInstanceException;
 import org.crazycake.shiro.exception.SerializationException;
-import org.crazycake.shiro.serializer.ObjectSerializer;
 import org.crazycake.shiro.serializer.RedisSerializer;
 import org.crazycake.shiro.serializer.StringSerializer;
 import org.slf4j.Logger;
diff --git a/src/main/java/org/crazycake/shiro/RedisCacheManager.java b/src/main/java/org/crazycake/shiro/RedisCacheManager.java
index bcacbe0d6..b172d5357 100644
--- a/src/main/java/org/crazycake/shiro/RedisCacheManager.java
+++ b/src/main/java/org/crazycake/shiro/RedisCacheManager.java
@@ -3,7 +3,6 @@
 import org.apache.shiro.cache.Cache;
 import org.apache.shiro.cache.CacheException;
 import org.apache.shiro.cache.CacheManager;
-import org.crazycake.shiro.common.IRedisManager;
 import org.crazycake.shiro.serializer.ObjectSerializer;
 import org.crazycake.shiro.serializer.RedisSerializer;
 import org.crazycake.shiro.serializer.StringSerializer;
diff --git a/src/main/java/org/crazycake/shiro/RedisClusterManager.java b/src/main/java/org/crazycake/shiro/RedisClusterManager.java
index 1ab85c959..a27326975 100644
--- a/src/main/java/org/crazycake/shiro/RedisClusterManager.java
+++ b/src/main/java/org/crazycake/shiro/RedisClusterManager.java
@@ -1,6 +1,5 @@
 package org.crazycake.shiro;
 
-import org.crazycake.shiro.common.IRedisManager;
 import redis.clients.jedis.*;
 
 import java.util.HashSet;
diff --git a/src/main/java/org/crazycake/shiro/RedisManager.java b/src/main/java/org/crazycake/shiro/RedisManager.java
index 03f897ffc..180cb9a05 100644
--- a/src/main/java/org/crazycake/shiro/RedisManager.java
+++ b/src/main/java/org/crazycake/shiro/RedisManager.java
@@ -1,6 +1,5 @@
 package org.crazycake.shiro;
 
-import org.crazycake.shiro.common.IRedisManager;
 import org.crazycake.shiro.common.WorkAloneRedisManager;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
diff --git a/src/main/java/org/crazycake/shiro/RedisSentinelManager.java b/src/main/java/org/crazycake/shiro/RedisSentinelManager.java
index da984fbaf..ef997a0e3 100644
--- a/src/main/java/org/crazycake/shiro/RedisSentinelManager.java
+++ b/src/main/java/org/crazycake/shiro/RedisSentinelManager.java
@@ -1,6 +1,5 @@
 package org.crazycake.shiro;
 
-import org.crazycake.shiro.common.IRedisManager;
 import org.crazycake.shiro.common.WorkAloneRedisManager;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisSentinelPool;
diff --git a/src/main/java/org/crazycake/shiro/RedisSessionDAO.java b/src/main/java/org/crazycake/shiro/RedisSessionDAO.java
index b24ad3a01..69220c68c 100644
--- a/src/main/java/org/crazycake/shiro/RedisSessionDAO.java
+++ b/src/main/java/org/crazycake/shiro/RedisSessionDAO.java
@@ -3,7 +3,6 @@
 import org.apache.shiro.session.Session;
 import org.apache.shiro.session.UnknownSessionException;
 import org.apache.shiro.session.mgt.eis.AbstractSessionDAO;
-import org.crazycake.shiro.common.IRedisManager;
 import org.crazycake.shiro.common.SessionInMemory;
 import org.crazycake.shiro.exception.SerializationException;
 import org.crazycake.shiro.serializer.ObjectSerializer;
diff --git a/src/main/java/org/crazycake/shiro/common/WorkAloneRedisManager.java b/src/main/java/org/crazycake/shiro/common/WorkAloneRedisManager.java
index 0ee340649..7352f6432 100644
--- a/src/main/java/org/crazycake/shiro/common/WorkAloneRedisManager.java
+++ b/src/main/java/org/crazycake/shiro/common/WorkAloneRedisManager.java
@@ -1,5 +1,6 @@
 package org.crazycake.shiro.common;
 
+import org.crazycake.shiro.IRedisManager;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPoolConfig;
 import redis.clients.jedis.ScanParams;
diff --git a/src/test/java/org/crazycake/shiro/RedisCacheManagerTest.java b/src/test/java/org/crazycake/shiro/RedisCacheManagerTest.java
index 504b83aae..b72b34eda 100644
--- a/src/test/java/org/crazycake/shiro/RedisCacheManagerTest.java
+++ b/src/test/java/org/crazycake/shiro/RedisCacheManagerTest.java
@@ -1,7 +1,6 @@
 package org.crazycake.shiro;
 
 import org.apache.shiro.cache.Cache;
-import org.crazycake.shiro.common.IRedisManager;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/crazycake/shiro/RedisCacheTest.java b/src/test/java/org/crazycake/shiro/RedisCacheTest.java
index b49619962..f2c0b8207 100644
--- a/src/test/java/org/crazycake/shiro/RedisCacheTest.java
+++ b/src/test/java/org/crazycake/shiro/RedisCacheTest.java
@@ -1,8 +1,6 @@
 package org.crazycake.shiro;
 
 import org.apache.shiro.subject.PrincipalCollection;
-import org.apache.shiro.subject.SimplePrincipalCollection;
-import org.crazycake.shiro.common.IRedisManager;
 import org.crazycake.shiro.exception.SerializationException;
 import org.crazycake.shiro.serializer.ObjectSerializer;
 import org.crazycake.shiro.serializer.StringSerializer;
diff --git a/src/test/java/org/crazycake/shiro/RedisSessionDAOTest.java b/src/test/java/org/crazycake/shiro/RedisSessionDAOTest.java
index 652b5919d..6bae2a8bc 100644
--- a/src/test/java/org/crazycake/shiro/RedisSessionDAOTest.java
+++ b/src/test/java/org/crazycake/shiro/RedisSessionDAOTest.java
@@ -2,7 +2,6 @@
 
 import org.apache.shiro.session.InvalidSessionException;
 import org.apache.shiro.session.Session;
-import org.crazycake.shiro.common.IRedisManager;
 import org.crazycake.shiro.exception.SerializationException;
 import org.crazycake.shiro.serializer.ObjectSerializer;
 import org.crazycake.shiro.serializer.StringSerializer;