From d57043ccea83d4522bf8909c93f5edab55db9f1c Mon Sep 17 00:00:00 2001 From: Ralph Soika Date: Mon, 24 Apr 2023 00:37:53 +0200 Subject: [PATCH] refactoring Issue #17 --- pom.xml | 46 +++++++++++-------- src/main/java/org/imixs/jwt/JWTBuilder.java | 8 ++-- .../org/imixs/jwt/jaspic/JWTAuthModule.java | 44 +++++++++--------- .../java/org/imixs/jwt/JWTBuilderTest.java | 6 +-- 4 files changed, 56 insertions(+), 48 deletions(-) diff --git a/pom.xml b/pom.xml index 6e5e0ff..48d2201 100644 --- a/pom.xml +++ b/pom.xml @@ -59,6 +59,11 @@ + + UTF-8 + 10.0.0 + + snapshots-repo @@ -78,8 +83,8 @@ maven-compiler-plugin 3.8.1 - 1.8 - 1.8 + 11 + 11 @@ -218,15 +223,15 @@ - + + - javax - javaee-api - 6.0 - provided + jakarta.platform + jakarta.jakartaee-api + ${jakarta.version} + provided - junit @@ -235,21 +240,24 @@ test - - - javax.json - javax.json-api - 1.1 - provided + org.eclipse.parsson + jakarta.json + 1.1.1 + test - - org.glassfish - javax.json - 1.1 - test + org.glassfish.jaxb + jaxb-runtime + 3.0.0 + test + + jakarta.xml.bind + jakarta.xml.bind-api + 3.0.0 + test + diff --git a/src/main/java/org/imixs/jwt/JWTBuilder.java b/src/main/java/org/imixs/jwt/JWTBuilder.java index b59aa13..1d16405 100644 --- a/src/main/java/org/imixs/jwt/JWTBuilder.java +++ b/src/main/java/org/imixs/jwt/JWTBuilder.java @@ -38,10 +38,10 @@ import java.util.Map; import java.util.Map.Entry; import javax.crypto.SecretKey; -import javax.json.Json; -import javax.json.JsonNumber; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.Json; +import jakarta.json.JsonNumber; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; /** * The JWTBuilder can be used to construct a JSON Web Token. The Builder expects a valid SecrectKey diff --git a/src/main/java/org/imixs/jwt/jaspic/JWTAuthModule.java b/src/main/java/org/imixs/jwt/jaspic/JWTAuthModule.java index 80650fb..9deaaa5 100644 --- a/src/main/java/org/imixs/jwt/jaspic/JWTAuthModule.java +++ b/src/main/java/org/imixs/jwt/jaspic/JWTAuthModule.java @@ -39,27 +39,27 @@ import java.util.logging.Level; import java.util.logging.Logger; import javax.crypto.SecretKey; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonException; -import javax.json.JsonNumber; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonException; +import jakarta.json.JsonNumber; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import javax.security.auth.Subject; import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; -import javax.security.auth.message.AuthException; -import javax.security.auth.message.AuthStatus; -import javax.security.auth.message.MessageInfo; -import javax.security.auth.message.MessagePolicy; -import javax.security.auth.message.callback.CallerPrincipalCallback; -import javax.security.auth.message.callback.GroupPrincipalCallback; -import javax.security.auth.message.config.ServerAuthContext; -import javax.security.auth.message.module.ServerAuthModule; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.security.auth.message.AuthException; +import jakarta.security.auth.message.AuthStatus; +import jakarta.security.auth.message.MessageInfo; +import jakarta.security.auth.message.MessagePolicy; +import jakarta.security.auth.message.callback.CallerPrincipalCallback; +import jakarta.security.auth.message.callback.GroupPrincipalCallback; +import jakarta.security.auth.message.config.ServerAuthContext; +import jakarta.security.auth.message.module.ServerAuthModule; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.imixs.jwt.HMAC; import org.imixs.jwt.JWSAlgorithm; import org.imixs.jwt.JWTException; @@ -82,7 +82,7 @@ public class JWTAuthModule implements ServerAuthModule, ServerAuthContext { @SuppressWarnings("rawtypes") protected static final Class[] supportedMessageTypes = new Class[] { - javax.servlet.http.HttpServletRequest.class, javax.servlet.http.HttpServletResponse.class}; + jakarta.servlet.http.HttpServletRequest.class, jakarta.servlet.http.HttpServletResponse.class}; @SuppressWarnings("rawtypes") protected Map options; @@ -91,8 +91,8 @@ public class JWTAuthModule implements ServerAuthModule, ServerAuthContext { protected MessagePolicy responsePolicy; private static final String IS_MANDATORY_INFO_KEY = - "javax.security.auth.message.MessagePolicy.isMandatory"; - private static final String AUTH_TYPE_INFO_KEY = "javax.servlet.http.authType"; + "jakarta.security.auth.message.MessagePolicy.isMandatory"; + private static final String AUTH_TYPE_INFO_KEY = "jakarta.servlet.http.authType"; private static final String QUERY_PARAM_SESSION = "jwt"; private static final String MODULE_OPTION_SECRET = "secret"; private static final String MODULE_OPTION_EXPIRE = "expire"; @@ -495,7 +495,7 @@ String consumeJWTPayload(HttpServletRequest request, HttpServletResponse respons // store groups into session request.getSession().setAttribute(JWT_GROUPS, stringGroups); - } catch (javax.json.stream.JsonParsingException j1) { + } catch (jakarta.json.stream.JsonParsingException j1) { logger.severe("invalid payload=" + _payload); logger .severe("JSON object or array cannot be created due to i/o error: " + j1.getMessage()); diff --git a/src/test/java/org/imixs/jwt/JWTBuilderTest.java b/src/test/java/org/imixs/jwt/JWTBuilderTest.java index 46b3b5b..ab47fb5 100644 --- a/src/test/java/org/imixs/jwt/JWTBuilderTest.java +++ b/src/test/java/org/imixs/jwt/JWTBuilderTest.java @@ -27,9 +27,9 @@ import java.util.Date; import java.util.logging.Logger; import javax.crypto.SecretKey; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonReader; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; import org.junit.Before; import org.junit.Test; import junit.framework.Assert;