Skip to content

Commit 22c22a1

Browse files
committed
Move server.session.* to server.servlet.session.*
Closes spring-projectsgh-11589
1 parent 199d2e3 commit 22c22a1

File tree

10 files changed

+273
-183
lines changed

10 files changed

+273
-183
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionProperties.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import org.springframework.beans.factory.ObjectProvider;
2525
import org.springframework.boot.autoconfigure.web.ServerProperties;
26-
import org.springframework.boot.autoconfigure.web.ServerProperties.Session;
26+
import org.springframework.boot.autoconfigure.web.ServerProperties.Servlet.Session;
2727
import org.springframework.boot.context.properties.ConfigurationProperties;
2828
import org.springframework.boot.web.servlet.DispatcherType;
2929
import org.springframework.session.web.http.SessionRepositoryFilter;
@@ -53,7 +53,7 @@ public class SessionProperties {
5353

5454
public SessionProperties(ObjectProvider<ServerProperties> serverProperties) {
5555
ServerProperties properties = serverProperties.getIfUnique();
56-
Session session = (properties == null ? null : properties.getSession());
56+
Session session = (properties == null ? null : properties.getServlet().getSession());
5757
this.timeout = (session == null ? null : session.getTimeout());
5858
}
5959

@@ -68,7 +68,7 @@ public void setStoreType(StoreType storeType) {
6868
/**
6969
* Return the session timeout.
7070
* @return the session timeout
71-
* @see ServerProperties#getSession()
71+
* @see ServerProperties.Servlet#getSession()
7272
*/
7373
public Duration getTimeout() {
7474
return this.timeout;

0 commit comments

Comments
 (0)