root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Polish AbstractServletWebServerFactory 

See gh-26478
This commit is contained in:
weixsun 2021-05-16 20:15:07 +08:00 committed by Stephane Nicoll
parent d41fa13463
commit 935199b6ba
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactory.java
View File

@ -19,6 +19,7 @@ package org.springframework.boot.web.servlet.server;
import java.io.File; import java.io.File;
import java.net.URL; import java.net.URL;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
@ -37,6 +38,7 @@ import javax.servlet.SessionCookieConfig;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.boot.context.properties.PropertyMapper;
import org.springframework.boot.web.server.AbstractConfigurableWebServerFactory; import org.springframework.boot.web.server.AbstractConfigurableWebServerFactory;
import org.springframework.boot.web.server.MimeMappings; import org.springframework.boot.web.server.MimeMappings;
import org.springframework.boot.web.servlet.ServletContextInitializer; import org.springframework.boot.web.servlet.ServletContextInitializer;
@ -317,27 +319,14 @@ public abstract class AbstractServletWebServerFactory extends AbstractConfigurab
private void configureSessionCookie(SessionCookieConfig config) { private void configureSessionCookie(SessionCookieConfig config) {
Session.Cookie cookie = this.session.getCookie(); Session.Cookie cookie = this.session.getCookie();
if (cookie.getName() != null) { PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
config.setName(cookie.getName()); map.from(cookie::getName).to(config::setName);
} map.from(cookie::getDomain).to(config::setDomain);
if (cookie.getDomain() != null) { map.from(cookie::getPath).to(config::setPath);
config.setDomain(cookie.getDomain()); map.from(cookie::getComment).to(config::setComment);
} map.from(cookie::getHttpOnly).to(config::setHttpOnly);
if (cookie.getPath() != null) { map.from(cookie::getSecure).to(config::setSecure);
config.setPath(cookie.getPath()); map.from(cookie::getMaxAge).asInt(Duration::getSeconds).to(config::setMaxAge);
}
if (cookie.getComment() != null) {
config.setComment(cookie.getComment());
}
if (cookie.getHttpOnly() != null) {
config.setHttpOnly(cookie.getHttpOnly());
}
if (cookie.getSecure() != null) {
config.setSecure(cookie.getSecure());
}
if (cookie.getMaxAge() != null) {
config.setMaxAge((int) cookie.getMaxAge().getSeconds());
}
} }
private Set<javax.servlet.SessionTrackingMode> unwrap(Set<Session.SessionTrackingMode> modes) { private Set<javax.servlet.SessionTrackingMode> unwrap(Set<Session.SessionTrackingMode> modes) {