Spring/spring-session
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove Compiler Warnings

Browse Source 
Fixes gh-346
This commit is contained in:
Rob Winch
2016-01-29 12:13:03 -06:00
parent 723ea5e2e0
commit 7a3bf533b3
9 changed files with 11 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/src/test/java/docs/IndexDocTests.java
View File

@@ -75,6 +75,7 @@ public class IndexDocTests {
demo.demo();
}
@SuppressWarnings("unused")
// tag::expire-repository-demo[]
public class ExpiringRepositoryDemo<S extends ExpiringSession> {
private SessionRepository<S> repository; // <1>
@@ -95,6 +96,7 @@ public class IndexDocTests {
// end::expire-repository-demo[]
@Test
@SuppressWarnings("unused")
public void newRedisOperationsSessionRepository() {
// tag::new-redisoperationssessionrepository[]
JedisConnectionFactory factory = new JedisConnectionFactory();
@@ -104,6 +106,7 @@ public class IndexDocTests {
}
@Test
@SuppressWarnings("unused")
public void mapRepository() {
// tag::new-mapsessionrepository[]
SessionRepository<? extends ExpiringSession> repository = new MapSessionRepository();

1
samples/httpsession-gemfire-clientserver-xml/src/main/java/sample/Application.java
View File

@@ -19,6 +19,7 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ImportResource;
@SuppressWarnings("resource")
// tag::class[]
@Configuration // <1>
@ImportResource("META-INF/spring/session-server.xml") // <2>

14
spring-session/src/main/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfiguration.java
View File

@@ -18,7 +18,6 @@ package org.springframework.session.data.redis.config.annotation.web.http;
import java.util.Arrays;
import java.util.Map;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -27,7 +26,6 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ImportAware;
import org.springframework.core.annotation.AnnotationAttributes;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.core.type.AnnotationMetadata;
import org.springframework.data.redis.connection.RedisConnection;
import org.springframework.data.redis.connection.RedisConnectionFactory;
@@ -43,7 +41,6 @@ import org.springframework.session.data.redis.RedisOperationsSessionRepository;
import org.springframework.session.data.redis.config.ConfigureNotifyKeyspaceEventsAction;
import org.springframework.session.data.redis.config.ConfigureRedisAction;
import org.springframework.session.web.http.SessionRepositoryFilter;
import org.springframework.util.ClassUtils;
import org.springframework.util.StringUtils;
/**
@@ -58,9 +55,7 @@ import org.springframework.util.StringUtils;
*/
@Configuration
@EnableScheduling
public class RedisHttpSessionConfiguration extends SpringHttpSessionConfiguration implements ImportAware, BeanClassLoaderAware {
private ClassLoader beanClassLoader;
public class RedisHttpSessionConfiguration extends SpringHttpSessionConfiguration implements ImportAware {
private Integer maxInactiveIntervalInSeconds = 1800;
@@ -171,11 +166,4 @@ public class RedisHttpSessionConfiguration extends SpringHttpSessionConfiguratio
public void setDefaultRedisSerializer(RedisSerializer<Object> defaultRedisSerializer) {
this.defaultRedisSerializer = defaultRedisSerializer;
}
/* (non-Javadoc)
* @see org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java.lang.ClassLoader)
*/
public void setBeanClassLoader(ClassLoader classLoader) {
this.beanClassLoader = classLoader;
}
}

12
spring-session/src/main/java/org/springframework/session/hazelcast/config/annotation/web/http/HazelcastHttpSessionConfiguration.java
View File

@@ -19,13 +19,11 @@ import java.util.Map;
import javax.annotation.PreDestroy;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ImportAware;
import org.springframework.core.annotation.AnnotationAttributes;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.core.type.AnnotationMetadata;
import org.springframework.session.ExpiringSession;
import org.springframework.session.MapSessionRepository;
@@ -33,7 +31,6 @@ import org.springframework.session.SessionRepository;
import org.springframework.session.config.annotation.web.http.SpringHttpSessionConfiguration;
import org.springframework.session.hazelcast.SessionEntryListener;
import org.springframework.session.web.http.SessionRepositoryFilter;
import org.springframework.util.ClassUtils;
import com.hazelcast.config.MapConfig;
import com.hazelcast.core.HazelcastInstance;
@@ -49,14 +46,12 @@ import com.hazelcast.core.IMap;
* @see EnableHazelcastHttpSession
*/
@Configuration
public class HazelcastHttpSessionConfiguration extends SpringHttpSessionConfiguration implements ImportAware, BeanClassLoaderAware {
public class HazelcastHttpSessionConfiguration extends SpringHttpSessionConfiguration implements ImportAware {
/** This is the magic value to use if you do not want this configuration
* overriding the maxIdleSeconds value for the Map backing the session data. */
private static final String DO_NOT_CONFIGURE_INACTIVE_INTERVAL_STRING = "";
private ClassLoader beanClassLoader;
private Integer maxInactiveIntervalInSeconds = 1800;
private String sessionMapName = "spring:session:sessions";
@@ -134,9 +129,4 @@ public class HazelcastHttpSessionConfiguration extends SpringHttpSessionConfigur
public void setSessionMapName(String sessionMapName) {
this.sessionMapName = sessionMapName;
}
public void setBeanClassLoader(ClassLoader classLoader) {
this.beanClassLoader = classLoader;
}
}

2
spring-session/src/test/java/org/springframework/session/MapSessionTests.java
View File

@@ -110,7 +110,7 @@ public class MapSessionTests {
return 0;
}
public Object getAttribute(String attributeName) {
public <T> T getAttribute(String attributeName) {
return null;
}

4
spring-session/src/test/java/org/springframework/session/data/gemfire/AbstractGemFireOperationsSessionRepositoryTest.java
View File

@@ -159,8 +159,8 @@ public class AbstractGemFireOperationsSessionRepositoryTest {
@SuppressWarnings("unchecked")
public void gemfireOperationsSessionRepositoryIsProperlyConstructedAndInitialized() throws Exception {
ApplicationEventPublisher mockApplicationEventPublisher = mock(ApplicationEventPublisher.class);
AttributesMutator mockAttributesMutator = mock(AttributesMutator.class);
Region mockRegion = mock(Region.class);
AttributesMutator<Object,ExpiringSession> mockAttributesMutator = mock(AttributesMutator.class);
Region<Object,ExpiringSession> mockRegion = mock(Region.class);
when(mockRegion.getFullPath()).thenReturn("/Example");
when(mockRegion.getAttributesMutator()).thenReturn(mockAttributesMutator);

1
spring-session/src/test/java/org/springframework/session/data/redis/SessionMessageListenerTests.java
View File

@@ -41,6 +41,7 @@ import org.springframework.session.events.SessionExpiredEvent;
*
*/
@RunWith(MockitoJUnitRunner.class)
@SuppressWarnings("deprecation")
public class SessionMessageListenerTests {
@Mock
ApplicationEventPublisher eventPublisher;

1
spring-session/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfigurationOverrideDefaultSerializerTests.java
View File

@@ -55,6 +55,7 @@ public class RedisHttpSessionConfigurationOverrideDefaultSerializerTests {
@Configuration
static class Config {
@Bean
@SuppressWarnings("unchecked")
public RedisSerializer<Object> defaultRedisSerializer() {
return mock(RedisSerializer.class);
}

2
spring-session/src/test/java/org/springframework/session/data/redis/config/annotation/web/http/gh109/Gh109Tests.java
View File

@@ -25,8 +25,6 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.connection.RedisConnection;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.core.RedisOperations;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.session.ExpiringSession;
import org.springframework.session.data.redis.RedisOperationsSessionRepository;
import org.springframework.session.data.redis.config.annotation.web.http.RedisHttpSessionConfiguration;
import org.springframework.test.context.ContextConfiguration;