You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by ra...@apache.org on 2019/01/04 13:30:55 UTC
[tomee] 06/12: Some more lambda transformation
This is an automated email from the ASF dual-hosted git repository.
radcortez pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 91c40fb47e2d79d448ba581482c63491c9bb2f69
Author: ivanjunckes <ij...@tomitribe.com>
AuthorDate: Thu Jan 3 11:22:41 2019 -0200
Some more lambda transformation
---
.../org/apache/tomee/microprofile/jwt/MPJWTFilter.java | 15 +++++----------
.../tomee/microprofile/jwt/cdi/MPJWTCDIExtension.java | 2 +-
.../microprofile/jwt/principal/JWTCallerPrincipal.java | 3 ++-
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
index b628bbd..8143a88 100644
--- a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
+++ b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/MPJWTFilter.java
@@ -196,15 +196,10 @@ public class MPJWTFilter implements Filter {
final Set<Principal> principals = new LinkedHashSet<>();
final JsonWebToken namePrincipal = tokenFunction.apply(request);
principals.add(namePrincipal);
- principals.addAll(namePrincipal.getGroups().stream().map(new Function<String, Principal>() {
+ principals.addAll(namePrincipal.getGroups().stream().map(role -> (Principal) new Principal() {
@Override
- public Principal apply(final String role) {
- return (Principal) new Principal() {
- @Override
- public String getName() {
- return role;
- }
- };
+ public String getName() {
+ return role;
}
}).collect(Collectors.<Principal>toList()));
return new Subject(true, principals, Collections.emptySet(), Collections.emptySet());
@@ -230,7 +225,7 @@ public class MPJWTFilter implements Filter {
}
- private static abstract class MPJWTException extends RuntimeException {
+ private abstract static class MPJWTException extends RuntimeException {
public MPJWTException() {
super();
@@ -260,7 +255,7 @@ public class MPJWTFilter implements Filter {
private static class BadAuthorizationPrefixException extends MPJWTException {
- private String authorizationHeader;
+ private final String authorizationHeader;
public BadAuthorizationPrefixException(final String authorizationHeader) {
this.authorizationHeader = authorizationHeader;
diff --git a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/cdi/MPJWTCDIExtension.java b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/cdi/MPJWTCDIExtension.java
index 2f7cf43..956ef94 100644
--- a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/cdi/MPJWTCDIExtension.java
+++ b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/cdi/MPJWTCDIExtension.java
@@ -95,7 +95,7 @@ public class MPJWTCDIExtension implements Extension {
types.stream()
.map(type -> new ClaimBean<>(bm, type))
- .forEach((Consumer<ClaimBean>) claimBean -> abd.addBean(claimBean));
+ .forEach((Consumer<ClaimBean>) abd::addBean);
abd.addBean()
.id(MPJWTCDIExtension.class.getName() + "#" + JsonWebToken.class.getName())
diff --git a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/principal/JWTCallerPrincipal.java b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/principal/JWTCallerPrincipal.java
index e56b6d3..abcd745 100644
--- a/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/principal/JWTCallerPrincipal.java
+++ b/mp-jwt/src/main/java/org/apache/tomee/microprofile/jwt/principal/JWTCallerPrincipal.java
@@ -54,8 +54,9 @@ public abstract class JWTCallerPrincipal implements JsonWebToken {
*/
public abstract String toString(final boolean showAll);
+ @Override
public <T> Optional<T> claim(final String claimName) {
- final T claim = (T) getClaim(claimName);
+ final T claim = getClaim(claimName);
return Optional.ofNullable(claim);
}
}