mindol1004/spring-session
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Polish JDBC configuration (#608)

Browse Source
This commit is contained in:
Vedran Pavić
2016-09-02 20:42:36 +02:00
committed by Rob Winch
parent de7bb05fc1
commit 3e293e8b54
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-session/src/main/java/org/springframework/session/jdbc/JdbcOperationsSessionRepository.java
View File

@@ -130,7 +130,10 @@ import org.springframework.util.StringUtils;
public class JdbcOperationsSessionRepository implements
FindByIndexNameSessionRepository<JdbcOperationsSessionRepository.JdbcSession> {
private static final String DEFAULT_TABLE_NAME = "SPRING_SESSION";
/**
* The default name of database table used by Spring Session to store sessions.
*/
public static final String DEFAULT_TABLE_NAME = "SPRING_SESSION";
private static final String SPRING_SECURITY_CONTEXT = "SPRING_SECURITY_CONTEXT";

6
spring-session/src/main/java/org/springframework/session/jdbc/config/annotation/web/http/EnableJdbcHttpSession.java
View File

@@ -24,7 +24,9 @@ import java.lang.annotation.Target;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.session.MapSession;
import org.springframework.session.config.annotation.web.http.EnableSpringHttpSession;
import org.springframework.session.jdbc.JdbcOperationsSessionRepository;
/**
* Add this annotation to an {@code @Configuration} class to expose the
@@ -75,7 +77,7 @@ public @interface EnableJdbcHttpSession {
* The name of database table used by Spring Session to store sessions.
* @return the database table name
*/
String tableName() default "";
String tableName() default JdbcOperationsSessionRepository.DEFAULT_TABLE_NAME;
/**
* The session timeout in seconds. By default, it is set to 1800 seconds (30 minutes).
@@ -83,6 +85,6 @@ public @interface EnableJdbcHttpSession {
*
* @return the seconds a session can be inactive before expiring
*/
int maxInactiveIntervalInSeconds() default 1800;
int maxInactiveIntervalInSeconds() default MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS;
}

11
spring-session/src/main/java/org/springframework/session/jdbc/config/annotation/web/http/JdbcHttpSessionConfiguration.java
View File

@@ -54,9 +54,9 @@ import org.springframework.util.StringUtils;
public class JdbcHttpSessionConfiguration extends SpringHttpSessionConfiguration
implements ImportAware {
private String tableName = "";
private String tableName;
private Integer maxInactiveIntervalInSeconds = 1800;
private Integer maxInactiveIntervalInSeconds;
private LobHandler lobHandler;
@@ -116,10 +116,11 @@ public class JdbcHttpSessionConfiguration extends SpringHttpSessionConfiguration
}
private String getTableName() {
if (StringUtils.hasText(this.tableName)) {
return this.tableName;
String systemProperty = System.getProperty("spring.session.jdbc.tableName", "");
if (StringUtils.hasText(systemProperty)) {
return systemProperty;
}
return System.getProperty("spring.session.jdbc.tableName", "");
return this.tableName;
}
public void setImportMetadata(AnnotationMetadata importMetadata) {