Improve Session API to use Java 8

This commit is contained in:
Vedran Pavic
2017-05-04 23:03:26 +02:00
committed by Rob Winch
parent 4cf26d9c36
commit f7e07b7f6b
33 changed files with 370 additions and 310 deletions

View File

@@ -20,6 +20,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
@@ -66,15 +67,15 @@ public class UserAccountsFilter implements Filter {
continue;
}
String username = session.getAttribute("username");
if (username == null) {
Optional<String> username = session.getAttribute("username");
if (!username.isPresent()) {
unauthenticatedAlias = alias;
continue;
}
String logoutUrl = sessionManager.encodeURL("./logout", alias);
String switchAccountUrl = sessionManager.encodeURL("./", alias);
Account account = new Account(username, logoutUrl, switchAccountUrl);
Account account = new Account(username.get(), logoutUrl, switchAccountUrl);
if (currentSessionAlias.equals(alias)) {
currentAccount = account;
}