Cleanup
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/92846aee Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/92846aee Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/92846aee Branch: refs/heads/master Commit: 92846aee07e5346864ab1eb8da2223cfb50b9802 Parents: 5060806 Author: Jean-Louis Monteiro <jeano...@gmail.com> Authored: Fri Mar 2 10:09:31 2018 +0100 Committer: Jean-Louis Monteiro <jeano...@gmail.com> Committed: Fri Mar 2 10:09:31 2018 +0100 ---------------------------------------------------------------------- .../tomee/microprofile/jwt/cdi/ClaimBean.java | 3 +- .../jwt/cdi/ClaimInjectionPoint.java | 2 +- .../microprofile/jwt/cdi/MPJWTProducer.java | 101 +------------------ 3 files changed, 4 insertions(+), 102 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/92846aee/tck/mp-jwt-embedded/src/main/java/org/apache/tomee/microprofile/jwt/cdi/ClaimBean.java ---------------------------------------------------------------------- diff --git a/tck/mp-jwt-embedded/src/main/java/org/apache/tomee/microprofile/jwt/cdi/ClaimBean.java b/tck/mp-jwt-embedded/src/main/java/org/apache/tomee/microprofile/jwt/cdi/ClaimBean.java index ad713dd..10abedf 100644 --- a/tck/mp-jwt-embedded/src/main/java/org/apache/tomee/microprofile/jwt/cdi/ClaimBean.java +++ b/tck/mp-jwt-embedded/src/main/java/org/apache/tomee/microprofile/jwt/cdi/ClaimBean.java @@ -64,7 +64,6 @@ public class ClaimBean<T> implements Bean<T>, PassivationCapable { } else if (type instanceof ParameterizedType) { final ParameterizedType paramType = (ParameterizedType) type; - return (Class) paramType.getRawType(); } @@ -195,7 +194,7 @@ public class ClaimBean<T> implements Bean<T>, PassivationCapable { } private T getClaimValue(final String name, final Class clazz) { - final JsonWebToken jwt = MPJWTProducer.getJWTPrincpal(); + final JsonWebToken jwt = MPJWTProducer.getJWTPrincipal(); if (jwt == null) { logger.warning(String.format("Can't retrieve claim %s. No active principal.", name)); return null; http://git-wip-us.apache.org/repos/asf/tomee/blob/92846aee/tck/mp-jwt-embedded/src/main/java/org/apache/tomee/microprofile/jwt/cdi/ClaimInjectionPoint.java ---------------------------------------------------------------------- diff --git a/tck/mp-jwt-embedded/src/main/java/org/apache/tomee/microprofile/jwt/cdi/ClaimInjectionPoint.java b/tck/mp-jwt-embedded/src/main/java/org/apache/tomee/microprofile/jwt/cdi/ClaimInjectionPoint.java index a281014..949e36c 100644 --- a/tck/mp-jwt-embedded/src/main/java/org/apache/tomee/microprofile/jwt/cdi/ClaimInjectionPoint.java +++ b/tck/mp-jwt-embedded/src/main/java/org/apache/tomee/microprofile/jwt/cdi/ClaimInjectionPoint.java @@ -25,7 +25,7 @@ import java.lang.reflect.Type; import java.util.Collections; import java.util.Set; -class ClaimInjectionPoint implements InjectionPoint{ +class ClaimInjectionPoint implements InjectionPoint { private final Bean bean; ClaimInjectionPoint(Bean bean) { http://git-wip-us.apache.org/repos/asf/tomee/blob/92846aee/tck/mp-jwt-embedded/src/main/java/org/apache/tomee/microprofile/jwt/cdi/MPJWTProducer.java ---------------------------------------------------------------------- diff --git a/tck/mp-jwt-embedded/src/main/java/org/apache/tomee/microprofile/jwt/cdi/MPJWTProducer.java b/tck/mp-jwt-embedded/src/main/java/org/apache/tomee/microprofile/jwt/cdi/MPJWTProducer.java index 1d83a08..21196a8 100644 --- a/tck/mp-jwt-embedded/src/main/java/org/apache/tomee/microprofile/jwt/cdi/MPJWTProducer.java +++ b/tck/mp-jwt-embedded/src/main/java/org/apache/tomee/microprofile/jwt/cdi/MPJWTProducer.java @@ -16,122 +16,25 @@ */ package org.apache.tomee.microprofile.jwt.cdi; -import org.eclipse.microprofile.jwt.Claim; -import org.eclipse.microprofile.jwt.ClaimValue; -import org.eclipse.microprofile.jwt.Claims; import org.eclipse.microprofile.jwt.JsonWebToken; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.InjectionPoint; -import javax.inject.Inject; -import javax.json.Json; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonValue; -import javax.json.bind.Jsonb; -import java.lang.annotation.Annotation; -import java.util.Collection; -import java.util.Map; -import java.util.Optional; -import java.util.logging.Logger; @ApplicationScoped public class MPJWTProducer { - @Inject - private Jsonb jsonb; - - private static final String TMP = "tmp"; - private static Logger log = Logger.getLogger(MPJWTProducer.class.getName()); private static ThreadLocal<JsonWebToken> currentPrincipal = new ThreadLocal<>(); - public static void setJWTPrincipal(JsonWebToken principal) { + public static void setJWTPrincipal(final JsonWebToken principal) { currentPrincipal.set(principal); } - public static JsonWebToken getJWTPrincpal() { + public static JsonWebToken getJWTPrincipal() { return currentPrincipal.get(); } - <T> ClaimValue<Optional<T>> generalClaimValueProducer(String name) { - ClaimValueWrapper<Optional<T>> wrapper = new ClaimValueWrapper<>(name); - T value = getValue(name, false); - Optional<T> optValue = Optional.ofNullable(value); - wrapper.setValue(optValue); - return wrapper; - } - - JsonValue generalJsonValueProducer(String name) { - Object value = getValue(name, false); - JsonValue jsonValue = wrapValue(value); - return jsonValue; - } - - public <T> T getValue(String name, boolean isOptional) { - JsonWebToken jwt = getJWTPrincpal(); - if (jwt == null) { - log.fine(String.format("getValue(%s), null JsonWebToken", name)); - return null; - } - - Optional<T> claimValue = jwt.claim(name); - if (!isOptional && !claimValue.isPresent()) { - log.fine(String.format("Failed to find Claim for: %s", name)); - } - log.fine(String.format("getValue(%s), isOptional=%s, claimValue=%s", name, isOptional, claimValue)); - return claimValue.orElse(null); - } - - JsonObject replaceMap(final Map<String, Object> map) { - return jsonb.fromJson(jsonb.toJson(map), JsonObject.class); - } - - JsonValue wrapValue(Object value) { - JsonValue jsonValue = null; - if (value instanceof JsonValue) { - // This may already be a JsonValue - jsonValue = (JsonValue) value; - } else if (value instanceof String) { - jsonValue = Json.createObjectBuilder() - .add(TMP, value.toString()) - .build() - .getJsonString(TMP); - } else if (value instanceof Number) { - Number number = (Number) value; - if ((number instanceof Long) || (number instanceof Integer)) { - jsonValue = Json.createObjectBuilder() - .add(TMP, number.longValue()) - .build() - .getJsonNumber(TMP); - } else { - jsonValue = Json.createObjectBuilder() - .add(TMP, number.doubleValue()) - .build() - .getJsonNumber(TMP); - } - } else if (value instanceof Boolean) { - Boolean flag = (Boolean) value; - jsonValue = flag ? JsonValue.TRUE : JsonValue.FALSE; - } else if (value instanceof Collection) { - JsonArrayBuilder arrayBuilder = Json.createArrayBuilder(); - Collection list = (Collection) value; - for (Object element : list) { - if (element instanceof String) { - arrayBuilder.add(element.toString()); - } else { - JsonValue jvalue = wrapValue(element); - arrayBuilder.add(jvalue); - } - } - jsonValue = arrayBuilder.build(); - } else if (value instanceof Map) { - jsonValue = replaceMap((Map) value); - } - return jsonValue; - } - @Produces @RequestScoped JsonWebToken currentPrincipal() {