Polish Generics and Update Spring Version
We needed to update Spring Version to avoid https://jira.spring.io/browse/SPR-11471
This commit is contained in:
@@ -203,8 +203,8 @@ public class Config {
|
||||
}
|
||||
|
||||
@Bean
|
||||
public SessionRepositoryFilter<RedisSession> sessionFilter(SessionRepository<RedisSession> sessionRepository) {
|
||||
return new SessionRepositoryFilter<RedisSession>(sessionRepository);
|
||||
public <S extends ExpiringSession> SessionRepositoryFilter<? extends ExpiringSession> sessionFilter(SessionRepository<S> sessionRepository) {
|
||||
return new SessionRepositoryFilter<S>(sessionRepository);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ group = 'org.springframework.session'
|
||||
ext.jstlVersion = '1.2.1'
|
||||
ext.servletApiVersion = '3.0.1'
|
||||
ext.springSecurityVersion = '3.2.4.RELEASE'
|
||||
ext.springVersion = '4.0.2.RELEASE'
|
||||
ext.springVersion = '4.1.0.RELEASE'
|
||||
ext.groovyVersion = '2.0.5'
|
||||
ext.seleniumVersion = '2.33.0'
|
||||
ext.spockVersion = '0.7-groovy-2.0'
|
||||
@@ -40,6 +40,13 @@ repositories {
|
||||
maven { url 'http://clojars.org/repo' }
|
||||
}
|
||||
|
||||
configurations.all {
|
||||
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
|
||||
if (details.requested.group == 'org.springframework') {
|
||||
details.useVersion springVersion
|
||||
}
|
||||
}
|
||||
}
|
||||
// Integration test setup
|
||||
configurations {
|
||||
integrationTestCompile {
|
||||
|
||||
@@ -25,7 +25,6 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
|
||||
import org.springframework.session.ExpiringSession;
|
||||
import org.springframework.session.SessionRepository;
|
||||
import org.springframework.session.data.redis.RedisOperationsSessionRepository;
|
||||
import org.springframework.session.data.redis.RedisOperationsSessionRepository.RedisSession;
|
||||
import org.springframework.session.web.http.SessionRepositoryFilter;
|
||||
|
||||
import redis.clients.jedis.Protocol;
|
||||
@@ -80,7 +79,7 @@ public class Config {
|
||||
}
|
||||
|
||||
@Bean
|
||||
public SessionRepositoryFilter<RedisSession> sessionFilter(SessionRepository<RedisSession> sessionRepository) {
|
||||
return new SessionRepositoryFilter<RedisSession>(sessionRepository);
|
||||
public <S extends ExpiringSession> SessionRepositoryFilter<? extends ExpiringSession> sessionFilter(SessionRepository<S> sessionRepository) {
|
||||
return new SessionRepositoryFilter<S>(sessionRepository);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -233,7 +233,7 @@ public class RedisOperationsSessionRepository implements SessionRepository<Redis
|
||||
* @since 1.0
|
||||
* @author Rob Winch
|
||||
*/
|
||||
public final class RedisSession implements ExpiringSession {
|
||||
final class RedisSession implements ExpiringSession {
|
||||
private final MapSession cached;
|
||||
private Map<String, Object> delta = new HashMap<String,Object>();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user