Remove Compiler Warnings

* Fixes Generics
* Remove unused imports
* Ignore serialize warnings in tests

Fixes gh-40

README.adoc

@@ -183,30 +183,31 @@ Add the following Spring Configuration:
 @Configuration
 public class Config {
 
-	@Bean
-	public JedisConnectionFactory connectionFactory() throws Exception {
-		return new JedisConnectionFactory();
-	}
+    @Bean
+    public JedisConnectionFactory connectionFactory() throws Exception {
+        return new JedisConnectionFactory();
+    }
 
-	@Bean
-	public RedisTemplate<String,ExpiringSession> redisTemplate(RedisConnectionFactory connectionFactory) {
-		RedisTemplate<String, ExpiringSession> template = new RedisTemplate<String, ExpiringSession>();
-		template.setKeySerializer(new StringRedisSerializer());
-		template.setHashKeySerializer(new StringRedisSerializer());
-		template.setConnectionFactory(connectionFactory);
-		return template;
-	}
+    @Bean
+    public RedisTemplate<String,ExpiringSession> redisTemplate(RedisConnectionFactory connectionFactory) {
+        RedisTemplate<String, ExpiringSession> template = new RedisTemplate<String, ExpiringSession>();
+        template.setKeySerializer(new StringRedisSerializer());
+        template.setHashKeySerializer(new StringRedisSerializer());
+        template.setConnectionFactory(connectionFactory);
+        return template;
+    }
 
-	@Bean
-	public RedisOperationsSessionRepository sessionRepository(RedisTemplate<String, ExpiringSession> redisTemplate) {
-		return new RedisOperationsSessionRepository(redisTemplate);
-	}
+    @Bean
+    public RedisOperationsSessionRepository sessionRepository(RedisTemplate<String, ExpiringSession> redisTemplate) {
+        return new RedisOperationsSessionRepository(redisTemplate);
+    }
 
-	@Bean
-	public SessionRepositoryFilter sessionFilter(RedisOperationsSessionRepository sessionRepository) {
-		return new SessionRepositoryFilter(sessionRepository);
-	}
+    @Bean
+    public SessionRepositoryFilter<RedisSession> sessionFilter(SessionRepository<RedisSession> sessionRepository) {
+        return new SessionRepositoryFilter<RedisSession>(sessionRepository);
+    }
 }
+
 ----
 
 In our example, we are connecting to the default port (6379). For more information on configuring Spring Data Redis, refer to the http://docs.spring.io/spring-data/data-redis/docs/current/reference/html/[reference documentation].
@@ -221,19 +222,19 @@ We next need to be sure our Servlet Container (i.e. Tomcat) is properly configur
 [source,java]
 ----
 public class Initializer extends AbstractContextLoaderInitializer {
-	@Override
-	public void onStartup(ServletContext servletContext) throws ServletException {
-		super.onStartup(servletContext);
-		servletContext.addFilter("sessionFilter", DelegatingFilterProxy.class)
-				.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), false, "/*");
-	}
+    @Override
+    public void onStartup(ServletContext servletContext) throws ServletException {
+        super.onStartup(servletContext);
+        servletContext.addFilter("sessionFilter", DelegatingFilterProxy.class)
+                .addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), false, "/*");
+    }
 
-	@Override
-	protected WebApplicationContext createRootApplicationContext() {
-		AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
-		context.register(Config.class);
-		return context;
-	}
+    @Override
+    protected WebApplicationContext createRootApplicationContext() {
+        AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
+        context.register(Config.class);
+        return context;
+    }
 }
 ----
 

samples/web/src/main/java/Config.java

@@ -23,8 +23,11 @@ import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 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;
 import redis.embedded.RedisServer;
 
