Skip to content

Commit 6130a10

Browse files
author
Rob Winch
committed
Remove Compiler Warnings
* Fixes Generics * Remove unused imports * Ignore serialize warnings in tests Fixes gh-40
1 parent 52827f4 commit 6130a10

File tree

10 files changed

+1388
-1373
lines changed

10 files changed

+1388
-1373
lines changed

README.adoc

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -183,30 +183,31 @@ Add the following Spring Configuration:
183183
@Configuration
184184
public class Config {
185185
186-
@Bean
187-
public JedisConnectionFactory connectionFactory() throws Exception {
188-
return new JedisConnectionFactory();
189-
}
190-
191-
@Bean
192-
public RedisTemplate<String,ExpiringSession> redisTemplate(RedisConnectionFactory connectionFactory) {
193-
RedisTemplate<String, ExpiringSession> template = new RedisTemplate<String, ExpiringSession>();
194-
template.setKeySerializer(new StringRedisSerializer());
195-
template.setHashKeySerializer(new StringRedisSerializer());
196-
template.setConnectionFactory(connectionFactory);
197-
return template;
198-
}
199-
200-
@Bean
201-
public RedisOperationsSessionRepository sessionRepository(RedisTemplate<String, ExpiringSession> redisTemplate) {
202-
return new RedisOperationsSessionRepository(redisTemplate);
203-
}
204-
205-
@Bean
206-
public SessionRepositoryFilter sessionFilter(RedisOperationsSessionRepository sessionRepository) {
207-
return new SessionRepositoryFilter(sessionRepository);
208-
}
186+
@Bean
187+
public JedisConnectionFactory connectionFactory() throws Exception {
188+
return new JedisConnectionFactory();
189+
}
190+
191+
@Bean
192+
public RedisTemplate<String,ExpiringSession> redisTemplate(RedisConnectionFactory connectionFactory) {
193+
RedisTemplate<String, ExpiringSession> template = new RedisTemplate<String, ExpiringSession>();
194+
template.setKeySerializer(new StringRedisSerializer());
195+
template.setHashKeySerializer(new StringRedisSerializer());
196+
template.setConnectionFactory(connectionFactory);
197+
return template;
198+
}
199+
200+
@Bean
201+
public RedisOperationsSessionRepository sessionRepository(RedisTemplate<String, ExpiringSession> redisTemplate) {
202+
return new RedisOperationsSessionRepository(redisTemplate);
203+
}
204+
205+
@Bean
206+
public SessionRepositoryFilter<RedisSession> sessionFilter(SessionRepository<RedisSession> sessionRepository) {
207+
return new SessionRepositoryFilter<RedisSession>(sessionRepository);
208+
}
209209
}
210+
210211
----
211212

212213
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
221222
[source,java]
222223
----
223224
public class Initializer extends AbstractContextLoaderInitializer {
224-
@Override
225-
public void onStartup(ServletContext servletContext) throws ServletException {
226-
super.onStartup(servletContext);
227-
servletContext.addFilter("sessionFilter", DelegatingFilterProxy.class)
228-
.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), false, "/*");
229-
}
230-
231-
@Override
232-
protected WebApplicationContext createRootApplicationContext() {
233-
AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
234-
context.register(Config.class);
235-
return context;
236-
}
225+
@Override
226+
public void onStartup(ServletContext servletContext) throws ServletException {
227+
super.onStartup(servletContext);
228+
servletContext.addFilter("sessionFilter", DelegatingFilterProxy.class)
229+
.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), false, "/*");
230+
}
231+
232+
@Override
233+
protected WebApplicationContext createRootApplicationContext() {
234+
AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
235+
context.register(Config.class);
236+
return context;
237+
}
237238
}
238239
----
239240

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

Lines changed: 41 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,11 @@
2323
import org.springframework.data.redis.core.RedisTemplate;
2424
import org.springframework.data.redis.serializer.StringRedisSerializer;
2525
import org.springframework.session.ExpiringSession;
26+
import org.springframework.session.SessionRepository;
2627
import org.springframework.session.data.redis.RedisOperationsSessionRepository;
28+
import org.springframework.session.data.redis.RedisOperationsSessionRepository.RedisSession;
2729
import org.springframework.session.web.http.SessionRepositoryFilter;
30+
2831
import redis.clients.jedis.Protocol;
2932
import redis.embedded.RedisServer;
3033

