Move IRedisManager back to root

alexxiyang · Sep 7, 2020 · b38fa01 · b38fa01
1 parent e36d35e
commit b38fa01
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 12 deletions.
diff --git a/...crazycake/shiro/common/IRedisManager.java → ...va/org/crazycake/shiro/IRedisManager.java b/...crazycake/shiro/common/IRedisManager.java → ...va/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;