@@ -34,50 +37,50 @@ import redis.embedded.RedisServer;
 @Configuration
 public class Config {
 
-	@Bean
-	public RedisServerBean redisServer() {
-		return new RedisServerBean();
-	}
+    @Bean
+    public RedisServerBean redisServer() {
+        return new RedisServerBean();
+    }
 
-	class RedisServerBean implements InitializingBean, DisposableBean {
-		private RedisServer redisServer;
+    class RedisServerBean implements InitializingBean, DisposableBean {
+        private RedisServer redisServer;
 
 
-		@Override
-		public void afterPropertiesSet() throws Exception {
-			redisServer = new RedisServer(Protocol.DEFAULT_PORT);
-			redisServer.start();
-		}
+        @Override
+        public void afterPropertiesSet() throws Exception {
+            redisServer = new RedisServer(Protocol.DEFAULT_PORT);
+            redisServer.start();
+        }
 
-		@Override
-		public void destroy() throws Exception {
-			if(redisServer != null) {
-				redisServer.stop();
-			}
-		}
-	}
+        @Override
+        public void destroy() throws Exception {
+            if(redisServer != null) {
+                redisServer.stop();
+            }
+        }
+    }
 
-	@Bean
-	public JedisConnectionFactory connectionFactory() throws Exception {
-		return new JedisConnectionFactory();
-	}
+    @Bean
+    public JedisConnectionFactory connectionFactory() throws Exception {
+        return new JedisConnectionFactory();
+    }
 
-	@Bean
-	public RedisTemplate<String,ExpiringSession> redisTemplate(RedisConnectionFactory connectionFactory) {
-		RedisTemplate<String, ExpiringSession> template = new RedisTemplate<String, ExpiringSession>();
-		template.setKeySerializer(new StringRedisSerializer());
-		template.setHashKeySerializer(new StringRedisSerializer());
-		template.setConnectionFactory(connectionFactory);
-		return template;
-	}
+    @Bean
+    public RedisTemplate<String,ExpiringSession> redisTemplate(RedisConnectionFactory connectionFactory) {
+        RedisTemplate<String, ExpiringSession> template = new RedisTemplate<String, ExpiringSession>();
+        template.setKeySerializer(new StringRedisSerializer());
+        template.setHashKeySerializer(new StringRedisSerializer());
+        template.setConnectionFactory(connectionFactory);
+        return template;
+    }
 
-	@Bean
-	public RedisOperationsSessionRepository sessionRepository(RedisTemplate<String, ExpiringSession> redisTemplate) {
-		return new RedisOperationsSessionRepository(redisTemplate);
-	}
+    @Bean
+    public RedisOperationsSessionRepository sessionRepository(RedisTemplate<String, ExpiringSession> redisTemplate) {
+        return new RedisOperationsSessionRepository(redisTemplate);
+    }
 
-	@Bean
-	public SessionRepositoryFilter sessionFilter(RedisOperationsSessionRepository sessionRepository) {
-		return new SessionRepositoryFilter(sessionRepository);
-	}
+    @Bean
+    public SessionRepositoryFilter<RedisSession> sessionFilter(SessionRepository<RedisSession> sessionRepository) {
+        return new SessionRepositoryFilter<RedisSession>(sessionRepository);
+    }
 }

samples/web/src/main/java/SessionServlet.java

@@ -26,11 +26,14 @@ import java.io.IOException;
  */
 @WebServlet("/session")
 public class SessionServlet extends HttpServlet {
-	@Override
-	protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-		String attributeName = req.getParameter("attributeName");
-		String attributeValue = req.getParameter("attributeValue");
-		req.getSession().setAttribute(attributeName, attributeValue);
-		resp.sendRedirect(req.getContextPath() + "/");
-	}
+
+    @Override
+    protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+        String attributeName = req.getParameter("attributeName");
+        String attributeValue = req.getParameter("attributeValue");
+        req.getSession().setAttribute(attributeName, attributeValue);
+        resp.sendRedirect(req.getContextPath() + "/");
+    }
+
+    private static final long serialVersionUID = 2878267318695777395L;
 }

spring-session/src/integration-test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryITests.java

