Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Eliminate use of Optional

This commit is contained in:
Craig Andrews 2021-04-16 11:41:47 -04:00 committed by Rob Winch
parent 10a264c144
commit 2bcd4627fa
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/src/main/java/org/springframework/security/web/session/RequestedUrlRedirectInvalidSessionStrategy.java
View File

@ -17,7 +17,6 @@
package org.springframework.security.web.session; package org.springframework.security.web.session;
import java.io.IOException; import java.io.IOException;
import java.util.Optional;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -47,9 +46,11 @@ public final class RequestedUrlRedirectInvalidSessionStrategy implements Invalid
@Override @Override
public void onInvalidSessionDetected(HttpServletRequest request, HttpServletResponse response) throws IOException { public void onInvalidSessionDetected(HttpServletRequest request, HttpServletResponse response) throws IOException {
String destinationUrl = this.urlPathHelper.getOriginatingRequestUri(request) String destinationUrl = this.urlPathHelper.getOriginatingRequestUri(request);
+ Optional.ofNullable(this.urlPathHelper.getOriginatingQueryString(request)).filter((s) -> !s.isEmpty()) String queryString = this.urlPathHelper.getOriginatingQueryString(request);
.map((s) -> "?" + s).orElse(""); if (queryString != null && !queryString.equals("")) {
destinationUrl = destinationUrl + "?" + queryString;
}
this.logger.debug("Starting new session (if required) and redirecting to '" + destinationUrl + "'"); this.logger.debug("Starting new session (if required) and redirecting to '" + destinationUrl + "'");
if (this.createNewSession) { if (this.createNewSession) {
request.getSession(); request.getSession();