删除无用依赖

zhou-hao · zhou-hao · commit 1640ad05f82b · 2017-02-16T15:05:47.000+08:00
diff --git a/hsweb-web-concurrent/hsweb-web-concurrent-cache/src/main/java/org/hsweb/concureent/cache/monitor/RedisMonitorCache.java b/hsweb-web-concurrent/hsweb-web-concurrent-cache/src/main/java/org/hsweb/concureent/cache/monitor/RedisMonitorCache.java
@@ -16,32 +16,16 @@
 
 package org.hsweb.concureent.cache.monitor;
 
-import static org.springframework.util.Assert.*;
-import static org.springframework.util.ObjectUtils.*;
-
-import java.lang.reflect.Constructor;
-import java.util.Arrays;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.stream.Collectors;
-
 import org.hsweb.commons.StringUtils;
 import org.hsweb.web.core.cache.monitor.MonitorCache;
 import org.hsweb.web.core.utils.ThreadLocalUtils;
 import org.springframework.cache.Cache;
-import org.springframework.cache.support.SimpleValueWrapper;
-import org.springframework.dao.DataAccessException;
-import org.springframework.data.redis.RedisSystemException;
 import org.springframework.data.redis.cache.RedisCache;
-import org.springframework.data.redis.cache.RedisCacheElement;
-import org.springframework.data.redis.cache.RedisCacheKey;
-import org.springframework.data.redis.connection.RedisConnection;
-import org.springframework.data.redis.connection.ReturnType;
 import org.springframework.data.redis.core.RedisCallback;
 import org.springframework.data.redis.core.RedisOperations;
-import org.springframework.data.redis.serializer.RedisSerializer;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-import org.springframework.util.ClassUtils;
+
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * Cache implementation on top of Redis.
diff --git a/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/AbstractServiceImpl.java b/hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/AbstractServiceImpl.java
@@ -14,7 +14,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.ResolvableType;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.validation.ConstraintViolation;
@@ -45,7 +44,7 @@ public abstract class AbstractServiceImpl<Po extends GenericPo<PK>, PK> implemen
 
     @Override
     public Class<PK> getPKType() {
-        return (Class<PK>) ClassUtils.getGenericType(this.getClass(), 1);
+        return (Class<PK>) ClassUtils.getGenericType(org.springframework.util.ClassUtils.getUserClass(this.getClass()), 1);
     }
 
     @Override
@@ -88,5 +87,4 @@ protected void assertNotNull(Object po) {
         assertNotNull(po, "数据不存在");
     }
 
-
 }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`14`	`14`	`import org.slf4j.Logger;`
`15`	`15`	`import org.slf4j.LoggerFactory;`
`16`	`16`	`import org.springframework.beans.factory.annotation.Autowired;`
`17`		`-import org.springframework.core.ResolvableType;`
`18`	`17`	`import org.springframework.transaction.annotation.Transactional;`
`19`	`18`
`20`	`19`	`import javax.validation.ConstraintViolation;`
`@@ -45,7 +44,7 @@ public abstract class AbstractServiceImpl<Po extends GenericPo<PK>, PK> implemen`
`45`	`44`
`46`	`45`	`@Override`
`47`	`46`	`public Class<PK> getPKType() {`
`48`		`- return (Class<PK>) ClassUtils.getGenericType(this.getClass(), 1);`
	`47`	`+ return (Class<PK>) ClassUtils.getGenericType(org.springframework.util.ClassUtils.getUserClass(this.getClass()), 1);`
`49`	`48`	`}`
`50`	`49`
`51`	`50`	`@Override`
`@@ -88,5 +87,4 @@ protected void assertNotNull(Object po) {`
`88`	`87`	`assertNotNull(po, "数据不存在");`
`89`	`88`	`}`
`90`	`89`
`91`		`-`
`92`	`90`	`}`