Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

use java8 optional

Browse Source
This commit is contained in:
Athou
2014-12-12 10:18:59 +01:00
parent 6c67e6363a
commit db03dd12a0
12 changed files with 151 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/commafeed/frontend/auth/SecurityCheckFactory.java
View File

@@ -1,5 +1,7 @@
package com.commafeed.frontend.auth;
import java.util.Optional;
import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.WebApplicationException;
@@ -18,7 +20,6 @@ import com.commafeed.backend.model.User;
import com.commafeed.backend.model.UserRole.Role;
import com.commafeed.backend.service.UserService;
import com.commafeed.frontend.session.SessionHelper;
import com.google.common.base.Optional;
@RequiredArgsConstructor
public class SecurityCheckFactory extends AbstractContainerRequestValueFactory<User> {
@@ -82,7 +83,7 @@ public class SecurityCheckFactory extends AbstractContainerRequestValueFactory<U
}
}
}
return Optional.absent();
return Optional.empty();
}
private Optional<User> apiKeyLogin() {
@@ -90,7 +91,7 @@ public class SecurityCheckFactory extends AbstractContainerRequestValueFactory<U
if (apiKey != null && apiKeyAllowed) {
return userService.login(apiKey);
}
return Optional.absent();
return Optional.empty();
}
}