@@ -30,99 +30,97 @@ import java.net.ServerSocket;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
-public class RedisOperationsSessionRepositoryITests {
-	private RedisServer redisServer;
+public class RedisOperationsSessionRepositoryITests<S extends Session> {
+    private RedisServer redisServer;
 
-	@Autowired
-	private SessionRepository repository;
+    @Autowired
+    private SessionRepository<S> repository;
 
-	@Before
-	public void setup() throws IOException {
-		redisServer = new RedisServer(getPort());
-		redisServer.start();
-	}
+    @Before
+    public void setup() throws IOException {
+        redisServer = new RedisServer(getPort());
+        redisServer.start();
+    }
 
-	@After
-	public void shutdown() throws InterruptedException {
-		redisServer.stop();
-	}
+    @After
+    public void shutdown() throws InterruptedException {
+        redisServer.stop();
+    }
 
-	@Test
-	public void saves() {
-		Session toSave = repository.createSession();
-		toSave.setAttribute("a", "b");
-		Authentication toSaveToken = new UsernamePasswordAuthenticationToken("user","password", AuthorityUtils.createAuthorityList("ROLE_USER"));
-		SecurityContext toSaveContext = SecurityContextHolder.createEmptyContext();
-		toSaveContext.setAuthentication(toSaveToken);
-		toSave.setAttribute("SPRING_SECURITY_CONTEXT", toSaveContext);
+    @Test
+    public void saves() {
+        S toSave = repository.createSession();
+        toSave.setAttribute("a", "b");
+        Authentication toSaveToken = new UsernamePasswordAuthenticationToken("user","password", AuthorityUtils.createAuthorityList("ROLE_USER"));
+        SecurityContext toSaveContext = SecurityContextHolder.createEmptyContext();
+        toSaveContext.setAuthentication(toSaveToken);
+        toSave.setAttribute("SPRING_SECURITY_CONTEXT", toSaveContext);
 
-		repository.save(toSave);
+        repository.save(toSave);
 
-		Session session = repository.getSession(toSave.getId());
+        Session session = repository.getSession(toSave.getId());
 
-		assertThat(session.getId()).isEqualTo(toSave.getId());
-		assertThat(session.getAttributeNames()).isEqualTo(session.getAttributeNames());
-		assertThat(session.getAttribute("a")).isEqualTo(toSave.getAttribute("a"));
+        assertThat(session.getId()).isEqualTo(toSave.getId());
+        assertThat(session.getAttributeNames()).isEqualTo(session.getAttributeNames());
+        assertThat(session.getAttribute("a")).isEqualTo(toSave.getAttribute("a"));
 
-		SecurityContext context = (SecurityContext) session.getAttribute("SPRING_SECURITY_CONTEXT");
+        repository.delete(toSave.getId());
 
-		repository.delete(toSave.getId());
+        assertThat(repository.getSession(toSave.getId())).isNull();
+    }
 
-		assertThat(repository.getSession(toSave.getId())).isNull();
-	}
+    @Test
+    public void putAllOnSingleAttrDoesNotRemoveOld() {
+        S toSave = repository.createSession();
+        toSave.setAttribute("a", "b");
 
-	@Test
-	public void putAllOnSingleAttrDoesNotRemoveOld() {
-		Session toSave = repository.createSession();
-		toSave.setAttribute("a", "b");
+        repository.save(toSave);
+        toSave = repository.getSession(toSave.getId());
 
-		repository.save(toSave);
-		toSave = repository.getSession(toSave.getId());
+        toSave.setAttribute("1", "2");
 
-		toSave.setAttribute("1", "2");
+        repository.save(toSave);
+        toSave = repository.getSession(toSave.getId());
 
-		repository.save(toSave);
-		toSave = repository.getSession(toSave.getId());
+        Session session = repository.getSession(toSave.getId());
+        assertThat(session.getAttributeNames().size()).isEqualTo(2);
+        assertThat(session.getAttribute("a")).isEqualTo("b");
+        assertThat(session.getAttribute("1")).isEqualTo("2");
+    }
 
-		Session session = repository.getSession(toSave.getId());
-		assertThat(session.getAttributeNames().size()).isEqualTo(2);
-		assertThat(session.getAttribute("a")).isEqualTo("b");
-		assertThat(session.getAttribute("1")).isEqualTo("2");
-	}
+    @Configuration
+    static class Config {
+        @Bean
+        public JedisConnectionFactory connectionFactory() throws Exception {
+            JedisConnectionFactory factory = new JedisConnectionFactory();
+            factory.setPort(getPort());
+            factory.setUsePool(false);
+            return factory;
+        }
 
-	@Configuration
-	static class Config {
-		@Bean
-		public JedisConnectionFactory connectionFactory() throws Exception {
-			JedisConnectionFactory factory = new JedisConnectionFactory();
-			factory.setPort(getPort());
-			factory.setUsePool(false);
-			return factory;
-		}
+        @Bean
+        public RedisTemplate<String,ExpiringSession> redisTemplate(RedisConnectionFactory connectionFactory) {
+            RedisTemplate<String, ExpiringSession> template = new RedisTemplate<String, ExpiringSession>();
+            template.setKeySerializer(new StringRedisSerializer());
+            template.setHashKeySerializer(new StringRedisSerializer());
+            template.setConnectionFactory(connectionFactory);
+            return template;
+        }
 
-		@Bean
-		public RedisTemplate<String,ExpiringSession> redisTemplate(RedisConnectionFactory connectionFactory) {
-			RedisTemplate<String, ExpiringSession> template = new RedisTemplate<String, ExpiringSession>();
-			template.setKeySerializer(new StringRedisSerializer());
-			template.setHashKeySerializer(new StringRedisSerializer());
-			template.setConnectionFactory(connectionFactory);
-			return template;
-		}
+        @Bean
+        public RedisOperationsSessionRepository sessionRepository(RedisTemplate<String, ExpiringSession> redisTemplate) {
+            return new RedisOperationsSessionRepository(redisTemplate);
+        }
+    }
 
-		@Bean
-		public RedisOperationsSessionRepository sessionRepository(RedisTemplate<String, ExpiringSession> redisTemplate) {
-			return new RedisOperationsSessionRepository(redisTemplate);
-		}
-	}
+    private static Integer availablePort;
 
-	private static Integer availablePort;
-
-	private static int getPort() throws IOException {
-		if(availablePort == null) {
-			ServerSocket socket = new ServerSocket(0);
-			availablePort = socket.getLocalPort();
-			socket.close();
-		}
-		return availablePort;
-	}
+    private static int getPort() throws IOException {
+        if(availablePort == null) {
+            ServerSocket socket = new ServerSocket(0);
+            availablePort = socket.getLocalPort();
+            socket.close();
+        }
+        return availablePort;
+    }
 }

spring-session/src/main/java/org/springframework/session/Session.java

@@ -15,7 +15,6 @@
  */
 package org.springframework.session;
 
-import java.io.Serializable;
 import java.util.Set;
 
 /**

spring-session/src/main/java/org/springframework/session/data/redis/RedisOperationsSessionRepository.java

@@ -233,7 +233,7 @@ public class RedisOperationsSessionRepository implements SessionRepository<Redis
      * @since 1.0
      * @author Rob Winch
      */
-    final class RedisSession implements ExpiringSession {
+    public final class RedisSession implements ExpiringSession {
         private final MapSession cached;
         private Map<String, Object> delta = new HashMap<String,Object>();
 

spring-session/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java

@@ -23,6 +23,7 @@ import javax.servlet.FilterChain;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.*;
+
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -51,282 +52,284 @@ import java.util.Set;
  * @author Rob Winch
  */
 public class SessionRepositoryFilter<S extends ExpiringSession> extends OncePerRequestFilter {
-	private final SessionRepository<S> sessionRepository;
+    private final SessionRepository<S> sessionRepository;
 
-	private HttpSessionStrategy httpSessionStrategy = new CookieHttpSessionStrategy();
+    private HttpSessionStrategy httpSessionStrategy = new CookieHttpSessionStrategy();
 
-	/**
-	 * Creates a new instance
-	 *
-	 * @param sessionRepository the <code>SessionRepository</code> to use. Cannot be null.
-	 */
-	public SessionRepositoryFilter(SessionRepository<S> sessionRepository) {
-		Assert.notNull(sessionRepository, "SessionRepository cannot be null");
-		this.sessionRepository = sessionRepository;
-	}
+    /**
+     * Creates a new instance
+     *
+     * @param sessionRepository the <code>SessionRepository</code> to use. Cannot be null.
+     */
+    public SessionRepositoryFilter(SessionRepository<S> sessionRepository) {
+        Assert.notNull(sessionRepository, "SessionRepository cannot be null");
+        this.sessionRepository = sessionRepository;
+    }
 
-	/**
-	 * Sets the {@link HttpSessionStrategy} to be used. The default is a {@link CookieHttpSessionStrategy}.
-	 *
-	 * @param httpSessionStrategy the {@link HttpSessionStrategy} to use. Cannot be null.
-	 */
-	public void setHttpSessionStrategy(HttpSessionStrategy httpSessionStrategy) {
-		Assert.notNull(httpSessionStrategy,"httpSessionIdStrategy cannot be null");
-		this.httpSessionStrategy = httpSessionStrategy;
-	}
+    /**
+     * Sets the {@link HttpSessionStrategy} to be used. The default is a {@link CookieHttpSessionStrategy}.
+     *
+     * @param httpSessionStrategy the {@link HttpSessionStrategy} to use. Cannot be null.
+     */
+    public void setHttpSessionStrategy(HttpSessionStrategy httpSessionStrategy) {
+        Assert.notNull(httpSessionStrategy,"httpSessionIdStrategy cannot be null");
+        this.httpSessionStrategy = httpSessionStrategy;
+    }
 
-	protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
-		SessionRepositoryRequestWrapper wrappedRequest = new SessionRepositoryRequestWrapper(request, response);
-		SessionRepositoryResponseWrapper wrappedResponse = new SessionRepositoryResponseWrapper(wrappedRequest,response);
-		try {
-			filterChain.doFilter(wrappedRequest, wrappedResponse);
-		} finally {
-			wrappedRequest.commitSession();
-		}
-	}
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
+        SessionRepositoryRequestWrapper wrappedRequest = new SessionRepositoryRequestWrapper(request, response);
+        SessionRepositoryResponseWrapper wrappedResponse = new SessionRepositoryResponseWrapper(wrappedRequest,response);
+        try {
+            filterChain.doFilter(wrappedRequest, wrappedResponse);
+        } finally {
+            wrappedRequest.commitSession();
+        }
+    }
 
-	/**
-	 * Allows ensuring that the session is saved if the response is committed.
-	 *
-	 * @author Rob Winch
-	 * @since 1.0
-	 */
-	private final class SessionRepositoryResponseWrapper extends OnCommittedResponseWrapper {
+    /**
+     * Allows ensuring that the session is saved if the response is committed.
+     *
+     * @author Rob Winch
+     * @since 1.0
+     */
+    private final class SessionRepositoryResponseWrapper extends OnCommittedResponseWrapper {
 
-		private final SessionRepositoryRequestWrapper request;
+        private final SessionRepositoryRequestWrapper request;
 
-		/**
-		 * @param response the response to be wrapped
-		 */
-		public SessionRepositoryResponseWrapper(SessionRepositoryRequestWrapper request, HttpServletResponse response) {
-			super(response);
-			Assert.notNull(request, "SessionRepositoryRequestWrapper cannot be null");
-			this.request = request;
-		}
+        /**
+         * @param response the response to be wrapped
+         */
+        public SessionRepositoryResponseWrapper(SessionRepositoryRequestWrapper request, HttpServletResponse response) {
+            super(response);
+            Assert.notNull(request, "SessionRepositoryRequestWrapper cannot be null");
+            this.request = request;
+        }
 
-		@Override
-		protected void onResponseCommitted() {
-			request.commitSession();
-		}
-	}
+        @Override
+        protected void onResponseCommitted() {
+            request.commitSession();
+        }
+    }
 
-	/**
-	 * A {@link javax.servlet.http.HttpServletRequest} that retrieves the {@link javax.servlet.http.HttpSession} using a
-	 * {@link org.springframework.session.SessionRepository}.
-	 *
-	 * @author Rob Winch
-	 * @since 1.0
-	 */
-	private final class SessionRepositoryRequestWrapper extends HttpServletRequestWrapper {
-		private HttpSessionWrapper currentSession;
-		private boolean requestedValidSession;
-		private final HttpServletResponse response;
+    /**
+     * A {@link javax.servlet.http.HttpServletRequest} that retrieves the {@link javax.servlet.http.HttpSession} using a
+     * {@link org.springframework.session.SessionRepository}.
+     *
+     * @author Rob Winch
+     * @since 1.0
+     */
+    private final class SessionRepositoryRequestWrapper extends HttpServletRequestWrapper {
+        private HttpSessionWrapper currentSession;
+        private boolean requestedValidSession;
+        private final HttpServletResponse response;
 
-		private SessionRepositoryRequestWrapper(HttpServletRequest request, HttpServletResponse response) {
-			super(request);
-			this.response = response;
-		}
+        private SessionRepositoryRequestWrapper(HttpServletRequest request, HttpServletResponse response) {
+            super(request);
+            this.response = response;
+        }
 
-		/**
-		 * Uses the HttpSessionStrategy to write the session id tot he response and persist the Session.
-		 */
-		private void commitSession() {
-			HttpSessionWrapper wrappedSession = currentSession;
-			if(wrappedSession == null) {
-				if(isInvalidateClientSession()) {
-					httpSessionStrategy.onInvalidateSession(this, response);
-				}
-			} else {
-				S session = wrappedSession.session;
-				sessionRepository.save(session);
-				httpSessionStrategy.onNewSession(session, this, response);
-			}
-		}
+        /**
+         * Uses the HttpSessionStrategy to write the session id tot he response and persist the Session.
+         */
+        private void commitSession() {
+            HttpSessionWrapper wrappedSession = currentSession;
+            if(wrappedSession == null) {
+                if(isInvalidateClientSession()) {
+                    httpSessionStrategy.onInvalidateSession(this, response);
+                }
+            } else {
+                S session = wrappedSession.session;
+                sessionRepository.save(session);
+                httpSessionStrategy.onNewSession(session, this, response);
+            }
+        }
 
-		private boolean isInvalidateClientSession() {
-			return currentSession == null && requestedValidSession;
-		}
+        private boolean isInvalidateClientSession() {
+            return currentSession == null && requestedValidSession;
+        }
 
-		@Override
-		public HttpSession getSession(boolean create) {
-			if(currentSession != null) {
-				return currentSession;
-			}
-			String requestedSessionId = getRequestedSessionId();
-			if(requestedSessionId != null) {
-				S session = sessionRepository.getSession(requestedSessionId);
-				if(session != null) {
-					this.requestedValidSession = true;
-					currentSession = new HttpSessionWrapper(session, getServletContext());
-					currentSession.setNew(false);
-					return currentSession;
-				}
-			}
-			if(!create) {
-				return null;
-			}
-			S session = sessionRepository.createSession();
-			currentSession = new HttpSessionWrapper(session, getServletContext());
-			return currentSession;
-		}
+        @Override
+        public HttpSession getSession(boolean create) {
+            if(currentSession != null) {
+                return currentSession;
+            }
+            String requestedSessionId = getRequestedSessionId();
+            if(requestedSessionId != null) {
+                S session = sessionRepository.getSession(requestedSessionId);
+                if(session != null) {
+                    this.requestedValidSession = true;
+                    currentSession = new HttpSessionWrapper(session, getServletContext());
+                    currentSession.setNew(false);
+                    return currentSession;
+                }
+            }
+            if(!create) {
+                return null;
+            }
+            S session = sessionRepository.createSession();
+            currentSession = new HttpSessionWrapper(session, getServletContext());
+            return currentSession;
+        }
 
-		@Override
-		public HttpSession getSession() {
-			return getSession(true);
-		}
+        @Override
+        public HttpSession getSession() {
+            return getSession(true);
+        }
 
-		@Override
-		public String getRequestedSessionId() {
-			return httpSessionStrategy.getRequestedSessionId(this);
-		}
+        @Override
+        public String getRequestedSessionId() {
+            return httpSessionStrategy.getRequestedSessionId(this);
+        }
 
-		/**
-		 * Allows creating an HttpSession from a Session instance.
-		 *
-		 * @author Rob Winch
-		 * @since 1.0
-		 */
-		private final class HttpSessionWrapper implements HttpSession {
-			private final S session;
-			private final ServletContext servletContext;
-			private boolean invalidated;
-			private boolean old;
+        /**
+         * Allows creating an HttpSession from a Session instance.
+         *
+         * @author Rob Winch
+         * @since 1.0
+         */
+        private final class HttpSessionWrapper implements HttpSession {
+            private final S session;
+            private final ServletContext servletContext;
+            private boolean invalidated;
+            private boolean old;
 
-			public HttpSessionWrapper(S session, ServletContext servletContext) {
-				this.session = session;
-				this.servletContext = servletContext;
-			}
+            public HttpSessionWrapper(S session, ServletContext servletContext) {
+                this.session = session;
+                this.servletContext = servletContext;
+            }
 
-			@Override
-			public long getCreationTime() {
-				checkState();
-				return session.getCreationTime();
-			}
+            @Override
+            public long getCreationTime() {
+                checkState();
+                return session.getCreationTime();
+            }
 
-			@Override
-			public String getId() {
-				return session.getId();
-			}
+            @Override
+            public String getId() {
+                return session.getId();
+            }
 
-			@Override
-			public long getLastAccessedTime() {
-				checkState();
-				return session.getLastAccessedTime();
-			}
+            @Override
+            public long getLastAccessedTime() {
+                checkState();
+                return session.getLastAccessedTime();
+            }
 
-			@Override
-			public ServletContext getServletContext() {
-				return servletContext;
-			}
+            @Override
+            public ServletContext getServletContext() {
+                return servletContext;
+            }
 
-			@Override
-			public void setMaxInactiveInterval(int interval) {
-				session.setMaxInactiveInterval(interval);
-			}
+            @Override
+            public void setMaxInactiveInterval(int interval) {
+                session.setMaxInactiveInterval(interval);
+            }
 
-			@Override
-			public int getMaxInactiveInterval() {
-				return session.getMaxInactiveInterval();
-			}
+            @Override
+            public int getMaxInactiveInterval() {
+                return session.getMaxInactiveInterval();
+            }
 
-			@Override
-			public HttpSessionContext getSessionContext() {
-				return NOOP_SESSION_CONTEXT;
-			}
+            @Override
+            @SuppressWarnings("deprecation")
+            public HttpSessionContext getSessionContext() {
+                return NOOP_SESSION_CONTEXT;
+            }
 
-			@Override
-			public Object getAttribute(String name) {
-				checkState();
-				return session.getAttribute(name);
-			}
+            @Override
+            public Object getAttribute(String name) {
+                checkState();
+                return session.getAttribute(name);
+            }
 
-			@Override
-			public Object getValue(String name) {
-				return getAttribute(name);
-			}
+            @Override
+            public Object getValue(String name) {
+                return getAttribute(name);
+            }
 
-			@Override
-			public Enumeration<String> getAttributeNames() {
-				checkState();
-				return Collections.enumeration(session.getAttributeNames());
-			}
+            @Override
+            public Enumeration<String> getAttributeNames() {
+                checkState();
+                return Collections.enumeration(session.getAttributeNames());
+            }
 
-			@Override
-			public String[] getValueNames() {
-				checkState();
-				Set<String> attrs = session.getAttributeNames();
-				return attrs.toArray(new String[0]);
-			}
+            @Override
+            public String[] getValueNames() {
+                checkState();
+                Set<String> attrs = session.getAttributeNames();
+                return attrs.toArray(new String[0]);
+            }
 
-			@Override
-			public void setAttribute(String name, Object value) {
-				checkState();
-				session.setAttribute(name, value);
-			}
+            @Override
+            public void setAttribute(String name, Object value) {
+                checkState();
+                session.setAttribute(name, value);
+            }
 
-			@Override
-			public void putValue(String name, Object value) {
-				setAttribute(name, value);
-			}
+            @Override
+            public void putValue(String name, Object value) {
+                setAttribute(name, value);
+            }
 
-			@Override
-			public void removeAttribute(String name) {
-				checkState();
-				session.removeAttribute(name);
-			}
+            @Override
+            public void removeAttribute(String name) {
+                checkState();
+                session.removeAttribute(name);
+            }
 
-			@Override
-			public void removeValue(String name) {
-				removeAttribute(name);
-			}
+            @Override
+            public void removeValue(String name) {
+                removeAttribute(name);
+            }
 
-			@Override
-			public void invalidate() {
-				checkState();
-				this.invalidated = true;
-				currentSession = null;
-				sessionRepository.delete(getId());
-			}
+            @Override
+            public void invalidate() {
+                checkState();
+                this.invalidated = true;
+                currentSession = null;
+                sessionRepository.delete(getId());
+            }
 
-			public void setNew(boolean isNew) {
-				this.old = !isNew;
-			}
+            public void setNew(boolean isNew) {
+                this.old = !isNew;
+            }
 
-			@Override
-			public boolean isNew() {
-				checkState();
-				return !old;
-			}
+            @Override
+            public boolean isNew() {
+                checkState();
+                return !old;
+            }
 
-			private void checkState() {
-				if(invalidated) {
-					throw new IllegalStateException("The HttpSession has already be invalidated.");
-				}
-			}
-		}
-	}
+            private void checkState() {
+                if(invalidated) {
+                    throw new IllegalStateException("The HttpSession has already be invalidated.");
+                }
+            }
+        }
+    }
 
-	private static final HttpSessionContext NOOP_SESSION_CONTEXT = new HttpSessionContext() {
-		@Override
-		public HttpSession getSession(String sessionId) {
-			return null;
-		}
+    @SuppressWarnings("deprecation")
+    private static final HttpSessionContext NOOP_SESSION_CONTEXT = new HttpSessionContext() {
+        @Override
+        public HttpSession getSession(String sessionId) {
+            return null;
+        }
 
-		@Override
-		public Enumeration<String> getIds() {
-			return EMPTY_ENUMERATION;
-		}
-	};
+        @Override
+        public Enumeration<String> getIds() {
+            return EMPTY_ENUMERATION;
+        }
+    };
 
-	private static final Enumeration<String> EMPTY_ENUMERATION = new Enumeration<String>() {
-		@Override
-		public boolean hasMoreElements() {
-			return false;
-		}
+    private static final Enumeration<String> EMPTY_ENUMERATION = new Enumeration<String>() {
+        @Override
+        public boolean hasMoreElements() {
+            return false;
+        }
 
-		@Override
-		public String nextElement() {
-			throw new NoSuchElementException("a");
-		}
-	};
+        @Override
+        public String nextElement() {
+            throw new NoSuchElementException("a");
+        }
+    };
 }

spring-session/src/test/java/org/springframework/session/data/redis/RedisOperationsSessionRepositoryTests.java

@@ -19,7 +19,6 @@ import org.springframework.data.redis.core.BoundHashOperations;
 import org.springframework.data.redis.core.RedisOperations;
 import org.springframework.session.ExpiringSession;
 import org.springframework.session.MapSession;
-import org.springframework.session.Session;
 import org.springframework.session.data.redis.RedisOperationsSessionRepository.RedisSession;
 
 
@@ -122,6 +121,7 @@ public class RedisOperationsSessionRepositoryTests {
     }
 
     @Test
+    @SuppressWarnings("unchecked")
     public void getSessionNotFound() {
         String id = "abc";
         when(redisOperations.boundHashOps(getKey(id))).thenReturn(boundHashOperations);
@@ -131,6 +131,7 @@ public class RedisOperationsSessionRepositoryTests {
     }
 
     @Test
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     public void getSessionFound() {
         String attrName = "attrName";
         MapSession expected = new MapSession();
@@ -155,6 +156,7 @@ public class RedisOperationsSessionRepositoryTests {
 
     }
 
+    @SuppressWarnings("rawtypes")
     private Map map(Object...objects) {
         Map<String,Object> result = new HashMap<String,Object>();
         if(objects == null) {

spring-session/src/test/java/org/springframework/session/web/http/OncePerRequestFilterTests.java

@@ -12,6 +12,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -19,56 +20,57 @@ import java.util.List;
 import static org.fest.assertions.Assertions.*;
 
 public class OncePerRequestFilterTests {
-	private MockHttpServletRequest request;
-	private MockHttpServletResponse response;
-	private MockFilterChain chain;
-	private OncePerRequestFilter filter;
-	private HttpServlet servlet;
+    private MockHttpServletRequest request;
+    private MockHttpServletResponse response;
+    private MockFilterChain chain;
+    private OncePerRequestFilter filter;
+    private HttpServlet servlet;
 
 
-	private List<OncePerRequestFilter> invocations;
+    private List<OncePerRequestFilter> invocations;
 
-	@Before
-	public void setup() {
-		servlet = new HttpServlet() {};
-		request = new MockHttpServletRequest();
-		response = new MockHttpServletResponse();
-		chain = new MockFilterChain();
-		invocations = new ArrayList<OncePerRequestFilter>();
-		filter = new OncePerRequestFilter() {
-			@Override
-			protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
-				invocations.add(this);
-				filterChain.doFilter(request, response);
-			}
-		};
-	}
+    @Before
+    @SuppressWarnings("serial")
+    public void setup() {
+        servlet = new HttpServlet() {};
+        request = new MockHttpServletRequest();
+        response = new MockHttpServletResponse();
+        chain = new MockFilterChain();
+        invocations = new ArrayList<OncePerRequestFilter>();
+        filter = new OncePerRequestFilter() {
+            @Override
+            protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
+                invocations.add(this);
+                filterChain.doFilter(request, response);
+            }
+        };
+    }
 
-	@Test
-	public void doFilterOnce() throws ServletException, IOException {
-		filter.doFilter(request, response, chain);
+    @Test
+    public void doFilterOnce() throws ServletException, IOException {
+        filter.doFilter(request, response, chain);
 
-		assertThat(invocations).containsOnly(filter);
-	}
+        assertThat(invocations).containsOnly(filter);
+    }
 
-	@Test
-	public void doFilterMultiOnlyIvokesOnce() throws ServletException, IOException {
-		filter.doFilter(request, response, new MockFilterChain(servlet, filter));
+    @Test
+    public void doFilterMultiOnlyIvokesOnce() throws ServletException, IOException {
+        filter.doFilter(request, response, new MockFilterChain(servlet, filter));
 
-		assertThat(invocations).containsOnly(filter);
-	}
+        assertThat(invocations).containsOnly(filter);
+    }
 
-	@Test
-	public void doFilterOtherSubclassInvoked() throws ServletException, IOException {
-		OncePerRequestFilter filter2 = new OncePerRequestFilter() {
-			@Override
-			protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
-				invocations.add(this);
-				filterChain.doFilter(request, response);
-			}
-		};
-		filter.doFilter(request, response, new MockFilterChain(servlet, filter2));
+    @Test
+    public void doFilterOtherSubclassInvoked() throws ServletException, IOException {
+        OncePerRequestFilter filter2 = new OncePerRequestFilter() {
+            @Override
+            protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
+                invocations.add(this);
+                filterChain.doFilter(request, response);
+            }
+        };
+        filter.doFilter(request, response, new MockFilterChain(servlet, filter2));
 
-		assertThat(invocations).containsOnly(filter, filter2);
-	}
+        assertThat(invocations).containsOnly(filter, filter2);
+    }
 }