@@ -34,50 +37,50 @@
3437
@Configuration
3538
public class Config {
3639

37-
@Bean
38-
public RedisServerBean redisServer() {
39-
return new RedisServerBean();
40-
}
40+
@Bean
41+
public RedisServerBean redisServer() {
42+
return new RedisServerBean();
43+
}
4144

42-
class RedisServerBean implements InitializingBean, DisposableBean {
43-
private RedisServer redisServer;
45+
class RedisServerBean implements InitializingBean, DisposableBean {
46+
private RedisServer redisServer;
4447

4548

46-
@Override
47-
public void afterPropertiesSet() throws Exception {
48-
redisServer = new RedisServer(Protocol.DEFAULT_PORT);
49-
redisServer.start();
50-
}
49+
@Override
50+
public void afterPropertiesSet() throws Exception {
51+
redisServer = new RedisServer(Protocol.DEFAULT_PORT);
52+
redisServer.start();
53+
}
5154

52-
@Override
53-
public void destroy() throws Exception {
54-
if(redisServer != null) {
55-
redisServer.stop();
56-
}
57-
}
58-
}
55+
@Override
56+
public void destroy() throws Exception {
57+
if(redisServer != null) {
58+
redisServer.stop();
59+
}
60+
}
61+
}
5962

60-
@Bean
61-
public JedisConnectionFactory connectionFactory() throws Exception {
62-
return new JedisConnectionFactory();
63-
}
63+
@Bean
64+
public JedisConnectionFactory connectionFactory() throws Exception {
65+
return new JedisConnectionFactory();
66+
}
6467

65-
@Bean
66-
public RedisTemplate<String,ExpiringSession> redisTemplate(RedisConnectionFactory connectionFactory) {
67-
RedisTemplate<String, ExpiringSession> template = new RedisTemplate<String, ExpiringSession>();
68-
template.setKeySerializer(new StringRedisSerializer());
69-
template.setHashKeySerializer(new StringRedisSerializer());
70-
template.setConnectionFactory(connectionFactory);
71-
return template;
72-
}
68+
@Bean
69+
public RedisTemplate<String,ExpiringSession> redisTemplate(RedisConnectionFactory connectionFactory) {
70+
RedisTemplate<String, ExpiringSession> template = new RedisTemplate<String, ExpiringSession>();
71+
template.setKeySerializer(new StringRedisSerializer());
72+
template.setHashKeySerializer(new StringRedisSerializer());
73+
template.setConnectionFactory(connectionFactory);
74+
return template;
75+
}
7376

74-
@Bean
75-
public RedisOperationsSessionRepository sessionRepository(RedisTemplate<String, ExpiringSession> redisTemplate) {
76-
return new RedisOperationsSessionRepository(redisTemplate);
77-
}
77+
@Bean
78+
public RedisOperationsSessionRepository sessionRepository(RedisTemplate<String, ExpiringSession> redisTemplate) {
79+
return new RedisOperationsSessionRepository(redisTemplate);
80+
}
7881

79-
@Bean
80-
public SessionRepositoryFilter sessionFilter(RedisOperationsSessionRepository sessionRepository) {
81-
return new SessionRepositoryFilter(sessionRepository);
82-
}
82+
@Bean
83+
public SessionRepositoryFilter<RedisSession> sessionFilter(SessionRepository<RedisSession> sessionRepository) {
84+
return new SessionRepositoryFilter<RedisSession>(sessionRepository);
85+
}
8386
}

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,14 @@
2626
*/
2727
@WebServlet("/session")
2828
public class SessionServlet extends HttpServlet {
29-
@Override
30-
protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
31-
String attributeName = req.getParameter("attributeName");
32-
String attributeValue = req.getParameter("attributeValue");
33-
req.getSession().setAttribute(attributeName, attributeValue);
34-
resp.sendRedirect(req.getContextPath() + "/");
35-
}
29+
30+
@Override
31+
protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
32+
String attributeName = req.getParameter("attributeName");
33+
String attributeValue = req.getParameter("attributeValue");
34+
req.getSession().setAttribute(attributeName, attributeValue);
35+
resp.sendRedirect(req.getContextPath() + "/");
36+
}
37+
38+
private static final long serialVersionUID = 2878267318695777395L;
3639
}

0 commit comments

Comments
 (0)