diff --git a/docs/script-catalog/client_authn/ClientAuthn.java b/docs/script-catalog/client_authn/ClientAuthn.java index d8bd8c0fbad..87e843b0309 100644 --- a/docs/script-catalog/client_authn/ClientAuthn.java +++ b/docs/script-catalog/client_authn/ClientAuthn.java @@ -16,7 +16,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jans-auth-server/client/pom.xml b/jans-auth-server/client/pom.xml index a78d5c0ce68..e97a272ee7f 100644 --- a/jans-auth-server/client/pom.xml +++ b/jans-auth-server/client/pom.xml @@ -208,8 +208,8 @@ commons-codec - commons-lang - commons-lang + org.apache.commons + commons-lang3 commons-cli diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/AccessEvaluationClientResponse.java b/jans-auth-server/client/src/main/java/io/jans/as/client/AccessEvaluationClientResponse.java index c423d3bb413..0640d9e8fef 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/AccessEvaluationClientResponse.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/AccessEvaluationClientResponse.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.jans.model.authzen.AccessEvaluationResponse; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; /** diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/AuthorizationRequest.java b/jans-auth-server/client/src/main/java/io/jans/as/client/AuthorizationRequest.java index 35272eba3f0..695bb8f4d64 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/AuthorizationRequest.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/AuthorizationRequest.java @@ -13,7 +13,7 @@ import io.jans.as.model.common.ResponseMode; import io.jans.as.model.common.ResponseType; import io.jans.as.model.util.Util; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONException; import org.json.JSONObject; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/AuthorizationResponse.java b/jans-auth-server/client/src/main/java/io/jans/as/client/AuthorizationResponse.java index cdf1e7a4def..8366df2dd82 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/AuthorizationResponse.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/AuthorizationResponse.java @@ -16,7 +16,7 @@ import io.jans.as.model.util.JwtUtil; import io.jans.as.model.util.QueryStringDecoder; import io.jans.as.model.util.Util; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONException; import org.json.JSONObject; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/BackchannelAuthenticationClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/BackchannelAuthenticationClient.java index 4cb87b22064..6db222ace55 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/BackchannelAuthenticationClient.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/BackchannelAuthenticationClient.java @@ -9,7 +9,7 @@ import io.jans.as.model.ciba.BackchannelAuthenticationRequestParam; import io.jans.as.model.common.AuthenticationMethod; import io.jans.as.model.util.Util; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONObject; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/BackchannelAuthenticationResponse.java b/jans-auth-server/client/src/main/java/io/jans/as/client/BackchannelAuthenticationResponse.java index 84755cb2231..97de01ceeca 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/BackchannelAuthenticationResponse.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/BackchannelAuthenticationResponse.java @@ -7,7 +7,7 @@ package io.jans.as.client; import io.jans.as.model.ciba.BackchannelAuthenticationErrorResponseType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONException; import org.json.JSONObject; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/BaseClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/BaseClient.java index 39286737047..e7fb5e976f3 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/BaseClient.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/BaseClient.java @@ -19,7 +19,7 @@ import jakarta.ws.rs.core.Form; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.jboss.resteasy.client.jaxrs.ClientHttpEngine; import org.jboss.resteasy.client.jaxrs.ResteasyClient; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/BaseRequest.java b/jans-auth-server/client/src/main/java/io/jans/as/client/BaseRequest.java index f2ea460d9c7..58336af29dc 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/BaseRequest.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/BaseRequest.java @@ -10,7 +10,7 @@ import io.jans.as.model.common.AuthorizationMethod; import io.jans.as.model.util.Util; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONException; import org.json.JSONObject; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/BaseResponseWithErrors.java b/jans-auth-server/client/src/main/java/io/jans/as/client/BaseResponseWithErrors.java index bc4b937adb5..a8205b6cbc3 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/BaseResponseWithErrors.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/BaseResponseWithErrors.java @@ -8,7 +8,7 @@ import io.jans.as.model.config.Constants; import io.jans.as.model.error.IErrorType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.json.JSONException; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/ClientAuthnEnabler.java b/jans-auth-server/client/src/main/java/io/jans/as/client/ClientAuthnEnabler.java index ff94b478568..a61dc13b19b 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/ClientAuthnEnabler.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/ClientAuthnEnabler.java @@ -11,7 +11,7 @@ import jakarta.ws.rs.client.Invocation.Builder; import jakarta.ws.rs.core.Form; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/ClientAuthnRequest.java b/jans-auth-server/client/src/main/java/io/jans/as/client/ClientAuthnRequest.java index eec1b20e7e1..68c81929199 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/ClientAuthnRequest.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/ClientAuthnRequest.java @@ -13,7 +13,7 @@ import io.jans.as.model.jwt.JwtType; import io.jans.as.model.token.ClientAssertionType; import io.jans.as.model.util.QueryBuilder; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import java.util.Calendar; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/ClientInfoClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/ClientInfoClient.java index 1fefc51c284..8f95ac560e4 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/ClientInfoClient.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/ClientInfoClient.java @@ -8,7 +8,7 @@ import io.jans.as.client.util.ClientUtil; import io.jans.as.model.common.AuthorizationMethod; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.jboss.resteasy.client.jaxrs.ClientHttpEngine; import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/DeviceAuthzClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/DeviceAuthzClient.java index d55b3ffa592..28994296c0a 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/DeviceAuthzClient.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/DeviceAuthzClient.java @@ -7,7 +7,7 @@ package io.jans.as.client; import io.jans.as.model.util.Util; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.jboss.resteasy.client.jaxrs.ClientHttpEngine; import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/DeviceAuthzRequest.java b/jans-auth-server/client/src/main/java/io/jans/as/client/DeviceAuthzRequest.java index 4bd1d9558f6..22bed73bc83 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/DeviceAuthzRequest.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/DeviceAuthzRequest.java @@ -9,7 +9,7 @@ import io.jans.as.model.authorize.AuthorizeRequestParam; import io.jans.as.model.common.AuthenticationMethod; import io.jans.as.model.util.Util; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONException; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/DeviceAuthzResponse.java b/jans-auth-server/client/src/main/java/io/jans/as/client/DeviceAuthzResponse.java index b39b9e53b64..b8d8706b5b5 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/DeviceAuthzResponse.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/DeviceAuthzResponse.java @@ -8,7 +8,7 @@ import io.jans.as.model.authorize.DeviceAuthorizationResponseParam; import io.jans.as.model.authorize.DeviceAuthzErrorResponseType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONException; import org.json.JSONObject; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/EndSessionClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/EndSessionClient.java index 9691e4da205..cbc49021f25 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/EndSessionClient.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/EndSessionClient.java @@ -12,7 +12,7 @@ import io.jans.as.model.session.EndSessionResponseParam; import io.jans.as.model.util.QueryStringDecoder; import io.jans.as.model.util.Util; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONObject; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/EndSessionRequest.java b/jans-auth-server/client/src/main/java/io/jans/as/client/EndSessionRequest.java index 5d9d926f4d4..45faad1132e 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/EndSessionRequest.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/EndSessionRequest.java @@ -8,7 +8,7 @@ import io.jans.as.model.session.EndSessionRequestParam; import io.jans.as.model.util.Util; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/GluuConfigurationClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/GluuConfigurationClient.java index 7c7e04302ec..2d96796a17d 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/GluuConfigurationClient.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/GluuConfigurationClient.java @@ -6,7 +6,7 @@ package io.jans.as.client; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONArray; import org.json.JSONObject; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/JwkClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/JwkClient.java index 5a3341c2d10..20b3d5ec1bc 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/JwkClient.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/JwkClient.java @@ -10,7 +10,7 @@ import io.jans.as.model.crypto.signature.ECDSAPublicKey; import io.jans.as.model.crypto.signature.RSAPublicKey; import io.jans.as.model.jwk.JSONWebKeySet; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jboss.resteasy.client.jaxrs.ClientHttpEngine; import org.json.JSONObject; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConfigurationClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConfigurationClient.java index f15e415ae3d..cdcbe63cd6b 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConfigurationClient.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConfigurationClient.java @@ -7,7 +7,7 @@ package io.jans.as.client; import io.jans.as.model.util.Util; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONException; import org.json.JSONObject; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConfigurationResponse.java b/jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConfigurationResponse.java index 7af28a393c9..e8c9d4c9a39 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConfigurationResponse.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConfigurationResponse.java @@ -6,7 +6,7 @@ package io.jans.as.client; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConnectDiscoveryClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConnectDiscoveryClient.java index f456e06744f..1877ef75bb3 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConnectDiscoveryClient.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConnectDiscoveryClient.java @@ -7,7 +7,7 @@ package io.jans.as.client; import io.jans.as.model.discovery.WebFingerLink; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.jboss.resteasy.client.jaxrs.ClientHttpEngine; import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConnectDiscoveryRequest.java b/jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConnectDiscoveryRequest.java index 6cdae21106b..ccb947fc73d 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConnectDiscoveryRequest.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/OpenIdConnectDiscoveryRequest.java @@ -6,7 +6,7 @@ package io.jans.as.client; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.UnsupportedEncodingException; import java.net.URI; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/RegisterClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/RegisterClient.java index 55be4297f91..21f355331f3 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/RegisterClient.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/RegisterClient.java @@ -9,7 +9,7 @@ import io.jans.as.client.builder.RegistrationBuilder; import io.jans.as.client.util.ClientUtil; import io.jans.as.model.register.ApplicationType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.jboss.resteasy.client.jaxrs.ClientHttpEngine; import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/RegisterRequest.java b/jans-auth-server/client/src/main/java/io/jans/as/client/RegisterRequest.java index 48c8480e895..55a98e6ee5a 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/RegisterRequest.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/RegisterRequest.java @@ -22,7 +22,7 @@ import io.jans.as.model.register.RegisterRequestParam; import io.jans.orm.model.base.LocalizedString; import jakarta.ws.rs.core.MediaType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONArray; import org.json.JSONException; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/RegisterResponse.java b/jans-auth-server/client/src/main/java/io/jans/as/client/RegisterResponse.java index acabbf299ef..ed59c49e9b9 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/RegisterResponse.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/RegisterResponse.java @@ -12,7 +12,7 @@ import io.jans.as.model.register.RegisterErrorResponseType; import io.jans.as.model.register.RegisterResponseParam; import io.jans.as.model.util.Util; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONArray; import org.json.JSONObject; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/TokenClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/TokenClient.java index eccd13e1e68..30bdef3aa2a 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/TokenClient.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/TokenClient.java @@ -7,7 +7,7 @@ package io.jans.as.client; import io.jans.as.model.common.GrantType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import jakarta.ws.rs.HttpMethod; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/TokenRequest.java b/jans-auth-server/client/src/main/java/io/jans/as/client/TokenRequest.java index ed99459d2f4..b52d4dbbf72 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/TokenRequest.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/TokenRequest.java @@ -14,7 +14,7 @@ import io.jans.as.model.util.QueryBuilder; import jakarta.ws.rs.core.MediaType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.HashMap; import java.util.Map; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/TokenResponse.java b/jans-auth-server/client/src/main/java/io/jans/as/client/TokenResponse.java index 71a9e058fe7..0b50d55cfa7 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/TokenResponse.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/TokenResponse.java @@ -10,7 +10,7 @@ import io.jans.as.model.common.TokenType; import io.jans.as.model.token.TokenErrorResponseType; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONException; import org.json.JSONObject; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/TokenRevocationClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/TokenRevocationClient.java index 4111ff8a9fd..6c6dd96efa4 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/TokenRevocationClient.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/TokenRevocationClient.java @@ -8,7 +8,7 @@ import io.jans.as.model.common.TokenTypeHint; import io.jans.as.model.token.TokenRevocationRequestParam; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import jakarta.ws.rs.HttpMethod; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/TokenRevocationResponse.java b/jans-auth-server/client/src/main/java/io/jans/as/client/TokenRevocationResponse.java index 7701367c5c2..04c2e43b1fe 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/TokenRevocationResponse.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/TokenRevocationResponse.java @@ -8,7 +8,7 @@ import io.jans.as.model.config.Constants; import io.jans.as.model.token.TokenRevocationErrorResponseType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONException; import org.json.JSONObject; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/UserInfoClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/UserInfoClient.java index 23cf74740d2..bb4eae52245 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/UserInfoClient.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/UserInfoClient.java @@ -12,7 +12,7 @@ import io.jans.as.model.jwe.Jwe; import io.jans.as.model.jwt.Jwt; import io.jans.as.model.util.JwtUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONException; import org.json.JSONObject; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/UserInfoRequest.java b/jans-auth-server/client/src/main/java/io/jans/as/client/UserInfoRequest.java index 1704ff8132f..a71db4513cd 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/UserInfoRequest.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/UserInfoRequest.java @@ -7,7 +7,7 @@ package io.jans.as.client; import io.jans.as.model.common.AuthorizationMethod; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.HashMap; import java.util.Map; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/fcm/FirebaseCloudMessagingClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/fcm/FirebaseCloudMessagingClient.java index f427ace96a0..b1d87c50047 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/fcm/FirebaseCloudMessagingClient.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/fcm/FirebaseCloudMessagingClient.java @@ -7,7 +7,7 @@ package io.jans.as.client.ciba.fcm; import io.jans.as.client.BaseClient; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONObject; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/fcm/FirebaseCloudMessagingRequest.java b/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/fcm/FirebaseCloudMessagingRequest.java index 8bafe4405f2..0fe33d0d6b6 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/fcm/FirebaseCloudMessagingRequest.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/fcm/FirebaseCloudMessagingRequest.java @@ -7,7 +7,7 @@ package io.jans.as.client.ciba.fcm; import io.jans.as.client.BaseRequest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONException; import org.json.JSONObject; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/fcm/FirebaseCloudMessagingResponse.java b/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/fcm/FirebaseCloudMessagingResponse.java index 9c55a471ba0..19460da3479 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/fcm/FirebaseCloudMessagingResponse.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/fcm/FirebaseCloudMessagingResponse.java @@ -7,7 +7,7 @@ package io.jans.as.client.ciba.fcm; import io.jans.as.client.BaseResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONArray; import org.json.JSONException; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/ping/PingCallbackClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/ping/PingCallbackClient.java index 0c9c48224e2..cba5e4b84da 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/ping/PingCallbackClient.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/ping/PingCallbackClient.java @@ -8,7 +8,7 @@ import io.jans.as.client.BaseClient; import io.jans.as.client.util.ClientUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.jboss.resteasy.client.jaxrs.engines.ApacheHttpClient43Engine; import org.json.JSONObject; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/ping/PingCallbackRequest.java b/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/ping/PingCallbackRequest.java index 31021941ad3..e416285a82d 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/ping/PingCallbackRequest.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/ping/PingCallbackRequest.java @@ -7,7 +7,7 @@ package io.jans.as.client.ciba.ping; import io.jans.as.client.BaseRequest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.http.entity.ContentType; import org.json.JSONException; import org.json.JSONObject; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/push/PushErrorClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/push/PushErrorClient.java index a5552a02617..005127a84db 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/push/PushErrorClient.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/push/PushErrorClient.java @@ -7,7 +7,7 @@ package io.jans.as.client.ciba.push; import io.jans.as.client.BaseClient; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONObject; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/push/PushErrorRequest.java b/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/push/PushErrorRequest.java index 602f43a4187..f71866e3deb 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/push/PushErrorRequest.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/push/PushErrorRequest.java @@ -8,7 +8,7 @@ import io.jans.as.client.BaseRequest; import io.jans.as.model.ciba.PushErrorResponseType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.http.entity.ContentType; import org.json.JSONException; import org.json.JSONObject; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/push/PushTokenDeliveryClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/push/PushTokenDeliveryClient.java index e94d9b23286..29776e20821 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/push/PushTokenDeliveryClient.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/push/PushTokenDeliveryClient.java @@ -7,7 +7,7 @@ package io.jans.as.client.ciba.push; import io.jans.as.client.BaseClient; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONObject; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/push/PushTokenDeliveryRequest.java b/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/push/PushTokenDeliveryRequest.java index c1bb7e327a0..6a17aa80ee3 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/push/PushTokenDeliveryRequest.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/ciba/push/PushTokenDeliveryRequest.java @@ -8,7 +8,7 @@ import io.jans.as.client.BaseRequest; import io.jans.as.model.common.TokenType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.http.entity.ContentType; import org.json.JSONException; import org.json.JSONObject; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/model/JwtState.java b/jans-auth-server/client/src/main/java/io/jans/as/client/model/JwtState.java index 76ae19461e1..4af3727f6f7 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/model/JwtState.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/model/JwtState.java @@ -18,7 +18,7 @@ import io.jans.as.model.jwt.JwtHeader; import io.jans.as.model.jwt.JwtType; import io.jans.as.model.util.Base64Util; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONException; import org.json.JSONObject; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/model/authorize/JwtAuthorizationRequest.java b/jans-auth-server/client/src/main/java/io/jans/as/client/model/authorize/JwtAuthorizationRequest.java index a920f1d8668..3665e2acbec 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/model/authorize/JwtAuthorizationRequest.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/model/authorize/JwtAuthorizationRequest.java @@ -25,7 +25,7 @@ import io.jans.as.model.jwt.JwtClaims; import io.jans.as.model.jwt.JwtHeader; import io.jans.as.model.jwt.JwtType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONArray; import org.json.JSONException; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/create/SsaCreateClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/create/SsaCreateClient.java index 240238ef512..e58225483db 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/create/SsaCreateClient.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/create/SsaCreateClient.java @@ -11,7 +11,7 @@ import jakarta.ws.rs.HttpMethod; import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.client.Invocation.Builder; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONObject; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/create/SsaCreateResponse.java b/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/create/SsaCreateResponse.java index 9838def3ba5..8acba80e23a 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/create/SsaCreateResponse.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/create/SsaCreateResponse.java @@ -11,7 +11,7 @@ import io.jans.as.model.jwt.JwtClaims; import io.jans.as.model.ssa.SsaErrorResponseType; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONException; import org.json.JSONObject; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/get/SsaGetClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/get/SsaGetClient.java index b521e209bcd..b3270d5c9f3 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/get/SsaGetClient.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/get/SsaGetClient.java @@ -10,7 +10,7 @@ import io.jans.as.model.config.Constants; import jakarta.ws.rs.HttpMethod; import jakarta.ws.rs.client.Invocation.Builder; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; public class SsaGetClient extends BaseClient { diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/get/SsaGetResponse.java b/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/get/SsaGetResponse.java index c64c291991d..1438f15124d 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/get/SsaGetResponse.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/get/SsaGetResponse.java @@ -9,7 +9,7 @@ import io.jans.as.client.BaseResponseWithErrors; import io.jans.as.model.ssa.SsaErrorResponseType; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONArray; import org.json.JSONException; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/jwtssa/SsaGetJwtClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/jwtssa/SsaGetJwtClient.java index a08386a3118..865b13990eb 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/jwtssa/SsaGetJwtClient.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/jwtssa/SsaGetJwtClient.java @@ -10,7 +10,7 @@ import io.jans.as.model.config.Constants; import jakarta.ws.rs.HttpMethod; import jakarta.ws.rs.client.Invocation.Builder; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.jetbrains.annotations.NotNull; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/jwtssa/SsaGetJwtResponse.java b/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/jwtssa/SsaGetJwtResponse.java index 43bd5bec0f3..c9559c026a1 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/jwtssa/SsaGetJwtResponse.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/jwtssa/SsaGetJwtResponse.java @@ -9,7 +9,7 @@ import io.jans.as.client.BaseResponseWithErrors; import io.jans.as.model.ssa.SsaErrorResponseType; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONException; import org.json.JSONObject; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/revoke/SsaRevokeClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/revoke/SsaRevokeClient.java index 18e249f6fef..4a1d02970da 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/revoke/SsaRevokeClient.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/ssa/revoke/SsaRevokeClient.java @@ -10,7 +10,7 @@ import io.jans.as.model.config.Constants; import jakarta.ws.rs.HttpMethod; import jakarta.ws.rs.client.Invocation.Builder; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; public class SsaRevokeClient extends BaseClient { diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/util/ClientUtil.java b/jans-auth-server/client/src/main/java/io/jans/as/client/util/ClientUtil.java index 4ee3ccdf426..c744335f60e 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/util/ClientUtil.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/util/ClientUtil.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.http.client.config.CookieSpecs; import org.apache.http.client.config.RequestConfig; import org.apache.http.config.Registry; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/util/KeyExporter.java b/jans-auth-server/client/src/main/java/io/jans/as/client/util/KeyExporter.java index 44c12848cd6..5a1bbde68cf 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/util/KeyExporter.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/util/KeyExporter.java @@ -18,7 +18,7 @@ import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.WordUtils; +import org.apache.commons.text.WordUtils; import org.apache.log4j.Logger; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.status.StatusLogger; diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/util/TestPropFile.java b/jans-auth-server/client/src/main/java/io/jans/as/client/util/TestPropFile.java index dd611912728..6236d5f4605 100644 --- a/jans-auth-server/client/src/main/java/io/jans/as/client/util/TestPropFile.java +++ b/jans-auth-server/client/src/main/java/io/jans/as/client/util/TestPropFile.java @@ -1,7 +1,7 @@ package io.jans.as.client.util; import org.apache.commons.cli.CommandLine; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.FileOutputStream; import java.io.IOException; diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/BaseTest.java b/jans-auth-server/client/src/test/java/io/jans/as/client/BaseTest.java index 81f11dcd8d3..1f183955503 100644 --- a/jans-auth-server/client/src/test/java/io/jans/as/client/BaseTest.java +++ b/jans-auth-server/client/src/test/java/io/jans/as/client/BaseTest.java @@ -31,7 +31,7 @@ import io.jans.as.model.util.DateUtil; import io.jans.util.StringHelper; import io.jans.util.security.SecurityProviderUtility; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.http.client.CookieStore; import org.apache.http.client.HttpClient; import org.apache.http.client.config.CookieSpecs; diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/ciba/BackchannelAuthenticationExpiredRequestsTests.java b/jans-auth-server/client/src/test/java/io/jans/as/client/ciba/BackchannelAuthenticationExpiredRequestsTests.java index d7f70423084..0166f8e1e06 100644 --- a/jans-auth-server/client/src/test/java/io/jans/as/client/ciba/BackchannelAuthenticationExpiredRequestsTests.java +++ b/jans-auth-server/client/src/test/java/io/jans/as/client/ciba/BackchannelAuthenticationExpiredRequestsTests.java @@ -15,7 +15,7 @@ import io.jans.as.model.crypto.signature.AsymmetricSignatureAlgorithm; import io.jans.as.model.register.ApplicationType; import io.jans.as.model.token.TokenErrorResponseType; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.testng.annotations.Parameters; import org.testng.annotations.Test; diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/ciba/BackchannelAuthenticationPingMode.java b/jans-auth-server/client/src/test/java/io/jans/as/client/ciba/BackchannelAuthenticationPingMode.java index 3926d154f40..dd1a8d6e0c7 100644 --- a/jans-auth-server/client/src/test/java/io/jans/as/client/ciba/BackchannelAuthenticationPingMode.java +++ b/jans-auth-server/client/src/test/java/io/jans/as/client/ciba/BackchannelAuthenticationPingMode.java @@ -24,7 +24,7 @@ import io.jans.as.model.jwt.JwtClaimName; import io.jans.as.model.register.ApplicationType; import io.jans.as.model.util.StringUtils; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.json.JSONObject; import org.testng.annotations.Parameters; import org.testng.annotations.Test; diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/ciba/BackchannelAuthenticationPollMode.java b/jans-auth-server/client/src/test/java/io/jans/as/client/ciba/BackchannelAuthenticationPollMode.java index 0c7bbdb40fa..612572afbaf 100644 --- a/jans-auth-server/client/src/test/java/io/jans/as/client/ciba/BackchannelAuthenticationPollMode.java +++ b/jans-auth-server/client/src/test/java/io/jans/as/client/ciba/BackchannelAuthenticationPollMode.java @@ -24,7 +24,7 @@ import io.jans.as.model.jwt.JwtClaimName; import io.jans.as.model.register.ApplicationType; import io.jans.as.model.util.StringUtils; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.json.JSONObject; import org.testng.annotations.Parameters; import org.testng.annotations.Test; diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/ciba/BackchannelAuthenticationPushMode.java b/jans-auth-server/client/src/test/java/io/jans/as/client/ciba/BackchannelAuthenticationPushMode.java index 71c0cdbe72f..2d032f20a01 100644 --- a/jans-auth-server/client/src/test/java/io/jans/as/client/ciba/BackchannelAuthenticationPushMode.java +++ b/jans-auth-server/client/src/test/java/io/jans/as/client/ciba/BackchannelAuthenticationPushMode.java @@ -23,7 +23,7 @@ import io.jans.as.model.jwt.Jwt; import io.jans.as.model.register.ApplicationType; import io.jans.as.model.util.StringUtils; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.json.JSONObject; import org.testng.annotations.Parameters; import org.testng.annotations.Test; diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/ciba/CibaPingModeJwtAuthRequestTests.java b/jans-auth-server/client/src/test/java/io/jans/as/client/ciba/CibaPingModeJwtAuthRequestTests.java index b94020453e8..1504efc95a4 100644 --- a/jans-auth-server/client/src/test/java/io/jans/as/client/ciba/CibaPingModeJwtAuthRequestTests.java +++ b/jans-auth-server/client/src/test/java/io/jans/as/client/ciba/CibaPingModeJwtAuthRequestTests.java @@ -19,7 +19,7 @@ import io.jans.as.model.crypto.signature.SignatureAlgorithm; import io.jans.as.model.register.ApplicationType; import io.jans.as.model.util.StringUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.testng.annotations.Parameters; import org.testng.annotations.Test; diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/ciba/CibaPollModeJwtAuthRequestTests.java b/jans-auth-server/client/src/test/java/io/jans/as/client/ciba/CibaPollModeJwtAuthRequestTests.java index 7762e5e59d1..5d9ec7f0f6b 100644 --- a/jans-auth-server/client/src/test/java/io/jans/as/client/ciba/CibaPollModeJwtAuthRequestTests.java +++ b/jans-auth-server/client/src/test/java/io/jans/as/client/ciba/CibaPollModeJwtAuthRequestTests.java @@ -19,7 +19,7 @@ import io.jans.as.model.crypto.signature.SignatureAlgorithm; import io.jans.as.model.register.ApplicationType; import io.jans.as.model.util.StringUtils; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.testng.annotations.Parameters; import org.testng.annotations.Test; diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/client/Asserter.java b/jans-auth-server/client/src/test/java/io/jans/as/client/client/Asserter.java index e0664e83c13..89b673e3210 100644 --- a/jans-auth-server/client/src/test/java/io/jans/as/client/client/Asserter.java +++ b/jans-auth-server/client/src/test/java/io/jans/as/client/client/Asserter.java @@ -9,7 +9,7 @@ import io.jans.as.client.OpenIdConfigurationResponse; import io.jans.as.client.RegisterResponse; import io.jans.as.model.register.RegisterRequestParam; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.Arrays; diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/client/JSONObjectAsserter.java b/jans-auth-server/client/src/test/java/io/jans/as/client/client/JSONObjectAsserter.java index 4e98aa64608..83e8c2c23cc 100644 --- a/jans-auth-server/client/src/test/java/io/jans/as/client/client/JSONObjectAsserter.java +++ b/jans-auth-server/client/src/test/java/io/jans/as/client/client/JSONObjectAsserter.java @@ -7,7 +7,7 @@ package io.jans.as.client.client; import com.google.common.base.Preconditions; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.json.JSONObject; import static org.testng.Assert.assertTrue; diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/dev/HostnameVerifierType.java b/jans-auth-server/client/src/test/java/io/jans/as/client/dev/HostnameVerifierType.java index 5f9484d1ea0..1fd47b480af 100644 --- a/jans-auth-server/client/src/test/java/io/jans/as/client/dev/HostnameVerifierType.java +++ b/jans-auth-server/client/src/test/java/io/jans/as/client/dev/HostnameVerifierType.java @@ -6,7 +6,7 @@ package io.jans.as.client.dev; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * @author Yuriy Zabrovarnyy diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/interop/PublishOpenIdConfigurationDiscoveryInformation.java b/jans-auth-server/client/src/test/java/io/jans/as/client/interop/PublishOpenIdConfigurationDiscoveryInformation.java index e729174b1a7..2f1bcd19db3 100644 --- a/jans-auth-server/client/src/test/java/io/jans/as/client/interop/PublishOpenIdConfigurationDiscoveryInformation.java +++ b/jans-auth-server/client/src/test/java/io/jans/as/client/interop/PublishOpenIdConfigurationDiscoveryInformation.java @@ -7,7 +7,7 @@ package io.jans.as.client.interop; import io.jans.as.client.BaseTest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.testng.annotations.Test; import static org.testng.Assert.assertTrue; diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/interop/SupportWebFingerDiscovery.java b/jans-auth-server/client/src/test/java/io/jans/as/client/interop/SupportWebFingerDiscovery.java index 7c43de9d17c..48a68210416 100644 --- a/jans-auth-server/client/src/test/java/io/jans/as/client/interop/SupportWebFingerDiscovery.java +++ b/jans-auth-server/client/src/test/java/io/jans/as/client/interop/SupportWebFingerDiscovery.java @@ -7,7 +7,7 @@ package io.jans.as.client.interop; import io.jans.as.client.BaseTest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.testng.annotations.Test; import static org.testng.Assert.assertTrue; diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/interop/UserInfoEndpoint.java b/jans-auth-server/client/src/test/java/io/jans/as/client/interop/UserInfoEndpoint.java index 933eb2dcdcc..03706c8e970 100644 --- a/jans-auth-server/client/src/test/java/io/jans/as/client/interop/UserInfoEndpoint.java +++ b/jans-auth-server/client/src/test/java/io/jans/as/client/interop/UserInfoEndpoint.java @@ -7,7 +7,7 @@ package io.jans.as.client.interop; import io.jans.as.client.BaseTest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.testng.annotations.Test; import static org.testng.Assert.assertTrue; diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/interop/UsesDiscovery.java b/jans-auth-server/client/src/test/java/io/jans/as/client/interop/UsesDiscovery.java index 6dfca1f4d34..733f1387e52 100644 --- a/jans-auth-server/client/src/test/java/io/jans/as/client/interop/UsesDiscovery.java +++ b/jans-auth-server/client/src/test/java/io/jans/as/client/interop/UsesDiscovery.java @@ -7,7 +7,7 @@ package io.jans.as.client.interop; import io.jans.as.client.BaseTest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.testng.annotations.Test; import static org.testng.Assert.assertTrue; diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/page/LoginPage.java b/jans-auth-server/client/src/test/java/io/jans/as/client/page/LoginPage.java index 712998bf29e..9440a59aac6 100644 --- a/jans-auth-server/client/src/test/java/io/jans/as/client/page/LoginPage.java +++ b/jans-auth-server/client/src/test/java/io/jans/as/client/page/LoginPage.java @@ -6,7 +6,7 @@ package io.jans.as.client.page; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openqa.selenium.WebElement; /** diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/page/PageConfig.java b/jans-auth-server/client/src/test/java/io/jans/as/client/page/PageConfig.java index c596e23be83..740d63f0ba9 100644 --- a/jans-auth-server/client/src/test/java/io/jans/as/client/page/PageConfig.java +++ b/jans-auth-server/client/src/test/java/io/jans/as/client/page/PageConfig.java @@ -7,7 +7,7 @@ package io.jans.as.client.page; import com.google.common.base.Preconditions; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openqa.selenium.WebDriver; import java.util.HashMap; diff --git a/jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/uma/AccessProtectedResourceFlowHttpTest.java b/jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/uma/AccessProtectedResourceFlowHttpTest.java index 2480e09b5f0..54e1c4d2f60 100644 --- a/jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/uma/AccessProtectedResourceFlowHttpTest.java +++ b/jans-auth-server/client/src/test/java/io/jans/as/client/ws/rs/uma/AccessProtectedResourceFlowHttpTest.java @@ -18,7 +18,7 @@ import io.jans.as.model.uma.wrapper.Token; import io.jans.as.model.util.Util; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.openqa.selenium.By; import org.testng.annotations.BeforeClass; import org.testng.annotations.Parameters; diff --git a/jans-auth-server/common/pom.xml b/jans-auth-server/common/pom.xml index c12e29f6131..e6445e1c69a 100644 --- a/jans-auth-server/common/pom.xml +++ b/jans-auth-server/common/pom.xml @@ -125,8 +125,8 @@ commons-collections - commons-lang - commons-lang + org.apache.commons + commons-lang3 commons-io diff --git a/jans-auth-server/common/src/main/java/io/jans/as/common/model/registration/Client.java b/jans-auth-server/common/src/main/java/io/jans/as/common/model/registration/Client.java index 165cbd6c49d..1658cd2d40e 100644 --- a/jans-auth-server/common/src/main/java/io/jans/as/common/model/registration/Client.java +++ b/jans-auth-server/common/src/main/java/io/jans/as/common/model/registration/Client.java @@ -18,7 +18,7 @@ import io.jans.orm.model.base.CustomObjectAttribute; import io.jans.orm.model.base.DeletableEntity; import io.jans.orm.model.base.LocalizedString; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.Serializable; import java.util.*; diff --git a/jans-auth-server/common/src/main/java/io/jans/as/common/model/session/SessionId.java b/jans-auth-server/common/src/main/java/io/jans/as/common/model/session/SessionId.java index db55781a5d6..27665bc8192 100644 --- a/jans-auth-server/common/src/main/java/io/jans/as/common/model/session/SessionId.java +++ b/jans-auth-server/common/src/main/java/io/jans/as/common/model/session/SessionId.java @@ -13,7 +13,7 @@ import io.jans.orm.model.base.Deletable; import jakarta.inject.Named; import jakarta.persistence.Transient; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import java.io.Serializable; @@ -21,7 +21,7 @@ import static io.jans.as.model.util.StringUtils.implode; import static io.jans.as.model.util.StringUtils.spaceSeparatedToList; -import static org.apache.commons.lang.BooleanUtils.isTrue; +import static org.apache.commons.lang3.BooleanUtils.isTrue; /** * @author Yuriy Zabrovarnyy diff --git a/jans-auth-server/common/src/main/java/io/jans/as/common/service/common/ApplicationFactory.java b/jans-auth-server/common/src/main/java/io/jans/as/common/service/common/ApplicationFactory.java index 36720ddd347..a70bd26e094 100644 --- a/jans-auth-server/common/src/main/java/io/jans/as/common/service/common/ApplicationFactory.java +++ b/jans-auth-server/common/src/main/java/io/jans/as/common/service/common/ApplicationFactory.java @@ -20,7 +20,7 @@ import io.jans.service.message.model.config.MessageProviderType; import io.jans.service.message.model.config.NullMessageConfiguration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import jakarta.enterprise.context.ApplicationScoped; diff --git a/jans-auth-server/common/src/main/java/io/jans/as/common/util/RedirectUri.java b/jans-auth-server/common/src/main/java/io/jans/as/common/util/RedirectUri.java index 42f6bcd8503..dc71615251a 100644 --- a/jans-auth-server/common/src/main/java/io/jans/as/common/util/RedirectUri.java +++ b/jans-auth-server/common/src/main/java/io/jans/as/common/util/RedirectUri.java @@ -20,8 +20,8 @@ import io.jans.as.model.jwt.Jwt; import io.jans.as.model.jwt.JwtType; import io.jans.as.model.util.Util; -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.text.StringEscapeUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.json.JSONObject; @@ -404,8 +404,8 @@ public String toString() { sb.append(""); sb.append("
"); for (Map.Entry entry : responseParameters.entrySet()) { - String entryKey = StringEscapeUtils.escapeHtml(entry.getKey()); - String entryValue = StringEscapeUtils.escapeHtml(entry.getValue()); + String entryKey = StringEscapeUtils.escapeHtml4(entry.getKey()); + String entryValue = StringEscapeUtils.escapeHtml4(entry.getValue()); sb.append(""); } sb.append(""); diff --git a/jans-auth-server/model/pom.xml b/jans-auth-server/model/pom.xml index 7290fb8b19d..8a740c09428 100644 --- a/jans-auth-server/model/pom.xml +++ b/jans-auth-server/model/pom.xml @@ -103,8 +103,8 @@ commons-codec
- commons-lang - commons-lang + org.apache.commons + commons-lang3 commons-io diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/authorize/CodeVerifier.java b/jans-auth-server/model/src/main/java/io/jans/as/model/authorize/CodeVerifier.java index 3c1e78adad1..385e05f420d 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/authorize/CodeVerifier.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/authorize/CodeVerifier.java @@ -11,7 +11,7 @@ import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.BaseNCodec; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; /** * @author Yuriy Zabrovarnyy diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/common/IdType.java b/jans-auth-server/model/src/main/java/io/jans/as/model/common/IdType.java index 8321c758da4..531e8c7c381 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/common/IdType.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/common/IdType.java @@ -6,7 +6,7 @@ package io.jans.as.model.common; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * @author Yuriy Zabrovarnyy diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/common/SoftwareStatementValidationType.java b/jans-auth-server/model/src/main/java/io/jans/as/model/common/SoftwareStatementValidationType.java index 56b296e02e5..2b15a6a1a43 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/common/SoftwareStatementValidationType.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/common/SoftwareStatementValidationType.java @@ -7,7 +7,7 @@ package io.jans.as.model.common; import com.fasterxml.jackson.annotation.JsonCreator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * @author Yuriy Zabrovarnyy diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/configuration/AuthorizationRequestCustomParameter.java b/jans-auth-server/model/src/main/java/io/jans/as/model/configuration/AuthorizationRequestCustomParameter.java index 3c3eb11b460..0c5018da7ba 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/configuration/AuthorizationRequestCustomParameter.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/configuration/AuthorizationRequestCustomParameter.java @@ -7,7 +7,7 @@ package io.jans.as.model.configuration; import io.jans.util.exception.ConfigurationException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * @author Javier Rojas Blum diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/configuration/CorsConfigurationFilter.java b/jans-auth-server/model/src/main/java/io/jans/as/model/configuration/CorsConfigurationFilter.java index cbc6564726a..7aaf7669fb8 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/configuration/CorsConfigurationFilter.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/configuration/CorsConfigurationFilter.java @@ -6,7 +6,7 @@ package io.jans.as.model.configuration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * @author Javier Rojas Blum diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/crypto/AuthCryptoProvider.java b/jans-auth-server/model/src/main/java/io/jans/as/model/crypto/AuthCryptoProvider.java index 907e4e247fc..e79b786e7da 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/crypto/AuthCryptoProvider.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/crypto/AuthCryptoProvider.java @@ -22,7 +22,7 @@ import org.apache.commons.codec.binary.Base64; import org.apache.commons.io.FilenameUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.bouncycastle.asn1.ASN1EncodableVector; import org.bouncycastle.asn1.ASN1ObjectIdentifier; diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/crypto/CryptoProviderFactory.java b/jans-auth-server/model/src/main/java/io/jans/as/model/crypto/CryptoProviderFactory.java index 72e27bb23c2..82f82c3619d 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/crypto/CryptoProviderFactory.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/crypto/CryptoProviderFactory.java @@ -8,7 +8,7 @@ import io.jans.as.model.common.WebKeyStorage; import io.jans.as.model.configuration.AppConfiguration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.security.KeyStoreException; diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/crypto/binding/TokenBindingMessage.java b/jans-auth-server/model/src/main/java/io/jans/as/model/crypto/binding/TokenBindingMessage.java index 32e9af48eaf..2610a91bb34 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/crypto/binding/TokenBindingMessage.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/crypto/binding/TokenBindingMessage.java @@ -8,7 +8,7 @@ import com.google.common.base.Function; import io.jans.as.model.token.JsonWebResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONException; import org.json.JSONObject; diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/crypto/signature/ECDSAKeyFactory.java b/jans-auth-server/model/src/main/java/io/jans/as/model/crypto/signature/ECDSAKeyFactory.java index 73cf777a33b..99f8a45f103 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/crypto/signature/ECDSAKeyFactory.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/crypto/signature/ECDSAKeyFactory.java @@ -10,7 +10,7 @@ import io.jans.as.model.crypto.KeyFactory; import io.jans.util.security.SecurityProviderUtility; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.cert.X509CertificateHolder; diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/crypto/signature/EDDSAKeyFactory.java b/jans-auth-server/model/src/main/java/io/jans/as/model/crypto/signature/EDDSAKeyFactory.java index 17d841b0dbe..8283ea9d19d 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/crypto/signature/EDDSAKeyFactory.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/crypto/signature/EDDSAKeyFactory.java @@ -9,7 +9,7 @@ import io.jans.as.model.crypto.KeyFactory; import io.jans.util.security.SecurityProviderUtility; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bouncycastle.asn1.pkcs.PrivateKeyInfo; import org.bouncycastle.asn1.x500.X500Name; diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/crypto/signature/RSAKeyFactory.java b/jans-auth-server/model/src/main/java/io/jans/as/model/crypto/signature/RSAKeyFactory.java index 488465a6e27..7976c693e3e 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/crypto/signature/RSAKeyFactory.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/crypto/signature/RSAKeyFactory.java @@ -6,7 +6,7 @@ package io.jans.as.model.crypto.signature; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bouncycastle.cert.CertIOException; import org.bouncycastle.operator.OperatorCreationException; diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/error/ErrorResponse.java b/jans-auth-server/model/src/main/java/io/jans/as/model/error/ErrorResponse.java index e0309f6d15b..5073c2a2967 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/error/ErrorResponse.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/error/ErrorResponse.java @@ -7,7 +7,7 @@ package io.jans.as.model.error; import io.jans.as.model.config.Constants; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONException; import org.json.JSONObject; diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/error/ErrorResponseFactory.java b/jans-auth-server/model/src/main/java/io/jans/as/model/error/ErrorResponseFactory.java index 359be28ea46..0e22f775c13 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/error/ErrorResponseFactory.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/error/ErrorResponseFactory.java @@ -29,7 +29,7 @@ import jakarta.ws.rs.core.CacheControl; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.BooleanUtils; +import org.apache.commons.lang3.BooleanUtils; import org.apache.logging.log4j.ThreadContext; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/jws/AbstractJwsSigner.java b/jans-auth-server/model/src/main/java/io/jans/as/model/jws/AbstractJwsSigner.java index 1d87bc77438..c7443b33de4 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/jws/AbstractJwsSigner.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/jws/AbstractJwsSigner.java @@ -11,7 +11,7 @@ import io.jans.as.model.jwt.Jwt; import io.jans.as.model.jwt.JwtClaimName; import io.jans.as.model.util.HashUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import java.security.SignatureException; diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/jwt/DPoP.java b/jans-auth-server/model/src/main/java/io/jans/as/model/jwt/DPoP.java index cb8fe7781b1..16b92f3212b 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/jwt/DPoP.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/jwt/DPoP.java @@ -15,7 +15,7 @@ import io.jans.as.model.util.Base64Util; import io.jans.as.model.util.JwtUtil; import io.jans.as.model.util.Util; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/jwt/Jwt.java b/jans-auth-server/model/src/main/java/io/jans/as/model/jwt/Jwt.java index 4e198020b9d..5dc9fffe30b 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/jwt/Jwt.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/jwt/Jwt.java @@ -8,7 +8,7 @@ import io.jans.as.model.exception.InvalidJwtException; import io.jans.as.model.token.JsonWebResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/jwt/JwtClaims.java b/jans-auth-server/model/src/main/java/io/jans/as/model/jwt/JwtClaims.java index f18c6d14167..ea360c45088 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/jwt/JwtClaims.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/jwt/JwtClaims.java @@ -8,7 +8,7 @@ import com.google.common.collect.Lists; import io.jans.as.model.exception.InvalidJwtException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; import java.net.URI; diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/jwt/PureJwt.java b/jans-auth-server/model/src/main/java/io/jans/as/model/jwt/PureJwt.java index cf0f73b5378..5bea0fa9936 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/jwt/PureJwt.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/jwt/PureJwt.java @@ -7,7 +7,7 @@ package io.jans.as.model.jwt; import io.jans.as.model.util.Base64Util; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.nio.charset.StandardCharsets; diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/register/RegisterRequestParam.java b/jans-auth-server/model/src/main/java/io/jans/as/model/register/RegisterRequestParam.java index fc8f9c19aac..8f9a34bbd7a 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/register/RegisterRequestParam.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/register/RegisterRequestParam.java @@ -6,7 +6,7 @@ package io.jans.as.model.register; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * Listed all standard parameters involved in client registration request. diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/uma/JsonLogic.java b/jans-auth-server/model/src/main/java/io/jans/as/model/uma/JsonLogic.java index ea4e689062a..d40d6e9d422 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/uma/JsonLogic.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/uma/JsonLogic.java @@ -8,7 +8,7 @@ import com.google.common.base.Preconditions; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import javax.script.Invocable; diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/uma/UmaResource.java b/jans-auth-server/model/src/main/java/io/jans/as/model/uma/UmaResource.java index c1ae1050fd4..db2e0afa933 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/uma/UmaResource.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/uma/UmaResource.java @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import io.jans.as.model.exception.InvalidParameterException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jboss.resteasy.annotations.providers.jaxb.IgnoreMediaTypes; import jakarta.xml.bind.annotation.XmlElement; diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/util/CertUtils.java b/jans-auth-server/model/src/main/java/io/jans/as/model/util/CertUtils.java index 242446548c9..6ee8e247597 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/util/CertUtils.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/util/CertUtils.java @@ -8,7 +8,7 @@ import io.jans.as.model.crypto.signature.SignatureAlgorithm; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bouncycastle.asn1.ASN1ObjectIdentifier; import org.bouncycastle.asn1.x500.RDN; import org.bouncycastle.asn1.x500.X500Name; @@ -129,7 +129,7 @@ private static X509Certificate x509CertificateFromPemInternal(String pem) { } public static String confirmationMethodHashS256(String certificateAsPem) { - if (org.apache.commons.lang.StringUtils.isBlank(certificateAsPem)) { + if (org.apache.commons.lang3.StringUtils.isBlank(certificateAsPem)) { return ""; } try { @@ -145,8 +145,8 @@ public static String confirmationMethodHashS256(String certificateAsPem) { } private static String confirmationMethodHashS256Internal(String certificateAsPem) { - certificateAsPem = org.apache.commons.lang.StringUtils.remove(certificateAsPem, "-----BEGIN CERTIFICATE-----"); - certificateAsPem = org.apache.commons.lang.StringUtils.remove(certificateAsPem, "-----END CERTIFICATE-----"); + certificateAsPem = org.apache.commons.lang3.StringUtils.remove(certificateAsPem, "-----BEGIN CERTIFICATE-----"); + certificateAsPem = org.apache.commons.lang3.StringUtils.remove(certificateAsPem, "-----END CERTIFICATE-----"); certificateAsPem = StringUtils.replace(certificateAsPem, "\n", ""); return Base64Util.base64urlencode(DigestUtils.sha256(Base64.decode(certificateAsPem))); } diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/util/QueryBuilder.java b/jans-auth-server/model/src/main/java/io/jans/as/model/util/QueryBuilder.java index 375aaf9ea7b..b036606caa2 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/util/QueryBuilder.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/util/QueryBuilder.java @@ -6,7 +6,7 @@ package io.jans.as.model.util; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import java.io.UnsupportedEncodingException; diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/util/QueryStringDecoder.java b/jans-auth-server/model/src/main/java/io/jans/as/model/util/QueryStringDecoder.java index a9ad3649ed3..fdd30847bee 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/util/QueryStringDecoder.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/util/QueryStringDecoder.java @@ -6,7 +6,7 @@ package io.jans.as.model.util; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import java.io.UnsupportedEncodingException; diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/util/StringUtils.java b/jans-auth-server/model/src/main/java/io/jans/as/model/util/StringUtils.java index ef3a6b2008e..2431d903749 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/util/StringUtils.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/util/StringUtils.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.StringJoiner; -import static org.apache.commons.lang.StringUtils.isNotBlank; +import static org.apache.commons.lang3.StringUtils.isNotBlank; /** * @author Javier Rojas Blum @@ -50,11 +50,11 @@ public static String nullToEmpty(String str) { * @param str1 first String param * @param str2 second String param * @return true if both are null, true if both are equals, false in other cases - * @deprecated it is possible to use directly: org.apache.commons.lang.StringUtils.equals(str1, str2); + * @deprecated it is possible to use directly: org.apache.commons.lang3.StringUtils.equals(str1, str2); */ @Deprecated public static boolean equals(String str1, String str2) { - return org.apache.commons.lang.StringUtils.equals(str1, str2); + return org.apache.commons.lang3.StringUtils.equals(str1, str2); } public static boolean equalsIgnoringSpaces(String a, String b) { diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/util/Util.java b/jans-auth-server/model/src/main/java/io/jans/as/model/util/Util.java index e8de0e3fbb4..849280e986b 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/util/Util.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/util/Util.java @@ -15,7 +15,7 @@ import io.jans.orm.annotation.AttributeEnum; import io.jans.orm.model.base.LocalizedString; import io.jans.util.OxConstants; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -128,7 +128,7 @@ public static List asEnumList(JSONArray array, Clas } public static void addToListIfHas(List list, JSONObject jsonObj, String key) throws JSONException { - if (jsonObj != null && org.apache.commons.lang.StringUtils.isNotBlank(key) && jsonObj.has(key)) { + if (jsonObj != null && org.apache.commons.lang3.StringUtils.isNotBlank(key) && jsonObj.has(key)) { JSONArray array = jsonObj.getJSONArray(key); if (list != null && array != null) { list.addAll(asList(array)); @@ -207,7 +207,7 @@ public static String mapAsString(Map map) throws JSONException { public static boolean allNotBlank(String... strings) { if (strings != null && strings.length > 0) { for (String s : strings) { - if (org.apache.commons.lang.StringUtils.isBlank(s)) { + if (org.apache.commons.lang3.StringUtils.isBlank(s)) { return false; } } diff --git a/jans-auth-server/persistence-model/src/main/java/io/jans/as/persistence/model/GluuOrganization.java b/jans-auth-server/persistence-model/src/main/java/io/jans/as/persistence/model/GluuOrganization.java index 0f617a505b0..398d95b3044 100644 --- a/jans-auth-server/persistence-model/src/main/java/io/jans/as/persistence/model/GluuOrganization.java +++ b/jans-auth-server/persistence-model/src/main/java/io/jans/as/persistence/model/GluuOrganization.java @@ -15,7 +15,7 @@ import io.jans.orm.model.base.Entry; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.io.Serializable; diff --git a/jans-auth-server/server/pom.xml b/jans-auth-server/server/pom.xml index 4b1b00f5e78..6f212286a4d 100644 --- a/jans-auth-server/server/pom.xml +++ b/jans-auth-server/server/pom.xml @@ -430,16 +430,16 @@ commons-collections - commons-configuration - commons-configuration + org.apache.commons + commons-configuration2 commons-io commons-io - commons-lang - commons-lang + org.apache.commons + commons-lang3 commons-net diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/audit/ApplicationAuditLogger.java b/jans-auth-server/server/src/main/java/io/jans/as/server/audit/ApplicationAuditLogger.java index 262df77de12..c7eda3802f8 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/audit/ApplicationAuditLogger.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/audit/ApplicationAuditLogger.java @@ -16,7 +16,7 @@ import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.pool.PooledConnectionFactory; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.BooleanUtils; +import org.apache.commons.lang3.BooleanUtils; import org.slf4j.Logger; import jakarta.annotation.PostConstruct; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/audit/debug/ServletLoggingFilter.java b/jans-auth-server/server/src/main/java/io/jans/as/server/audit/debug/ServletLoggingFilter.java index 4da9b891ebf..4847e7fe243 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/audit/debug/ServletLoggingFilter.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/audit/debug/ServletLoggingFilter.java @@ -22,7 +22,7 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponseWrapper; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.BooleanUtils; +import org.apache.commons.lang3.BooleanUtils; import org.slf4j.Logger; import java.io.IOException; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/audit/debug/wrapper/RequestWrapper.java b/jans-auth-server/server/src/main/java/io/jans/as/server/audit/debug/wrapper/RequestWrapper.java index a3429ebb3d6..32702e1c8d6 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/audit/debug/wrapper/RequestWrapper.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/audit/debug/wrapper/RequestWrapper.java @@ -7,8 +7,8 @@ package io.jans.as.server.audit.debug.wrapper; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import jakarta.servlet.ReadListener; import jakarta.servlet.ServletInputStream; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/auth/AuthenticationFilter.java b/jans-auth-server/server/src/main/java/io/jans/as/server/auth/AuthenticationFilter.java index cb2393817ec..a1c9c380800 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/auth/AuthenticationFilter.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/auth/AuthenticationFilter.java @@ -49,7 +49,7 @@ import jakarta.ws.rs.HttpMethod; import jakarta.ws.rs.WebApplicationException; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpHeaders; import org.apache.http.HttpStatus; import org.apache.http.entity.ContentType; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/auth/Authenticator.java b/jans-auth-server/server/src/main/java/io/jans/as/server/auth/Authenticator.java index 5ab3b9c2f79..bb99ae6cbed 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/auth/Authenticator.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/auth/Authenticator.java @@ -26,7 +26,7 @@ import io.jans.model.security.Credentials; import io.jans.util.OxConstants; import io.jans.util.StringHelper; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/auth/CreateUserAction.java b/jans-auth-server/server/src/main/java/io/jans/as/server/auth/CreateUserAction.java index 5b35ac5d36f..268aa6ad4b0 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/auth/CreateUserAction.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/auth/CreateUserAction.java @@ -15,8 +15,8 @@ import jakarta.inject.Inject; import jakarta.inject.Named; import jakarta.servlet.http.HttpServletRequest; -import org.apache.commons.lang.BooleanUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import java.io.UnsupportedEncodingException; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/auth/DpopService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/auth/DpopService.java index fb691079c9d..fa3ef0043f7 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/auth/DpopService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/auth/DpopService.java @@ -27,8 +27,8 @@ import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.BooleanUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import java.security.NoSuchAlgorithmException; @@ -36,8 +36,8 @@ import java.util.Date; import java.util.UUID; -import static org.apache.commons.lang.BooleanUtils.isFalse; -import static org.apache.commons.lang.BooleanUtils.isTrue; +import static org.apache.commons.lang3.BooleanUtils.isFalse; +import static org.apache.commons.lang3.BooleanUtils.isTrue; /** * @author Yuriy Z diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/auth/MTLSService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/auth/MTLSService.java index a17a62e7431..4bc8fe88e5a 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/auth/MTLSService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/auth/MTLSService.java @@ -25,8 +25,8 @@ import io.jans.as.server.service.external.ExternalDynamicClientRegistrationService; import io.jans.as.server.service.external.context.DynamicClientRegistrationContext; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; import org.slf4j.Logger; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/auth/SelectAccountAction.java b/jans-auth-server/server/src/main/java/io/jans/as/server/auth/SelectAccountAction.java index 0a3baf62ad8..f8d6ca05a31 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/auth/SelectAccountAction.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/auth/SelectAccountAction.java @@ -27,7 +27,7 @@ import jakarta.inject.Named; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import java.io.UnsupportedEncodingException; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizationChallengeService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizationChallengeService.java index 5716d1be85b..841dc95b987 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizationChallengeService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizationChallengeService.java @@ -28,7 +28,7 @@ import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import java.io.IOException; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizationChallengeSessionService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizationChallengeSessionService.java index 96163f127bb..bc99f18ad8a 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizationChallengeSessionService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizationChallengeSessionService.java @@ -7,7 +7,7 @@ import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import jakarta.inject.Named; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import java.util.*; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizationChallengeValidator.java b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizationChallengeValidator.java index 7542f144573..2830bc80311 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizationChallengeValidator.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizationChallengeValidator.java @@ -11,7 +11,7 @@ import jakarta.inject.Inject; import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.slf4j.Logger; import javax.inject.Named; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeAction.java b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeAction.java index bb069042c27..a5a96ce2de4 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeAction.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeAction.java @@ -61,8 +61,8 @@ import jakarta.ws.rs.client.ClientBuilder; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.BooleanUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.StringEscapeUtils; import org.apache.logging.log4j.util.Strings; import org.slf4j.Logger; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeRestWebServiceImpl.java b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeRestWebServiceImpl.java index bffbfaa36e9..f5c218e5d40 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeRestWebServiceImpl.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeRestWebServiceImpl.java @@ -64,7 +64,7 @@ import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.ResponseBuilder; import jakarta.ws.rs.core.SecurityContext; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.BooleanUtils; import org.jboss.resteasy.spi.NoLogWebApplicationException; import org.jetbrains.annotations.NotNull; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeRestWebServiceValidator.java b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeRestWebServiceValidator.java index 3c702ab88ca..5ff31fae6a5 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeRestWebServiceValidator.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthorizeRestWebServiceValidator.java @@ -34,8 +34,8 @@ import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.BooleanUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; @@ -45,7 +45,7 @@ import static io.jans.as.model.ciba.BackchannelAuthenticationErrorResponseType.INVALID_REQUEST; import static io.jans.as.model.crypto.signature.SignatureAlgorithm.NONE; import static io.jans.as.model.crypto.signature.SignatureAlgorithm.RS256; -import static org.apache.commons.lang.BooleanUtils.isTrue; +import static org.apache.commons.lang3.BooleanUtils.isTrue; /** * @author Yuriy Zabrovarnyy diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthzDetailsService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthzDetailsService.java index 4a498aa01f1..854a622541e 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthzDetailsService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthzDetailsService.java @@ -15,7 +15,7 @@ import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import java.util.ArrayList; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthzRequestService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthzRequestService.java index f74f8e601f6..a1f3ae6955f 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthzRequestService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/AuthzRequestService.java @@ -55,9 +55,9 @@ import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.BooleanUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.Nullable; import org.json.JSONObject; import org.slf4j.Logger; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/ConsentGatheringSessionService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/ConsentGatheringSessionService.java index a4a300040dd..e21fa3b66e6 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/ConsentGatheringSessionService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/ConsentGatheringSessionService.java @@ -14,7 +14,7 @@ import io.jans.as.server.service.CookieService; import io.jans.as.server.service.SessionIdService; import io.jans.orm.exception.EntryPersistenceException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import jakarta.ejb.Stateless; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/DeviceAuthorizationAction.java b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/DeviceAuthorizationAction.java index 9b47c484faf..045458f8549 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/DeviceAuthorizationAction.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/authorize/ws/rs/DeviceAuthorizationAction.java @@ -24,7 +24,7 @@ import jakarta.faces.context.FacesContext; import jakarta.inject.Inject; import jakarta.inject.Named; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import java.io.IOException; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/authzen/ws/rs/AccessEvaluationValidator.java b/jans-auth-server/server/src/main/java/io/jans/as/server/authzen/ws/rs/AccessEvaluationValidator.java index 13804fa9a20..b62e586e8de 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/authzen/ws/rs/AccessEvaluationValidator.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/authzen/ws/rs/AccessEvaluationValidator.java @@ -9,7 +9,7 @@ import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; /** diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/bcauthorize/ws/rs/BackchannelAuthorizeRestWebServiceImpl.java b/jans-auth-server/server/src/main/java/io/jans/as/server/bcauthorize/ws/rs/BackchannelAuthorizeRestWebServiceImpl.java index 70732e48cd2..1ac7b5f9980 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/bcauthorize/ws/rs/BackchannelAuthorizeRestWebServiceImpl.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/bcauthorize/ws/rs/BackchannelAuthorizeRestWebServiceImpl.java @@ -41,7 +41,7 @@ import io.jans.as.server.service.ciba.CibaRequestService; import io.jans.as.server.util.ServerUtil; import io.jans.util.StringHelper; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.util.Strings; import org.json.JSONException; import org.json.JSONObject; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAAuthorizeParamsValidatorService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAAuthorizeParamsValidatorService.java index 3e52aa2bd65..ca6d5f82900 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAAuthorizeParamsValidatorService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBAAuthorizeParamsValidatorService.java @@ -9,7 +9,7 @@ import io.jans.as.model.common.BackchannelTokenDeliveryMode; import io.jans.as.model.configuration.AppConfiguration; import io.jans.as.model.error.DefaultErrorResponse; -import org.apache.commons.lang.BooleanUtils; +import org.apache.commons.lang3.BooleanUtils; import org.apache.logging.log4j.util.Strings; import jakarta.ejb.Stateless; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBARegisterClientMetadataService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBARegisterClientMetadataService.java index d1cf904982c..0508e9b62a7 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBARegisterClientMetadataService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/ciba/CIBARegisterClientMetadataService.java @@ -10,8 +10,8 @@ import io.jans.as.model.common.BackchannelTokenDeliveryMode; import io.jans.as.model.configuration.AppConfiguration; import io.jans.as.model.crypto.signature.AsymmetricSignatureAlgorithm; -import org.apache.commons.lang.BooleanUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.StringUtils; import jakarta.ejb.Stateless; import jakarta.inject.Inject; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/exception/GlobalExceptionHandler.java b/jans-auth-server/server/src/main/java/io/jans/as/server/exception/GlobalExceptionHandler.java index 54cdd8fdc8a..cdd4e8806e0 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/exception/GlobalExceptionHandler.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/exception/GlobalExceptionHandler.java @@ -9,7 +9,7 @@ import io.jans.as.server.model.exception.InvalidSessionStateException; import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/filter/CorrelationIdFilter.java b/jans-auth-server/server/src/main/java/io/jans/as/server/filter/CorrelationIdFilter.java index eaad7276fa7..3b3de3171ee 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/filter/CorrelationIdFilter.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/filter/CorrelationIdFilter.java @@ -5,7 +5,7 @@ import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.ThreadContext; import java.io.IOException; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/idgen/ws/rs/InumGenerator.java b/jans-auth-server/server/src/main/java/io/jans/as/server/idgen/ws/rs/InumGenerator.java index 277b0917453..f7564a94ca0 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/idgen/ws/rs/InumGenerator.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/idgen/ws/rs/InumGenerator.java @@ -17,7 +17,7 @@ import io.jans.orm.model.base.DummyEntry; import io.jans.orm.search.filter.Filter; import io.jans.util.INumGenerator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import jakarta.ejb.Stateless; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/introspection/ws/rs/IntrospectionWebService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/introspection/ws/rs/IntrospectionWebService.java index 0aacd42685a..8b84985318e 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/introspection/ws/rs/IntrospectionWebService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/introspection/ws/rs/IntrospectionWebService.java @@ -39,7 +39,7 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.BooleanUtils; import org.jetbrains.annotations.Nullable; import org.json.JSONException; @@ -53,7 +53,7 @@ import java.util.HashMap; import static io.jans.as.model.util.Util.escapeLog; -import static org.apache.commons.lang.BooleanUtils.isTrue; +import static org.apache.commons.lang3.BooleanUtils.isTrue; /** * @author Yuriy Zabrovarnyy diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/jans/ws/rs/JansConfigurationWS.java b/jans-auth-server/server/src/main/java/io/jans/as/server/jans/ws/rs/JansConfigurationWS.java index 35ddec9bfa0..eb31b38fe92 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/jans/ws/rs/JansConfigurationWS.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/jans/ws/rs/JansConfigurationWS.java @@ -20,7 +20,7 @@ import io.jans.as.server.util.ServerUtil; import io.jans.model.JansAttribute; import io.jans.model.custom.script.conf.CustomScriptConfiguration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import jakarta.inject.Inject; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/jwk/ws/rs/ArchivedJwksService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/jwk/ws/rs/ArchivedJwksService.java index 49f60934868..f0c45418db1 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/jwk/ws/rs/ArchivedJwksService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/jwk/ws/rs/ArchivedJwksService.java @@ -13,7 +13,7 @@ import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONArray; import org.json.JSONObject; import org.slf4j.Logger; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/audit/OAuth2AuditLog.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/audit/OAuth2AuditLog.java index 13df6618f52..3c9d98c480a 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/audit/OAuth2AuditLog.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/audit/OAuth2AuditLog.java @@ -8,7 +8,7 @@ import io.jans.as.server.model.common.AuthorizationGrant; import io.jans.net.InetAddressUtility; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.Date; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/authorize/AuthorizeParamsValidator.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/authorize/AuthorizeParamsValidator.java index 3b4b3faa25d..821aa06968f 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/authorize/AuthorizeParamsValidator.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/authorize/AuthorizeParamsValidator.java @@ -12,7 +12,7 @@ import io.jans.as.model.common.ResponseMode; import io.jans.as.model.common.ResponseType; import io.jans.as.model.configuration.AppConfiguration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/authorize/IdTokenMember.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/authorize/IdTokenMember.java index 20ccc41c7dc..71db98e2f19 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/authorize/IdTokenMember.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/authorize/IdTokenMember.java @@ -7,7 +7,7 @@ package io.jans.as.server.model.authorize; import io.jans.as.model.util.Util; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/authorize/JwtAuthorizationRequest.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/authorize/JwtAuthorizationRequest.java index 189031952ab..143654e6893 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/authorize/JwtAuthorizationRequest.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/authorize/JwtAuthorizationRequest.java @@ -35,7 +35,7 @@ import io.jans.as.server.service.RedirectUriResponse; import io.jans.as.server.service.RedirectionUriService; import io.jans.service.cdi.util.CdiUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.ArrayUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/authorize/ScopeChecker.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/authorize/ScopeChecker.java index 179de51ec86..5ac3b4b554e 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/authorize/ScopeChecker.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/authorize/ScopeChecker.java @@ -12,7 +12,7 @@ import io.jans.as.server.service.SpontaneousScopeService; import io.jans.as.server.service.external.ExternalSpontaneousScopeService; import io.jans.as.server.service.external.context.SpontaneousScopeExternalContext; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import jakarta.ejb.Stateless; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/AuthorizationGrant.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/AuthorizationGrant.java index 85a39bcb073..4b78e439674 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/AuthorizationGrant.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/AuthorizationGrant.java @@ -47,7 +47,7 @@ import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/AuthorizationGrantList.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/AuthorizationGrantList.java index 6bcf6ffbf85..4ab61cdd196 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/AuthorizationGrantList.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/AuthorizationGrantList.java @@ -26,7 +26,7 @@ import jakarta.enterprise.context.Dependent; import jakarta.enterprise.inject.Instance; import jakarta.inject.Inject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import java.util.ArrayList; @@ -35,7 +35,7 @@ import java.util.List; import static io.jans.as.model.util.Util.escapeLog; -import static org.apache.commons.lang.BooleanUtils.isFalse; +import static org.apache.commons.lang3.BooleanUtils.isFalse; /** * Component to hold in memory authorization grant objects. diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/CacheGrant.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/CacheGrant.java index 9934d86f372..b86ef6aa28f 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/CacheGrant.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/CacheGrant.java @@ -10,7 +10,7 @@ import io.jans.as.common.model.common.User; import io.jans.as.common.model.registration.Client; import io.jans.as.model.configuration.AppConfiguration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import jakarta.enterprise.inject.Instance; import java.io.Serializable; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/CibaRequestStatus.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/CibaRequestStatus.java index 6b35ee51f30..598f2c94498 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/CibaRequestStatus.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/CibaRequestStatus.java @@ -6,7 +6,7 @@ package io.jans.as.server.model.common; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * @author Javier Rojas Blum diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/DeviceCodeGrant.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/DeviceCodeGrant.java index 0de34120520..9bddac6e447 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/DeviceCodeGrant.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/common/DeviceCodeGrant.java @@ -10,7 +10,7 @@ import io.jans.as.common.model.common.User; import io.jans.as.model.common.GrantType; import io.jans.service.CacheService; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import jakarta.inject.Inject; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/config/ConfigurationFactory.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/config/ConfigurationFactory.java index 4adc948cb77..892d05b67b6 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/config/ConfigurationFactory.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/config/ConfigurationFactory.java @@ -38,7 +38,7 @@ import io.jans.service.timer.schedule.TimerSchedule; import io.jans.util.StringHelper; import io.jans.util.properties.FileConfiguration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; import org.slf4j.Logger; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/registration/RegisterParamsValidator.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/registration/RegisterParamsValidator.java index b047fef89da..02daa7f57fd 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/registration/RegisterParamsValidator.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/registration/RegisterParamsValidator.java @@ -28,7 +28,7 @@ import jakarta.ws.rs.client.ClientBuilder; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONArray; import org.slf4j.Logger; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/token/ClientAssertion.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/token/ClientAssertion.java index 17c514be97b..a4b578516f7 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/token/ClientAssertion.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/token/ClientAssertion.java @@ -22,7 +22,7 @@ import io.jans.as.server.service.ClientService; import io.jans.service.cdi.util.CdiUtil; import io.jans.util.security.StringEncrypter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; import java.util.Date; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/token/IdTokenFactory.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/token/IdTokenFactory.java index 0168a30c41f..87ba6c5de33 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/token/IdTokenFactory.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/token/IdTokenFactory.java @@ -42,7 +42,7 @@ import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import jakarta.inject.Named; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.util.Strings; import org.json.JSONObject; import org.slf4j.Logger; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/token/JwrService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/token/JwrService.java index baa096470c9..6b693600cc5 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/token/JwrService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/token/JwrService.java @@ -28,7 +28,7 @@ import io.jans.as.server.service.ClientService; import io.jans.as.server.service.SectorIdentifierService; import io.jans.as.server.service.ServerCryptoProvider; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.BooleanUtils; import org.json.JSONObject; import org.slf4j.Logger; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/model/token/PersistentJwt.java b/jans-auth-server/server/src/main/java/io/jans/as/server/model/token/PersistentJwt.java index 0d3869ee53e..5f9fb983aed 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/model/token/PersistentJwt.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/model/token/PersistentJwt.java @@ -11,7 +11,7 @@ import io.jans.as.server.model.common.AuthorizationGrantType; import io.jans.as.server.model.common.IdToken; import io.jans.as.server.model.common.RefreshToken; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/par/ws/rs/ParService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/par/ws/rs/ParService.java index 8de21e9b7e2..dd09e324810 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/par/ws/rs/ParService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/par/ws/rs/ParService.java @@ -8,7 +8,7 @@ import io.jans.as.persistence.model.Par; import io.jans.as.server.model.authorize.JwtAuthorizationRequest; import io.jans.orm.PersistenceEntryManager; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import jakarta.enterprise.context.ApplicationScoped; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/register/ws/rs/RegisterService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/register/ws/rs/RegisterService.java index b19ca183284..f5e69a298af 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/register/ws/rs/RegisterService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/register/ws/rs/RegisterService.java @@ -31,7 +31,7 @@ import jakarta.inject.Named; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.json.JSONArray; import org.json.JSONException; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/register/ws/rs/RegisterValidator.java b/jans-auth-server/server/src/main/java/io/jans/as/server/register/ws/rs/RegisterValidator.java index 93ef2feec8f..c915aab9a4a 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/register/ws/rs/RegisterValidator.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/register/ws/rs/RegisterValidator.java @@ -38,7 +38,7 @@ import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.Nullable; import org.json.JSONArray; import org.json.JSONObject; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/register/ws/rs/SsaValidationConfigService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/register/ws/rs/SsaValidationConfigService.java index 15e2ff5d0f7..4ab22b6943f 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/register/ws/rs/SsaValidationConfigService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/register/ws/rs/SsaValidationConfigService.java @@ -16,7 +16,7 @@ import jakarta.ejb.Stateless; import jakarta.inject.Inject; import jakarta.inject.Named; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; import org.slf4j.Logger; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/register/ws/rs/action/RegisterCreateAction.java b/jans-auth-server/server/src/main/java/io/jans/as/server/register/ws/rs/action/RegisterCreateAction.java index 2408d529a77..12f3a1fc801 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/register/ws/rs/action/RegisterCreateAction.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/register/ws/rs/action/RegisterCreateAction.java @@ -37,14 +37,14 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.SecurityContext; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; import org.slf4j.Logger; import java.net.URI; import java.util.*; -import static org.apache.commons.lang.BooleanUtils.isFalse; +import static org.apache.commons.lang3.BooleanUtils.isFalse; import static org.apache.commons.lang3.BooleanUtils.isTrue; /** diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/revoke/RevokeRestWebServiceImpl.java b/jans-auth-server/server/src/main/java/io/jans/as/server/revoke/RevokeRestWebServiceImpl.java index 41367a2fc6a..9bdc8283df3 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/revoke/RevokeRestWebServiceImpl.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/revoke/RevokeRestWebServiceImpl.java @@ -35,9 +35,9 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.SecurityContext; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.BooleanUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import java.util.ArrayList; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/revoke/RevokeSessionRestWebService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/revoke/RevokeSessionRestWebService.java index 912fa9eec36..7ae6021e6cc 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/revoke/RevokeSessionRestWebService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/revoke/RevokeSessionRestWebService.java @@ -18,7 +18,7 @@ import io.jans.as.server.service.ScopeService; import io.jans.as.server.service.SessionIdService; import io.jans.as.server.service.UserService; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.slf4j.Logger; import jakarta.inject.Inject; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/AcrService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/AcrService.java index e20f2e3542b..7af9dc05113 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/AcrService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/AcrService.java @@ -17,7 +17,7 @@ import io.jans.model.custom.script.conf.CustomScriptConfiguration; import jakarta.inject.Inject; import jakarta.inject.Named; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.python.google.common.collect.Lists; import org.slf4j.Logger; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/AuthenticationFilterService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/AuthenticationFilterService.java index 8418d0c4a86..aa821bd0223 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/AuthenticationFilterService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/AuthenticationFilterService.java @@ -12,7 +12,7 @@ import io.jans.orm.exception.AuthenticationException; import io.jans.orm.exception.operation.SearchException; import io.jans.util.StringHelper; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import jakarta.annotation.PostConstruct; import jakarta.ejb.DependsOn; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/AuthenticationService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/AuthenticationService.java index a0ffe8fdb84..491ed7f4c0b 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/AuthenticationService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/AuthenticationService.java @@ -19,7 +19,7 @@ import java.util.Set; import java.util.TimeZone; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONException; import org.slf4j.Logger; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/AuthorizeService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/AuthorizeService.java index c5e8a3621c5..bccd02b26a9 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/AuthorizeService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/AuthorizeService.java @@ -45,7 +45,7 @@ import jakarta.inject.Inject; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import java.util.ArrayList; @@ -54,8 +54,8 @@ import java.util.Set; import static io.jans.as.model.util.StringUtils.spaceSeparatedToList; -import static org.apache.commons.lang.BooleanUtils.isFalse; -import static org.apache.commons.lang.BooleanUtils.isTrue; +import static org.apache.commons.lang3.BooleanUtils.isFalse; +import static org.apache.commons.lang3.BooleanUtils.isTrue; /** * @author Yuriy Movchan diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/ClientFilterService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/ClientFilterService.java index 846800dda27..58f52dc83f9 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/ClientFilterService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/ClientFilterService.java @@ -10,7 +10,7 @@ import io.jans.as.model.configuration.AppConfiguration; import io.jans.orm.PersistenceEntryManager; import io.jans.orm.exception.operation.SearchException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import jakarta.annotation.PostConstruct; import jakarta.ejb.DependsOn; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/CookieService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/CookieService.java index 03318089fa1..87840f16289 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/CookieService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/CookieService.java @@ -20,7 +20,7 @@ import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONArray; import org.json.JSONException; import org.slf4j.Logger; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/DeviceAuthorizationService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/DeviceAuthorizationService.java index 5153db8992b..7165a9253c0 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/DeviceAuthorizationService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/DeviceAuthorizationService.java @@ -15,7 +15,7 @@ import io.jans.as.server.model.common.DeviceAuthorizationStatus; import io.jans.as.common.model.session.SessionId; import io.jans.service.CacheService; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import jakarta.ejb.Stateless; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/DiscoveryService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/DiscoveryService.java index 950a2b907e9..7a27672907e 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/DiscoveryService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/DiscoveryService.java @@ -16,7 +16,7 @@ import jakarta.ejb.Stateless; import jakarta.inject.Inject; import jakarta.inject.Named; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONArray; import org.json.JSONObject; import org.slf4j.Logger; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/GrantService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/GrantService.java index 813755d01fd..91106415215 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/GrantService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/GrantService.java @@ -24,7 +24,7 @@ import io.jans.util.StringHelper; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import java.util.ArrayList; @@ -34,7 +34,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import static org.apache.commons.lang.BooleanUtils.isTrue; +import static org.apache.commons.lang3.BooleanUtils.isTrue; /** * @author Yuriy Zabrovarnyy diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/IntrospectionService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/IntrospectionService.java index 789d5243418..b299235c6a0 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/IntrospectionService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/IntrospectionService.java @@ -39,7 +39,7 @@ import java.nio.charset.StandardCharsets; import java.security.PublicKey; -import static org.apache.commons.lang.BooleanUtils.isTrue; +import static org.apache.commons.lang3.BooleanUtils.isTrue; /** * @author Yuriy Z diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/RedirectionUriService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/RedirectionUriService.java index ddd546a2600..47593caac08 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/RedirectionUriService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/RedirectionUriService.java @@ -22,8 +22,8 @@ import jakarta.inject.Named; import jakarta.ws.rs.client.ClientBuilder; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.BooleanUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.json.JSONArray; import org.slf4j.Logger; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/RequestParameterService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/RequestParameterService.java index fc8250160ed..7221f38983d 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/RequestParameterService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/RequestParameterService.java @@ -20,7 +20,7 @@ import jakarta.inject.Inject; import jakarta.inject.Named; import jakarta.servlet.http.HttpServletRequest; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; import org.slf4j.Logger; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/ScopeService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/ScopeService.java index 5b675104848..4e5c428ebf7 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/ScopeService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/ScopeService.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONArray; import org.slf4j.Logger; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/SectorIdentifierService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/SectorIdentifierService.java index ff2e3abb7a7..1fd7283cea4 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/SectorIdentifierService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/SectorIdentifierService.java @@ -17,8 +17,8 @@ import io.jans.as.server.model.common.IAuthorizationGrant; import io.jans.orm.PersistenceEntryManager; import io.jans.util.StringHelper; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import jakarta.ejb.Stateless; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/ServerCryptoProvider.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/ServerCryptoProvider.java index 42a196416a8..e0ca7da149d 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/ServerCryptoProvider.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/ServerCryptoProvider.java @@ -14,7 +14,7 @@ import io.jans.as.model.jwk.*; import io.jans.as.server.model.config.ConfigurationFactory; import io.jans.service.cdi.util.CdiUtil; -import org.apache.commons.lang.BooleanUtils; +import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONObject; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/SessionIdService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/SessionIdService.java index 57299a4be51..6a3f96adec1 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/SessionIdService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/SessionIdService.java @@ -49,8 +49,8 @@ import jakarta.inject.Named; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.apache.commons.lang.BooleanUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.Nullable; import org.json.JSONException; import org.slf4j.Logger; @@ -64,7 +64,7 @@ import java.util.concurrent.TimeUnit; import static io.jans.as.server.service.AcrService.isAgama; -import static org.apache.commons.lang.BooleanUtils.isTrue; +import static org.apache.commons.lang3.BooleanUtils.isTrue; /** * @author Yuriy Zabrovarnyy diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/UserGroupService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/UserGroupService.java index ca6b4aafcc3..2c38f82aa11 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/UserGroupService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/UserGroupService.java @@ -10,7 +10,7 @@ import io.jans.orm.PersistenceEntryManager; import io.jans.orm.exception.EntryPersistenceException; import io.jans.orm.search.filter.Filter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import jakarta.ejb.Stateless; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/ciba/CibaRequestService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/ciba/CibaRequestService.java index d5111ef53dd..09d77c8f4c6 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/ciba/CibaRequestService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/ciba/CibaRequestService.java @@ -16,7 +16,7 @@ import io.jans.orm.PersistenceEntryManager; import io.jans.orm.search.filter.Filter; import io.jans.service.CacheService; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.slf4j.Logger; import jakarta.ejb.Stateless; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/date/DateFormatterService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/date/DateFormatterService.java index 2be530a672e..2cee60be389 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/date/DateFormatterService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/date/DateFormatterService.java @@ -5,7 +5,7 @@ import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import jakarta.inject.Named; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import java.io.Serializable; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalAuthenticationService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalAuthenticationService.java index 9cd3546563d..986aea0e9c7 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalAuthenticationService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalAuthenticationService.java @@ -30,7 +30,7 @@ import jakarta.enterprise.event.Observes; import jakarta.inject.Inject; import jakarta.inject.Named; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.*; import java.util.Map.Entry; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalCreateUserService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalCreateUserService.java index 480f54797af..7dee54f3651 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalCreateUserService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalCreateUserService.java @@ -10,7 +10,7 @@ import jakarta.ejb.DependsOn; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Named; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.Set; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalEndSessionService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalEndSessionService.java index c0c82f038e4..8d0c325da94 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalEndSessionService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalEndSessionService.java @@ -11,7 +11,7 @@ import io.jans.model.custom.script.conf.CustomScriptConfiguration; import io.jans.model.custom.script.type.logout.EndSessionType; import io.jans.service.custom.script.ExternalScriptService; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import jakarta.ejb.DependsOn; import jakarta.enterprise.context.ApplicationScoped; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalSelectAccountService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalSelectAccountService.java index 1c87dfd7dc3..e129a80a72c 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalSelectAccountService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/external/ExternalSelectAccountService.java @@ -9,7 +9,7 @@ import jakarta.ejb.DependsOn; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Named; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.Set; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/stat/StatService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/stat/StatService.java index fe84d674063..8ba31c5c64b 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/stat/StatService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/stat/StatService.java @@ -16,7 +16,7 @@ import jakarta.inject.Inject; import jakarta.inject.Named; import net.agkn.hll.HLL; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import java.text.SimpleDateFormat; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/token/GlobalTokenRevocationService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/token/GlobalTokenRevocationService.java index bd53d374422..27c5386fabd 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/token/GlobalTokenRevocationService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/token/GlobalTokenRevocationService.java @@ -23,7 +23,7 @@ import jakarta.inject.Named; import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.slf4j.Logger; import java.io.IOException; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/token/StatusListService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/token/StatusListService.java index 44471454978..b9e4de9da93 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/token/StatusListService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/token/StatusListService.java @@ -21,7 +21,7 @@ import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; import org.slf4j.Logger; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/service/token/TokenService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/service/token/TokenService.java index fd3cb608a23..31fef73956c 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/service/token/TokenService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/service/token/TokenService.java @@ -9,7 +9,7 @@ import io.jans.as.server.model.common.AuthorizationGrant; import io.jans.as.server.model.common.AuthorizationGrantList; import io.jans.as.server.model.token.HttpAuthTokenType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/AccountsServlet.java b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/AccountsServlet.java index 77d61137710..f124efa39a8 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/AccountsServlet.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/AccountsServlet.java @@ -9,7 +9,7 @@ import io.jans.as.server.model.common.AuthorizationGrant; import io.jans.as.server.service.ClientService; import io.jans.as.server.service.token.TokenService; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.json.JSONArray; import org.json.JSONObject; import org.slf4j.Logger; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/FapiOpenIdConfiguration.java b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/FapiOpenIdConfiguration.java index 4f1fd437ddc..f191975792b 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/FapiOpenIdConfiguration.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/FapiOpenIdConfiguration.java @@ -37,8 +37,8 @@ import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONArray; import org.json.JSONObject; import org.slf4j.Logger; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/FaviconServlet.java b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/FaviconServlet.java index 657c9ee3b2b..0de1e9c533e 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/FaviconServlet.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/FaviconServlet.java @@ -9,7 +9,7 @@ import io.jans.as.common.service.OrganizationService; import io.jans.as.persistence.model.GluuOrganization; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/LogoServlet.java b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/LogoServlet.java index 9d08a50cb65..a44422537d8 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/LogoServlet.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/LogoServlet.java @@ -9,7 +9,7 @@ import io.jans.as.common.service.OrganizationService; import io.jans.as.persistence.model.GluuOrganization; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/OpenIdConfiguration.java b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/OpenIdConfiguration.java index 9b1ecc0c11d..daf4ba756a6 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/OpenIdConfiguration.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/servlet/OpenIdConfiguration.java @@ -19,7 +19,7 @@ import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.BooleanUtils; import org.json.JSONObject; import org.slf4j.Logger; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/EndSessionRestWebServiceImpl.java b/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/EndSessionRestWebServiceImpl.java index cfbe9ce9059..8d76be2484a 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/EndSessionRestWebServiceImpl.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/EndSessionRestWebServiceImpl.java @@ -49,7 +49,7 @@ import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.SecurityContext; import jakarta.ws.rs.core.UriBuilder; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import java.net.URI; @@ -59,7 +59,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; -import static org.apache.commons.lang.BooleanUtils.isTrue; +import static org.apache.commons.lang3.BooleanUtils.isTrue; /** * @author Javier Rojas Blum diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/EndSessionUtils.java b/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/EndSessionUtils.java index 9e19567bfa8..b99fe7e07d9 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/EndSessionUtils.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/EndSessionUtils.java @@ -13,7 +13,7 @@ import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.core.Form; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/LogoutTokenFactory.java b/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/LogoutTokenFactory.java index 4217f2f6f7e..4b6440364c0 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/LogoutTokenFactory.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/session/ws/rs/LogoutTokenFactory.java @@ -13,7 +13,7 @@ import io.jans.as.model.token.JsonWebResponse; import io.jans.as.server.model.token.JwrService; import io.jans.as.server.service.SectorIdentifierService; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.BooleanUtils; import org.json.JSONObject; import org.msgpack.core.Preconditions; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TokenCreatorService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TokenCreatorService.java index 06e6b477437..0c464ff6ec8 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TokenCreatorService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TokenCreatorService.java @@ -22,14 +22,14 @@ import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.BooleanUtils; +import org.apache.commons.lang3.BooleanUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import java.util.Arrays; -import static org.apache.commons.lang.BooleanUtils.isTrue; +import static org.apache.commons.lang3.BooleanUtils.isTrue; /** * @author Yuriy Z diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TokenExchangeService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TokenExchangeService.java index 2317df3f9b5..5c2b94a0227 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TokenExchangeService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TokenExchangeService.java @@ -19,8 +19,8 @@ import jakarta.inject.Inject; import jakarta.inject.Named; import jakarta.servlet.http.HttpServletRequest; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.BooleanUtils; import org.json.JSONException; import org.json.JSONObject; @@ -32,7 +32,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import static io.jans.as.model.config.Constants.OPENID; import static io.jans.as.model.config.Constants.TOKEN_TYPE_ACCESS_TOKEN; -import static org.apache.commons.lang.BooleanUtils.isTrue; +import static org.apache.commons.lang3.BooleanUtils.isTrue; /** * @author Yuriy Z diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TokenRestWebServiceImpl.java b/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TokenRestWebServiceImpl.java index ed58fad4c5b..95134a34a97 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TokenRestWebServiceImpl.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TokenRestWebServiceImpl.java @@ -54,7 +54,7 @@ import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.ResponseBuilder; import jakarta.ws.rs.core.SecurityContext; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.Nullable; import org.json.JSONException; import org.json.JSONObject; @@ -68,8 +68,8 @@ import static io.jans.as.model.config.Constants.*; import static io.jans.as.server.util.ServerUtil.prepareForLogs; -import static org.apache.commons.lang.BooleanUtils.isFalse; -import static org.apache.commons.lang.BooleanUtils.isTrue; +import static org.apache.commons.lang3.BooleanUtils.isFalse; +import static org.apache.commons.lang3.BooleanUtils.isTrue; /** * Provides interface for token REST web services diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TokenRestWebServiceValidator.java b/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TokenRestWebServiceValidator.java index dfb3e73cce7..b498c42a64c 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TokenRestWebServiceValidator.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TokenRestWebServiceValidator.java @@ -36,7 +36,7 @@ import java.util.function.Consumer; import static io.jans.as.model.config.Constants.*; -import static org.apache.commons.lang.BooleanUtils.isTrue; +import static org.apache.commons.lang3.BooleanUtils.isTrue; /** * @author Yuriy Zabrovarnyy diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TxTokenValidator.java b/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TxTokenValidator.java index e2986113a5a..33b2041074d 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TxTokenValidator.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/token/ws/rs/TxTokenValidator.java @@ -137,7 +137,7 @@ private Response response(Response.ResponseBuilder builder, OAuth2AuditLog oAuth } protected AuthorizationGrant getIdTokenGrant(String idTokenHint) { - if (org.apache.commons.lang.StringUtils.isBlank(idTokenHint)) { + if (org.apache.commons.lang3.StringUtils.isBlank(idTokenHint)) { return null; } diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/Claims.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/Claims.java index 479aae806cf..6ab0770946c 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/Claims.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/Claims.java @@ -7,7 +7,7 @@ package io.jans.as.server.uma.authorization; import io.jans.as.model.jwt.Jwt; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.Map; import java.util.Set; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/UmaPCT.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/UmaPCT.java index f8a01fd20fd..1f58e2078ac 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/UmaPCT.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/UmaPCT.java @@ -14,7 +14,7 @@ import io.jans.orm.annotation.DN; import io.jans.orm.annotation.DataEntry; import io.jans.orm.annotation.ObjectClass; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/UmaWebException.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/UmaWebException.java index 052e02ae7c8..1410088327a 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/UmaWebException.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/authorization/UmaWebException.java @@ -9,7 +9,7 @@ import io.jans.as.model.error.DefaultErrorResponse; import io.jans.as.model.error.ErrorResponseFactory; import io.jans.as.model.uma.UmaErrorResponseType; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/RedirectParameters.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/RedirectParameters.java index 813d1ff49d6..c9317993e03 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/RedirectParameters.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/RedirectParameters.java @@ -6,7 +6,7 @@ package io.jans.as.server.uma.service; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaExpressionService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaExpressionService.java index 7e951b94b08..5fa5577e008 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaExpressionService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaExpressionService.java @@ -31,7 +31,7 @@ import java.util.List; import java.util.Map; -import static org.apache.commons.lang.BooleanUtils.isFalse; +import static org.apache.commons.lang3.BooleanUtils.isFalse; /** * @author yuriyz diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaGatherer.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaGatherer.java index bdd6c89e649..4a7de98e0d4 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaGatherer.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaGatherer.java @@ -16,7 +16,7 @@ import io.jans.as.server.uma.authorization.UmaGatherContext; import io.jans.jsf2.service.FacesService; import io.jans.model.custom.script.conf.CustomScriptConfiguration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import jakarta.enterprise.context.RequestScoped; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaNeedsInfoService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaNeedsInfoService.java index 630041bff48..25123bd01fa 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaNeedsInfoService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaNeedsInfoService.java @@ -21,7 +21,7 @@ import io.jans.as.server.util.ServerUtil; import io.jans.model.custom.script.conf.CustomScriptConfiguration; import io.jans.model.uma.ClaimDefinition; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import jakarta.ejb.Stateless; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaPctService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaPctService.java index a290fc5a5c3..d9de4fb6a6d 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaPctService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaPctService.java @@ -15,7 +15,7 @@ import io.jans.orm.PersistenceEntryManager; import io.jans.orm.model.base.SimpleBranch; import io.jans.orm.search.filter.Filter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import jakarta.enterprise.context.ApplicationScoped; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaPermissionService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaPermissionService.java index 5f2b74074ad..1e7aa839db2 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaPermissionService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaPermissionService.java @@ -15,7 +15,7 @@ import io.jans.orm.model.base.SimpleBranch; import io.jans.orm.search.filter.Filter; import io.jans.util.INumGenerator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import jakarta.ejb.Stateless; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaResourceService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaResourceService.java index b96d2683344..7acced8305e 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaResourceService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaResourceService.java @@ -17,7 +17,7 @@ import io.jans.orm.search.filter.Filter; import io.jans.service.CacheService; import io.jans.util.StringHelper; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import jakarta.ejb.Stateless; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaRptService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaRptService.java index 96c1e46183a..065455f1a71 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaRptService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaRptService.java @@ -31,7 +31,7 @@ import io.jans.orm.model.base.SimpleBranch; import io.jans.util.INumGenerator; import io.jans.util.StringHelper; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaScopeService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaScopeService.java index 99f4c103370..4d22c6fefb9 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaScopeService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaScopeService.java @@ -18,7 +18,7 @@ import io.jans.as.server.service.SpontaneousScopeService; import io.jans.orm.PersistenceEntryManager; import io.jans.orm.search.filter.Filter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import jakarta.ejb.Stateless; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaSessionService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaSessionService.java index c2d8bb9db6e..8627eb4590a 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaSessionService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaSessionService.java @@ -14,7 +14,7 @@ import io.jans.as.server.service.ClientService; import io.jans.as.server.service.CookieService; import io.jans.as.server.service.SessionIdService; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import jakarta.ejb.Stateless; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaValidationService.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaValidationService.java index 00875730f81..9307da8747c 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaValidationService.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/service/UmaValidationService.java @@ -39,8 +39,8 @@ import io.jans.as.server.util.ServerUtil; import io.jans.orm.exception.EntryPersistenceException; import io.jans.util.StringHelper; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import com.google.common.collect.Iterables; import org.slf4j.Logger; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaGatheringWS.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaGatheringWS.java index 95f4ac81f5e..6ff0249b010 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaGatheringWS.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaGatheringWS.java @@ -22,7 +22,7 @@ import io.jans.as.server.uma.service.UmaSessionService; import io.jans.as.server.uma.service.UmaValidationService; import io.jans.model.custom.script.conf.CustomScriptConfiguration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import jakarta.inject.Inject; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaResourceRegistrationWS.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaResourceRegistrationWS.java index 5f059fafc98..7f9e547d951 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaResourceRegistrationWS.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaResourceRegistrationWS.java @@ -15,7 +15,7 @@ import io.jans.as.server.uma.service.UmaScopeService; import io.jans.as.server.uma.service.UmaValidationService; import io.jans.as.server.util.ServerUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import jakarta.inject.Inject; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaScopeIconWS.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaScopeIconWS.java index 6b8f839c654..5cf565ed1eb 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaScopeIconWS.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaScopeIconWS.java @@ -12,7 +12,7 @@ import io.jans.as.model.uma.UmaErrorResponseType; import io.jans.as.persistence.model.Scope; import io.jans.as.server.uma.service.UmaScopeService; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import jakarta.inject.Inject; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaScopeWS.java b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaScopeWS.java index d26743a8089..6c87760d7fd 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaScopeWS.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/uma/ws/rs/UmaScopeWS.java @@ -14,7 +14,7 @@ import io.jans.as.persistence.model.Scope; import io.jans.as.server.uma.service.UmaScopeService; import io.jans.as.server.util.ServerUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import jakarta.inject.Inject; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/util/ServerUtil.java b/jans-auth-server/server/src/main/java/io/jans/as/server/util/ServerUtil.java index de08325833f..7e6ad125190 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/util/ServerUtil.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/util/ServerUtil.java @@ -25,7 +25,7 @@ import jakarta.faces.context.FacesContext; import jakarta.servlet.http.HttpServletRequest; import jakarta.ws.rs.core.CacheControl; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/util/TokenHashUtil.java b/jans-auth-server/server/src/main/java/io/jans/as/server/util/TokenHashUtil.java index 4798cee7690..cbf54f0c313 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/util/TokenHashUtil.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/util/TokenHashUtil.java @@ -7,7 +7,7 @@ package io.jans.as.server.util; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class TokenHashUtil { diff --git a/jans-auth-server/server/src/test/java/io/jans/as/server/authorize/ws/rs/AuthzRequestServiceTest.java b/jans-auth-server/server/src/test/java/io/jans/as/server/authorize/ws/rs/AuthzRequestServiceTest.java index fd86713b4d4..8cd03d6a0c8 100644 --- a/jans-auth-server/server/src/test/java/io/jans/as/server/authorize/ws/rs/AuthzRequestServiceTest.java +++ b/jans-auth-server/server/src/test/java/io/jans/as/server/authorize/ws/rs/AuthzRequestServiceTest.java @@ -17,7 +17,7 @@ import io.jans.as.server.service.external.ExternalAuthenticationService; import jakarta.servlet.http.HttpServletRequest; import jakarta.ws.rs.WebApplicationException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.testng.MockitoTestNGListener; diff --git a/jans-auth-server/server/src/test/java/io/jans/as/server/comp/InumGeneratorTest.java b/jans-auth-server/server/src/test/java/io/jans/as/server/comp/InumGeneratorTest.java index 51a1de6df40..a17c244f0ab 100644 --- a/jans-auth-server/server/src/test/java/io/jans/as/server/comp/InumGeneratorTest.java +++ b/jans-auth-server/server/src/test/java/io/jans/as/server/comp/InumGeneratorTest.java @@ -9,7 +9,7 @@ import io.jans.as.model.common.IdType; import io.jans.as.server.BaseComponentTest; import io.jans.as.server.idgen.ws.rs.InumGenerator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/jans-auth-server/server/src/test/java/io/jans/as/server/model/uma/TTokenRequest.java b/jans-auth-server/server/src/test/java/io/jans/as/server/model/uma/TTokenRequest.java index e6ea7300732..a7ea6075fa8 100644 --- a/jans-auth-server/server/src/test/java/io/jans/as/server/model/uma/TTokenRequest.java +++ b/jans-auth-server/server/src/test/java/io/jans/as/server/model/uma/TTokenRequest.java @@ -22,7 +22,7 @@ import io.jans.as.model.util.QueryStringDecoder; import io.jans.as.server.BaseTest; import io.jans.as.server.util.ServerUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; import org.json.JSONException; import org.json.JSONObject; diff --git a/jans-auth-server/server/src/test/java/io/jans/as/server/service/IntrospectionServiceTest.java b/jans-auth-server/server/src/test/java/io/jans/as/server/service/IntrospectionServiceTest.java index 20f1fb8d275..a52dc9da12a 100644 --- a/jans-auth-server/server/src/test/java/io/jans/as/server/service/IntrospectionServiceTest.java +++ b/jans-auth-server/server/src/test/java/io/jans/as/server/service/IntrospectionServiceTest.java @@ -12,7 +12,7 @@ import io.jans.as.server.model.common.AuthorizationGrant; import io.jans.as.server.model.common.AuthorizationGrantType; import jakarta.ws.rs.WebApplicationException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; import org.mockito.InjectMocks; import org.mockito.Mock; diff --git a/jans-auth-server/server/src/test/java/io/jans/as/server/token/ws/rs/TokenExchangeServiceTest.java b/jans-auth-server/server/src/test/java/io/jans/as/server/token/ws/rs/TokenExchangeServiceTest.java index 344c5c033a7..50e986602c6 100644 --- a/jans-auth-server/server/src/test/java/io/jans/as/server/token/ws/rs/TokenExchangeServiceTest.java +++ b/jans-auth-server/server/src/test/java/io/jans/as/server/token/ws/rs/TokenExchangeServiceTest.java @@ -9,7 +9,7 @@ import io.jans.as.server.audit.ApplicationAuditLogger; import io.jans.as.server.authorize.ws.rs.AuthzDetailsService; import io.jans.as.server.service.SessionIdService; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.testng.MockitoTestNGListener; diff --git a/jans-auth-server/server/src/test/java/io/jans/as/server/util/JSONObjectAsserter.java b/jans-auth-server/server/src/test/java/io/jans/as/server/util/JSONObjectAsserter.java index 46d7005d322..2be09b118d9 100644 --- a/jans-auth-server/server/src/test/java/io/jans/as/server/util/JSONObjectAsserter.java +++ b/jans-auth-server/server/src/test/java/io/jans/as/server/util/JSONObjectAsserter.java @@ -1,7 +1,7 @@ package io.jans.as.server.util; import com.google.common.base.Preconditions; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.json.JSONObject; import static org.testng.Assert.assertTrue; diff --git a/jans-auth-server/test-model/pom.xml b/jans-auth-server/test-model/pom.xml index f74655592ba..28bea7579e7 100644 --- a/jans-auth-server/test-model/pom.xml +++ b/jans-auth-server/test-model/pom.xml @@ -85,8 +85,8 @@ commons-codec - commons-lang - commons-lang + org.apache.commons + commons-lang3 commons-io diff --git a/jans-auth-server/test-model/src/main/java/io/jans/as/test/TestUtil.java b/jans-auth-server/test-model/src/main/java/io/jans/as/test/TestUtil.java index c4eafed6b68..96e0311fceb 100644 --- a/jans-auth-server/test-model/src/main/java/io/jans/as/test/TestUtil.java +++ b/jans-auth-server/test-model/src/main/java/io/jans/as/test/TestUtil.java @@ -6,7 +6,7 @@ package io.jans.as.test; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.json.JSONException; import org.json.JSONObject; diff --git a/jans-auth-server/test-model/src/main/java/io/jans/as/test/UmaTestUtil.java b/jans-auth-server/test-model/src/main/java/io/jans/as/test/UmaTestUtil.java index 8457d5b9fc9..65a09b9307c 100644 --- a/jans-auth-server/test-model/src/main/java/io/jans/as/test/UmaTestUtil.java +++ b/jans-auth-server/test-model/src/main/java/io/jans/as/test/UmaTestUtil.java @@ -11,8 +11,8 @@ import io.jans.as.model.uma.*; import io.jans.as.model.uma.wrapper.Token; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; import org.jboss.resteasy.client.jaxrs.internal.ClientResponse; import org.testng.Assert; diff --git a/jans-bom/pom.xml b/jans-bom/pom.xml index e0c2b3caab0..ff3839d9e03 100644 --- a/jans-bom/pom.xml +++ b/jans-bom/pom.xml @@ -469,14 +469,9 @@ commons-io 2.17.0 - - commons-lang - commons-lang - 2.6 - org.apache.commons - commons-lang3commons-lang3 + commons-lang3 3.17.0 @@ -490,9 +485,14 @@ 1.3 - commons-configuration - commons-configuration - 1.10 + commons-beanutils + commons-beanutils + 1.9.4 + + + org.apache.commons + commons-configuration2 + 2.11.0 org.apache.commons diff --git a/jans-config-api/common/src/main/java/io/jans/configapi/model/configuration/CorsConfigurationFilter.java b/jans-config-api/common/src/main/java/io/jans/configapi/model/configuration/CorsConfigurationFilter.java index a7792a14f53..c5484630659 100644 --- a/jans-config-api/common/src/main/java/io/jans/configapi/model/configuration/CorsConfigurationFilter.java +++ b/jans-config-api/common/src/main/java/io/jans/configapi/model/configuration/CorsConfigurationFilter.java @@ -1,6 +1,6 @@ package io.jans.configapi.model.configuration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class CorsConfigurationFilter { diff --git a/jans-config-api/plugins/fido2-plugin/src/main/java/io/jans/configapi/plugin/fido2/service/Fido2RegistrationService.java b/jans-config-api/plugins/fido2-plugin/src/main/java/io/jans/configapi/plugin/fido2/service/Fido2RegistrationService.java index c70fb57d73b..f168b64d2dc 100644 --- a/jans-config-api/plugins/fido2-plugin/src/main/java/io/jans/configapi/plugin/fido2/service/Fido2RegistrationService.java +++ b/jans-config-api/plugins/fido2-plugin/src/main/java/io/jans/configapi/plugin/fido2/service/Fido2RegistrationService.java @@ -28,7 +28,7 @@ import jakarta.inject.Inject; import jakarta.ws.rs.WebApplicationException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import java.util.ArrayList; diff --git a/jans-config-api/plugins/kc-link-plugin/src/main/java/io/jans/configapi/plugin/kc/link/service/KcLinkConfigService.java b/jans-config-api/plugins/kc-link-plugin/src/main/java/io/jans/configapi/plugin/kc/link/service/KcLinkConfigService.java index b4fa24a33eb..5fcfd405f9c 100644 --- a/jans-config-api/plugins/kc-link-plugin/src/main/java/io/jans/configapi/plugin/kc/link/service/KcLinkConfigService.java +++ b/jans-config-api/plugins/kc-link-plugin/src/main/java/io/jans/configapi/plugin/kc/link/service/KcLinkConfigService.java @@ -12,7 +12,7 @@ import jakarta.inject.Named; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @ApplicationScoped diff --git a/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/client/IdpClientFactory.java b/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/client/IdpClientFactory.java index 34482279939..825d7712e5b 100644 --- a/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/client/IdpClientFactory.java +++ b/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/client/IdpClientFactory.java @@ -28,7 +28,7 @@ import java.nio.charset.StandardCharsets; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataOutput; import org.json.JSONObject; import org.slf4j.Logger; diff --git a/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/rest/IdpResource.java b/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/rest/IdpResource.java index 93eb9e69ae1..10aac269a07 100644 --- a/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/rest/IdpResource.java +++ b/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/rest/IdpResource.java @@ -43,7 +43,7 @@ import java.util.List; import org.slf4j.Logger; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jboss.resteasy.annotations.providers.multipart.MultipartForm; @Path(Constants.SAML_PATH + Constants.IDENTITY_PROVIDER) diff --git a/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/rest/TrustRelationshipResource.java b/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/rest/TrustRelationshipResource.java index b7cb16d118a..f2e9d4d2704 100644 --- a/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/rest/TrustRelationshipResource.java +++ b/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/rest/TrustRelationshipResource.java @@ -33,7 +33,7 @@ import java.util.*; import java.util.stream.*; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jboss.resteasy.annotations.providers.multipart.MultipartForm; import org.slf4j.Logger; diff --git a/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/service/IdentityProviderService.java b/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/service/IdentityProviderService.java index ecadf8fec57..c6d664e213f 100644 --- a/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/service/IdentityProviderService.java +++ b/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/service/IdentityProviderService.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.UUID; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import io.jans.as.common.model.registration.Client; diff --git a/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/service/IdpService.java b/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/service/IdpService.java index db5fa019c74..b19cd71f123 100644 --- a/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/service/IdpService.java +++ b/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/service/IdpService.java @@ -30,7 +30,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @ApplicationScoped diff --git a/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/service/KeycloakService.java b/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/service/KeycloakService.java index 68b52312535..bd32e790596 100644 --- a/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/service/KeycloakService.java +++ b/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/service/KeycloakService.java @@ -21,7 +21,7 @@ import java.io.InputStream; import java.util.*; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; diff --git a/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/service/SamlConfigService.java b/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/service/SamlConfigService.java index 5d96fa5b014..1a591f00857 100644 --- a/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/service/SamlConfigService.java +++ b/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/service/SamlConfigService.java @@ -12,7 +12,7 @@ import jakarta.inject.Named; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @ApplicationScoped diff --git a/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/service/SamlIdpService.java b/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/service/SamlIdpService.java index 17bb1c038bc..0b7a16077c5 100644 --- a/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/service/SamlIdpService.java +++ b/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/service/SamlIdpService.java @@ -30,7 +30,7 @@ import java.util.*; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @ApplicationScoped diff --git a/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/service/SamlService.java b/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/service/SamlService.java index 24ff7ee6329..187dd9e7eb4 100644 --- a/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/service/SamlService.java +++ b/jans-config-api/plugins/kc-saml-plugin/src/main/java/io/jans/configapi/plugin/saml/service/SamlService.java @@ -35,7 +35,7 @@ import java.util.Map; import java.util.UUID; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @ApplicationScoped diff --git a/jans-config-api/plugins/lock-plugin/src/main/java/io/jans/configapi/plugin/lock/service/AuditService.java b/jans-config-api/plugins/lock-plugin/src/main/java/io/jans/configapi/plugin/lock/service/AuditService.java index 596d012b2b7..43552301d7a 100644 --- a/jans-config-api/plugins/lock-plugin/src/main/java/io/jans/configapi/plugin/lock/service/AuditService.java +++ b/jans-config-api/plugins/lock-plugin/src/main/java/io/jans/configapi/plugin/lock/service/AuditService.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import io.jans.as.common.service.OrganizationService; diff --git a/jans-config-api/plugins/lock-plugin/src/main/java/io/jans/configapi/plugin/lock/service/LockConfigService.java b/jans-config-api/plugins/lock-plugin/src/main/java/io/jans/configapi/plugin/lock/service/LockConfigService.java index 7ca58cb9a99..4ef3334d7c2 100644 --- a/jans-config-api/plugins/lock-plugin/src/main/java/io/jans/configapi/plugin/lock/service/LockConfigService.java +++ b/jans-config-api/plugins/lock-plugin/src/main/java/io/jans/configapi/plugin/lock/service/LockConfigService.java @@ -11,7 +11,7 @@ import jakarta.inject.Inject; import jakarta.inject.Named; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @ApplicationScoped diff --git a/jans-config-api/plugins/user-mgt-plugin/src/main/java/io/jans/configapi/plugin/mgt/rest/UserResource.java b/jans-config-api/plugins/user-mgt-plugin/src/main/java/io/jans/configapi/plugin/mgt/rest/UserResource.java index 4cac90ee845..7cf502d0fb4 100644 --- a/jans-config-api/plugins/user-mgt-plugin/src/main/java/io/jans/configapi/plugin/mgt/rest/UserResource.java +++ b/jans-config-api/plugins/user-mgt-plugin/src/main/java/io/jans/configapi/plugin/mgt/rest/UserResource.java @@ -47,7 +47,7 @@ import static io.jans.as.model.util.Util.escapeLog; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; @Path(Constants.CONFIG_USER) @Produces(MediaType.APPLICATION_JSON) diff --git a/jans-config-api/plugins/user-mgt-plugin/src/main/java/io/jans/configapi/plugin/mgt/service/UserMgmtService.java b/jans-config-api/plugins/user-mgt-plugin/src/main/java/io/jans/configapi/plugin/mgt/service/UserMgmtService.java index 6df45a5e8ce..a2b7d03fe78 100644 --- a/jans-config-api/plugins/user-mgt-plugin/src/main/java/io/jans/configapi/plugin/mgt/service/UserMgmtService.java +++ b/jans-config-api/plugins/user-mgt-plugin/src/main/java/io/jans/configapi/plugin/mgt/service/UserMgmtService.java @@ -31,7 +31,7 @@ import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import java.io.IOException; diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/configuration/ConfigurationFactory.java b/jans-config-api/server/src/main/java/io/jans/configapi/configuration/ConfigurationFactory.java index 9ed11d08e6c..025e062c58c 100644 --- a/jans-config-api/server/src/main/java/io/jans/configapi/configuration/ConfigurationFactory.java +++ b/jans-config-api/server/src/main/java/io/jans/configapi/configuration/ConfigurationFactory.java @@ -36,7 +36,7 @@ import io.jans.util.security.PropertiesDecrypter; import io.jans.util.security.SecurityProviderUtility; import io.jans.util.security.StringEncrypter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import java.io.File; diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/filters/CorsFilter.java b/jans-config-api/server/src/main/java/io/jans/configapi/filters/CorsFilter.java index a53a25d4b94..d55e79de593 100644 --- a/jans-config-api/server/src/main/java/io/jans/configapi/filters/CorsFilter.java +++ b/jans-config-api/server/src/main/java/io/jans/configapi/filters/CorsFilter.java @@ -21,7 +21,7 @@ import jakarta.servlet.http.HttpServletResponse; import java.util.*; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @WebFilter(filterName = "CorsFilter", asyncSupported = true, urlPatterns = { "*" }) diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/filters/SpecFilter.java b/jans-config-api/server/src/main/java/io/jans/configapi/filters/SpecFilter.java index 59d6deab297..ac2db20444a 100644 --- a/jans-config-api/server/src/main/java/io/jans/configapi/filters/SpecFilter.java +++ b/jans-config-api/server/src/main/java/io/jans/configapi/filters/SpecFilter.java @@ -18,7 +18,7 @@ import java.util.Map; import java.util.Optional; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class SpecFilter extends AbstractSpecFilter { diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/AcrsResource.java b/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/AcrsResource.java index cce2a294349..ba92e2a1efd 100644 --- a/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/AcrsResource.java +++ b/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/AcrsResource.java @@ -34,7 +34,7 @@ import java.util.Set; import java.util.Optional; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import jakarta.inject.Inject; import jakarta.validation.constraints.NotNull; diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/CustomScriptResource.java b/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/CustomScriptResource.java index 3c97d470a8a..e8b9e9df857 100644 --- a/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/CustomScriptResource.java +++ b/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/CustomScriptResource.java @@ -52,7 +52,7 @@ import java.util.UUID; import org.apache.commons.io.FilenameUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; @Path(ApiConstants.CONFIG + ApiConstants.SCRIPTS) @Consumes(MediaType.APPLICATION_JSON) diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/LoggingResource.java b/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/LoggingResource.java index 68717ee9a3e..fdfb15f62b2 100644 --- a/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/LoggingResource.java +++ b/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/LoggingResource.java @@ -29,7 +29,7 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @Path(ApiConstants.LOGGING) diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/PluginResource.java b/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/PluginResource.java index a7430460eea..eb8fd962c21 100644 --- a/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/PluginResource.java +++ b/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/PluginResource.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.Optional; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @Path(ApiConstants.PLUGIN) diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/StatResource.java b/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/StatResource.java index 4f0064a3e0e..6234d0533ac 100644 --- a/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/StatResource.java +++ b/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/StatResource.java @@ -22,7 +22,7 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @Path(ApiConstants.STATISTICS) diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/security/api/ApiProtectionService.java b/jans-config-api/server/src/main/java/io/jans/configapi/security/api/ApiProtectionService.java index 20a9aaa8f7c..f9ba3ecfeed 100644 --- a/jans-config-api/server/src/main/java/io/jans/configapi/security/api/ApiProtectionService.java +++ b/jans-config-api/server/src/main/java/io/jans/configapi/security/api/ApiProtectionService.java @@ -28,7 +28,7 @@ import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @ApplicationScoped diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/security/client/AuthClientFactory.java b/jans-config-api/server/src/main/java/io/jans/configapi/security/client/AuthClientFactory.java index eafb6894490..e94091e1010 100644 --- a/jans-config-api/server/src/main/java/io/jans/configapi/security/client/AuthClientFactory.java +++ b/jans-config-api/server/src/main/java/io/jans/configapi/security/client/AuthClientFactory.java @@ -25,7 +25,7 @@ import static io.jans.as.model.jwk.JWKParameter.JSON_WEB_KEY_SET; import io.jans.configapi.core.util.Jackson; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; import jakarta.enterprise.context.ApplicationScoped; diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/security/service/OpenIdAuthorizationService.java b/jans-config-api/server/src/main/java/io/jans/configapi/security/service/OpenIdAuthorizationService.java index 8e57c2457ee..30bbe9fcbbb 100644 --- a/jans-config-api/server/src/main/java/io/jans/configapi/security/service/OpenIdAuthorizationService.java +++ b/jans-config-api/server/src/main/java/io/jans/configapi/security/service/OpenIdAuthorizationService.java @@ -29,7 +29,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; import org.slf4j.Logger; diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/security/service/OpenIdService.java b/jans-config-api/server/src/main/java/io/jans/configapi/security/service/OpenIdService.java index e116fa3ad4a..138c684901e 100644 --- a/jans-config-api/server/src/main/java/io/jans/configapi/security/service/OpenIdService.java +++ b/jans-config-api/server/src/main/java/io/jans/configapi/security/service/OpenIdService.java @@ -19,7 +19,7 @@ import jakarta.inject.Named; import jakarta.inject.Inject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/AgamaFlowService.java b/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/AgamaFlowService.java index 53f41b5499f..490c8db7cb3 100644 --- a/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/AgamaFlowService.java +++ b/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/AgamaFlowService.java @@ -24,7 +24,7 @@ import java.util.Set; import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @ApplicationScoped diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/AssetService.java b/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/AssetService.java index f59b4c45e7b..e3c552242f0 100644 --- a/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/AssetService.java +++ b/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/AssetService.java @@ -47,7 +47,7 @@ import jakarta.ws.rs.WebApplicationException; import org.apache.commons.codec.binary.Base64InputStream; import org.apache.commons.io.FilenameUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @ApplicationScoped diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/AttributeService.java b/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/AttributeService.java index 3a164664907..366351608e3 100644 --- a/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/AttributeService.java +++ b/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/AttributeService.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * @author Yuriy Zabrovarnyy diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/ClientAuthService.java b/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/ClientAuthService.java index 0751d4a4cb5..7cff63c2f55 100644 --- a/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/ClientAuthService.java +++ b/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/ClientAuthService.java @@ -18,7 +18,7 @@ import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @ApplicationScoped diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/ClientService.java b/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/ClientService.java index 10e9bd3c28f..72b30bb3e58 100644 --- a/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/ClientService.java +++ b/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/ClientService.java @@ -36,7 +36,7 @@ import java.util.Map; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; /** diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/ScopeService.java b/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/ScopeService.java index 9a16fe44f70..1c78ad3a522 100644 --- a/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/ScopeService.java +++ b/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/ScopeService.java @@ -23,7 +23,7 @@ import io.jans.util.StringHelper; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import java.util.*; diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/SessionService.java b/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/SessionService.java index cfd622f922a..9416747b02e 100644 --- a/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/SessionService.java +++ b/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/SessionService.java @@ -32,7 +32,7 @@ import java.util.Date; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @ApplicationScoped diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/TokenService.java b/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/TokenService.java index b7dfdcb6911..42b3cbcdff6 100644 --- a/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/TokenService.java +++ b/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/TokenService.java @@ -18,7 +18,7 @@ import jakarta.inject.Inject; import jakarta.ws.rs.NotFoundException; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @ApplicationScoped diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/UmaResourceService.java b/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/UmaResourceService.java index 455c5ac0bde..de189073b4f 100644 --- a/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/UmaResourceService.java +++ b/jans-config-api/server/src/main/java/io/jans/configapi/service/auth/UmaResourceService.java @@ -17,7 +17,7 @@ import io.jans.orm.model.base.SimpleBranch; import io.jans.orm.search.filter.Filter; import io.jans.util.StringHelper; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/service/status/StatusCheckerTimer.java b/jans-config-api/server/src/main/java/io/jans/configapi/service/status/StatusCheckerTimer.java index 545255e743b..346cfa15229 100644 --- a/jans-config-api/server/src/main/java/io/jans/configapi/service/status/StatusCheckerTimer.java +++ b/jans-config-api/server/src/main/java/io/jans/configapi/service/status/StatusCheckerTimer.java @@ -41,7 +41,7 @@ import jakarta.inject.Named; import org.apache.commons.exec.CommandLine; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/jans-config-api/shared/src/main/java/io/jans/configapi/core/rest/BaseResource.java b/jans-config-api/shared/src/main/java/io/jans/configapi/core/rest/BaseResource.java index 00272a375d2..e340d5f806d 100644 --- a/jans-config-api/shared/src/main/java/io/jans/configapi/core/rest/BaseResource.java +++ b/jans-config-api/shared/src/main/java/io/jans/configapi/core/rest/BaseResource.java @@ -31,7 +31,7 @@ import java.util.Map.Entry; import java.util.stream.Collectors; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jans-config-api/shared/src/main/java/io/jans/configapi/core/util/DataUtil.java b/jans-config-api/shared/src/main/java/io/jans/configapi/core/util/DataUtil.java index f244c6bc369..18363ca9ee8 100644 --- a/jans-config-api/shared/src/main/java/io/jans/configapi/core/util/DataUtil.java +++ b/jans-config-api/shared/src/main/java/io/jans/configapi/core/util/DataUtil.java @@ -32,7 +32,7 @@ import java.time.LocalDate; import java.time.LocalTime; import java.time.format.DateTimeFormatter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jans-config-api/shared/src/main/java/io/jans/configapi/core/util/ProtectionScopeType.java b/jans-config-api/shared/src/main/java/io/jans/configapi/core/util/ProtectionScopeType.java index 085e49b852c..c68a66367aa 100644 --- a/jans-config-api/shared/src/main/java/io/jans/configapi/core/util/ProtectionScopeType.java +++ b/jans-config-api/shared/src/main/java/io/jans/configapi/core/util/ProtectionScopeType.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public enum ProtectionScopeType { diff --git a/jans-config-api/shared/src/main/java/io/jans/configapi/core/util/Util.java b/jans-config-api/shared/src/main/java/io/jans/configapi/core/util/Util.java index ff881b28597..074c26dabd2 100644 --- a/jans-config-api/shared/src/main/java/io/jans/configapi/core/util/Util.java +++ b/jans-config-api/shared/src/main/java/io/jans/configapi/core/util/Util.java @@ -22,7 +22,7 @@ import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @ApplicationScoped diff --git a/jans-core/cache/src/main/java/io/jans/service/cache/NativePersistenceCacheProvider.java b/jans-core/cache/src/main/java/io/jans/service/cache/NativePersistenceCacheProvider.java index efffcdb14c4..e1f4b8e9c45 100644 --- a/jans-core/cache/src/main/java/io/jans/service/cache/NativePersistenceCacheProvider.java +++ b/jans-core/cache/src/main/java/io/jans/service/cache/NativePersistenceCacheProvider.java @@ -15,7 +15,7 @@ import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jans-core/cache/src/main/java/io/jans/service/cache/RedisClusterProvider.java b/jans-core/cache/src/main/java/io/jans/service/cache/RedisClusterProvider.java index 5fc6749d8f4..9b57b4dc887 100644 --- a/jans-core/cache/src/main/java/io/jans/service/cache/RedisClusterProvider.java +++ b/jans-core/cache/src/main/java/io/jans/service/cache/RedisClusterProvider.java @@ -6,8 +6,8 @@ package io.jans.service.cache; -import org.apache.commons.lang.SerializationUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.SerializationUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import redis.clients.jedis.HostAndPort; diff --git a/jans-core/cache/src/main/java/io/jans/service/cache/RedisProvider.java b/jans-core/cache/src/main/java/io/jans/service/cache/RedisProvider.java index dbb6c866b1d..6d61d0f83bb 100644 --- a/jans-core/cache/src/main/java/io/jans/service/cache/RedisProvider.java +++ b/jans-core/cache/src/main/java/io/jans/service/cache/RedisProvider.java @@ -7,7 +7,7 @@ package io.jans.service.cache; import io.jans.util.security.StringEncrypter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jans-core/cache/src/main/java/io/jans/service/cache/RedisProviderFactory.java b/jans-core/cache/src/main/java/io/jans/service/cache/RedisProviderFactory.java index 6fcf2236a02..decb5bfa010 100644 --- a/jans-core/cache/src/main/java/io/jans/service/cache/RedisProviderFactory.java +++ b/jans-core/cache/src/main/java/io/jans/service/cache/RedisProviderFactory.java @@ -6,7 +6,7 @@ package io.jans.service.cache; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jans-core/cache/src/main/java/io/jans/service/cache/RedisSentinelProvider.java b/jans-core/cache/src/main/java/io/jans/service/cache/RedisSentinelProvider.java index f832805ad12..6e4aa114834 100644 --- a/jans-core/cache/src/main/java/io/jans/service/cache/RedisSentinelProvider.java +++ b/jans-core/cache/src/main/java/io/jans/service/cache/RedisSentinelProvider.java @@ -6,7 +6,7 @@ package io.jans.service.cache; -import org.apache.commons.lang.SerializationUtils; +import org.apache.commons.lang3.SerializationUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import redis.clients.jedis.*; diff --git a/jans-core/cache/src/main/java/io/jans/service/cache/RedisShardedProvider.java b/jans-core/cache/src/main/java/io/jans/service/cache/RedisShardedProvider.java index 3bcf88bd777..135def828a1 100644 --- a/jans-core/cache/src/main/java/io/jans/service/cache/RedisShardedProvider.java +++ b/jans-core/cache/src/main/java/io/jans/service/cache/RedisShardedProvider.java @@ -6,8 +6,8 @@ package io.jans.service.cache; -import org.apache.commons.lang.SerializationUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.SerializationUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; import org.apache.http.conn.ssl.DefaultHostnameVerifier; import org.slf4j.Logger; diff --git a/jans-core/cache/src/main/java/io/jans/service/cache/RedisStandaloneProvider.java b/jans-core/cache/src/main/java/io/jans/service/cache/RedisStandaloneProvider.java index e8e7bbc6608..14a5cf33431 100644 --- a/jans-core/cache/src/main/java/io/jans/service/cache/RedisStandaloneProvider.java +++ b/jans-core/cache/src/main/java/io/jans/service/cache/RedisStandaloneProvider.java @@ -6,8 +6,8 @@ package io.jans.service.cache; -import org.apache.commons.lang.SerializationUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.SerializationUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.http.conn.ssl.DefaultHostnameVerifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jans-core/document-store/src/main/java/io/jans/service/document/store/provider/JcaDocumentStoreProvider.java b/jans-core/document-store/src/main/java/io/jans/service/document/store/provider/JcaDocumentStoreProvider.java index cc641745490..fd10d5d997d 100644 --- a/jans-core/document-store/src/main/java/io/jans/service/document/store/provider/JcaDocumentStoreProvider.java +++ b/jans-core/document-store/src/main/java/io/jans/service/document/store/provider/JcaDocumentStoreProvider.java @@ -32,7 +32,7 @@ import javax.jcr.version.VersionException; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.commons.JcrUtils; import org.apache.jackrabbit.rmi.repository.URLRemoteRepository; diff --git a/jans-core/jsf-util/src/main/java/io/jans/jsf2/converter/NewLineToBRConverter.java b/jans-core/jsf-util/src/main/java/io/jans/jsf2/converter/NewLineToBRConverter.java index 19f130422ff..4a896af3234 100644 --- a/jans-core/jsf-util/src/main/java/io/jans/jsf2/converter/NewLineToBRConverter.java +++ b/jans-core/jsf-util/src/main/java/io/jans/jsf2/converter/NewLineToBRConverter.java @@ -6,13 +6,13 @@ package io.jans.jsf2.converter; +import org.apache.commons.text.StringEscapeUtils; + import jakarta.faces.component.UIComponent; import jakarta.faces.context.FacesContext; import jakarta.faces.convert.Converter; import jakarta.faces.convert.FacesConverter; -import org.apache.commons.lang.StringEscapeUtils; - /** * @author: Yuriy Movchan Date: 07.11.2012 */ @@ -24,7 +24,7 @@ public Object getAsObject(FacesContext arg0, UIComponent converter, String str) } public String getAsString(FacesContext arg0, UIComponent converter, Object obj) { - return StringEscapeUtils.escapeHtml((String) obj).replace("\r\n", "
").replace("\n", "
"); + return StringEscapeUtils.escapeHtml4((String) obj).replace("\r\n", "
").replace("\n", "
"); } } diff --git a/jans-core/jsf-util/src/main/java/io/jans/jsf2/converter/UptimeConverter.java b/jans-core/jsf-util/src/main/java/io/jans/jsf2/converter/UptimeConverter.java index b7c3d8598bd..0d7b65dec10 100644 --- a/jans-core/jsf-util/src/main/java/io/jans/jsf2/converter/UptimeConverter.java +++ b/jans-core/jsf-util/src/main/java/io/jans/jsf2/converter/UptimeConverter.java @@ -15,7 +15,7 @@ import jakarta.faces.convert.ConverterException; import jakarta.faces.convert.FacesConverter; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; /** * @author: Yuriy Movchan Date: 11.24.2010 diff --git a/jans-core/message/src/main/java/io/jans/service/message/provider/PostgresMessageProvider.java b/jans-core/message/src/main/java/io/jans/service/message/provider/PostgresMessageProvider.java index c9195fcdacf..53a57b914d3 100644 --- a/jans-core/message/src/main/java/io/jans/service/message/provider/PostgresMessageProvider.java +++ b/jans-core/message/src/main/java/io/jans/service/message/provider/PostgresMessageProvider.java @@ -20,7 +20,7 @@ import java.util.concurrent.ExecutorService; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jans-core/message/src/main/java/io/jans/service/message/provider/RedisMessageProvider.java b/jans-core/message/src/main/java/io/jans/service/message/provider/RedisMessageProvider.java index 9b9ae089fd1..f9d2f70152f 100644 --- a/jans-core/message/src/main/java/io/jans/service/message/provider/RedisMessageProvider.java +++ b/jans-core/message/src/main/java/io/jans/service/message/provider/RedisMessageProvider.java @@ -11,7 +11,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jans-core/script/src/main/java/io/jans/service/custom/script/ExternalTypeCreator.java b/jans-core/script/src/main/java/io/jans/service/custom/script/ExternalTypeCreator.java index 2e3d377b214..f9af3ecd3e1 100644 --- a/jans-core/script/src/main/java/io/jans/service/custom/script/ExternalTypeCreator.java +++ b/jans-core/script/src/main/java/io/jans/service/custom/script/ExternalTypeCreator.java @@ -12,8 +12,8 @@ import io.jans.util.StringHelper; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.python.core.PyLong; import org.python.core.PyObject; import org.slf4j.Logger; diff --git a/jans-core/script/src/main/java/io/jans/service/custom/script/jit/SimpleJavaCompiler.java b/jans-core/script/src/main/java/io/jans/service/custom/script/jit/SimpleJavaCompiler.java index e5ff687d890..5b647de872c 100644 --- a/jans-core/script/src/main/java/io/jans/service/custom/script/jit/SimpleJavaCompiler.java +++ b/jans-core/script/src/main/java/io/jans/service/custom/script/jit/SimpleJavaCompiler.java @@ -1,6 +1,6 @@ package io.jans.service.custom.script.jit; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import javax.tools.*; import java.io.*; diff --git a/jans-core/service/src/main/java/io/jans/model/token/TokenType.java b/jans-core/service/src/main/java/io/jans/model/token/TokenType.java index beddf82f726..3eab9b81165 100644 --- a/jans-core/service/src/main/java/io/jans/model/token/TokenType.java +++ b/jans-core/service/src/main/java/io/jans/model/token/TokenType.java @@ -6,7 +6,7 @@ package io.jans.model.token; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * @author Yuriy Zabrovarnyy diff --git a/jans-core/service/src/main/java/io/jans/service/ObjectSerializationService.java b/jans-core/service/src/main/java/io/jans/service/ObjectSerializationService.java index bb9b4c08008..f7e27e14191 100644 --- a/jans-core/service/src/main/java/io/jans/service/ObjectSerializationService.java +++ b/jans-core/service/src/main/java/io/jans/service/ObjectSerializationService.java @@ -17,21 +17,19 @@ import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; -import jakarta.inject.Named; - import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.SerializationUtils; +import org.apache.commons.lang3.SerializationUtils; import org.slf4j.Logger; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + /** * Service class to serialize/deserialize object to file * * @author Yuriy Movchan Date: 01/27/2014 */ @ApplicationScoped -@Named public class ObjectSerializationService { @Inject diff --git a/jans-core/service/src/main/java/io/jans/service/cdi/util/CdiUtil.java b/jans-core/service/src/main/java/io/jans/service/cdi/util/CdiUtil.java index 4284d874232..06dd1d6dfc8 100644 --- a/jans-core/service/src/main/java/io/jans/service/cdi/util/CdiUtil.java +++ b/jans-core/service/src/main/java/io/jans/service/cdi/util/CdiUtil.java @@ -15,7 +15,7 @@ import jakarta.enterprise.inject.spi.BeanManager; import jakarta.enterprise.inject.spi.CDI; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jans-core/service/src/main/java/io/jans/service/logger/LoggerService.java b/jans-core/service/src/main/java/io/jans/service/logger/LoggerService.java index cc3a139d329..c2047f9e69d 100644 --- a/jans-core/service/src/main/java/io/jans/service/logger/LoggerService.java +++ b/jans-core/service/src/main/java/io/jans/service/logger/LoggerService.java @@ -14,7 +14,7 @@ import io.jans.service.timer.event.TimerEvent; import io.jans.service.timer.schedule.TimerSchedule; import io.jans.util.StringHelper; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.core.LoggerContext; import org.slf4j.Logger; diff --git a/jans-core/service/src/main/java/io/jans/service/metric/LdapEntryReporter.java b/jans-core/service/src/main/java/io/jans/service/metric/LdapEntryReporter.java index ec9c9f86c9a..0831baa4ef4 100644 --- a/jans-core/service/src/main/java/io/jans/service/metric/LdapEntryReporter.java +++ b/jans-core/service/src/main/java/io/jans/service/metric/LdapEntryReporter.java @@ -8,7 +8,7 @@ import com.codahale.metrics.*; import com.codahale.metrics.Timer; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import io.jans.model.ApplicationType; import io.jans.model.metric.MetricType; import io.jans.model.metric.counter.CounterMetricData; diff --git a/jans-core/service/src/main/java/io/jans/service/net/BaseHttpService.java b/jans-core/service/src/main/java/io/jans/service/net/BaseHttpService.java index 7d6e2a6b950..2212c94ab32 100644 --- a/jans-core/service/src/main/java/io/jans/service/net/BaseHttpService.java +++ b/jans-core/service/src/main/java/io/jans/service/net/BaseHttpService.java @@ -55,8 +55,6 @@ import jakarta.annotation.PostConstruct; import jakarta.inject.Inject; import jakarta.servlet.http.HttpServletRequest; -import org.apache.commons.lang.StringUtils; -import org.json.JSONObject; /** * Provides operations with http/https requests diff --git a/jans-core/standalone/src/main/java/io/jans/conf/service/ConfigurationFactory.java b/jans-core/standalone/src/main/java/io/jans/conf/service/ConfigurationFactory.java index f1046e4e33a..d035cf43247 100644 --- a/jans-core/standalone/src/main/java/io/jans/conf/service/ConfigurationFactory.java +++ b/jans-core/standalone/src/main/java/io/jans/conf/service/ConfigurationFactory.java @@ -19,7 +19,7 @@ import io.jans.orm.util.properties.FileConfiguration; import io.jans.util.security.PropertiesDecrypter; import io.jans.util.security.StringEncrypter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import io.jans.conf.model.AppConfigurationEntry; import io.jans.service.cache.CacheConfiguration; import io.jans.service.cache.InMemoryConfiguration; diff --git a/jans-core/util/pom.xml b/jans-core/util/pom.xml index d260d403506..64acdedd18f 100644 --- a/jans-core/util/pom.xml +++ b/jans-core/util/pom.xml @@ -50,8 +50,8 @@ commons-codec - commons-configuration - commons-configuration + org.apache.commons + commons-configuration2 org.apache.commons diff --git a/jans-core/util/src/main/java/io/jans/util/ArrayHelper.java b/jans-core/util/src/main/java/io/jans/util/ArrayHelper.java index 631da729343..6249b3818f5 100644 --- a/jans-core/util/src/main/java/io/jans/util/ArrayHelper.java +++ b/jans-core/util/src/main/java/io/jans/util/ArrayHelper.java @@ -13,7 +13,7 @@ * Utility methods to help work with arrays * * @author Yuriy Movchan Date: 10.21.2010 - * @see org.apache.commons.lang.ArrayUtils + * @see org.apache.commons.lang3.ArrayUtils */ public final class ArrayHelper { diff --git a/jans-core/util/src/main/java/io/jans/util/StringHelper.java b/jans-core/util/src/main/java/io/jans/util/StringHelper.java index e43993ec922..fff24cea35e 100644 --- a/jans-core/util/src/main/java/io/jans/util/StringHelper.java +++ b/jans-core/util/src/main/java/io/jans/util/StringHelper.java @@ -27,7 +27,7 @@ import org.apache.commons.text.StringEscapeUtils; /** - * @see org.apache.commons.lang.StringUtils + * @see org.apache.commons.lang3.StringUtils */ public final class StringHelper { diff --git a/jans-core/util/src/main/java/io/jans/util/ilocale/LocaleUtil.java b/jans-core/util/src/main/java/io/jans/util/ilocale/LocaleUtil.java index 7d64ef3ac9e..3712660da4c 100644 --- a/jans-core/util/src/main/java/io/jans/util/ilocale/LocaleUtil.java +++ b/jans-core/util/src/main/java/io/jans/util/ilocale/LocaleUtil.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Locale; -import org.apache.commons.lang.LocaleUtils; +import org.apache.commons.lang3.LocaleUtils; import org.apache.commons.lang3.tuple.Pair; /** diff --git a/jans-core/util/src/main/java/io/jans/util/properties/FileConfiguration.java b/jans-core/util/src/main/java/io/jans/util/properties/FileConfiguration.java index 72fa354fa12..634a7560690 100644 --- a/jans-core/util/src/main/java/io/jans/util/properties/FileConfiguration.java +++ b/jans-core/util/src/main/java/io/jans/util/properties/FileConfiguration.java @@ -13,12 +13,16 @@ import java.util.Properties; import java.util.concurrent.locks.ReentrantLock; -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.PropertiesConfiguration; -import io.jans.util.ArrayHelper; +import org.apache.commons.configuration2.PropertiesConfiguration; +import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder; +import org.apache.commons.configuration2.builder.fluent.Parameters; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.ex.ConfigurationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import io.jans.util.ArrayHelper; + /** * @author Yuriy Movchan Date: 03.29.2011 */ @@ -62,7 +66,15 @@ public FileConfiguration(String fileName, PropertiesConfiguration propertiesConf protected void loadProperties() { try { - this.propertiesConfiguration = new PropertiesConfiguration(this.fileName); + FileBasedConfigurationBuilder builder = + new FileBasedConfigurationBuilder(PropertiesConfiguration.class) + .configure(new Parameters().properties() + .setFileName(this.fileName) + .setThrowExceptionOnMissing(true) + .setListDelimiterHandler(new DefaultListDelimiterHandler(';')) + .setIncludesAllowed(false)); + this.propertiesConfiguration = builder.getConfiguration(); + this.loaded = true; } catch (ConfigurationException ex) { LOG.error(String.format("Failed to load '%s' configuration file from config folder", this.fileName)); @@ -75,7 +87,15 @@ protected void loadProperties() { protected void loadResourceProperties() { LOG.debug(String.format("Loading '%s' configuration file from resources", this.fileName)); try { - this.propertiesConfiguration = new PropertiesConfiguration(this.fileName); + FileBasedConfigurationBuilder builder = + new FileBasedConfigurationBuilder(PropertiesConfiguration.class) + .configure(new Parameters().properties() + .setFileName(this.fileName) + .setThrowExceptionOnMissing(true) + .setListDelimiterHandler(new DefaultListDelimiterHandler(';')) + .setIncludesAllowed(false)); + this.propertiesConfiguration = builder.getConfiguration(); + this.loaded = true; } catch (ConfigurationException ex) { LOG.error(String.format("Failed to load '%s' configuration file from resources", this.fileName)); @@ -116,14 +136,6 @@ public boolean isLoaded() { return loaded; } - public void saveProperties() { - try { - this.propertiesConfiguration.save(); - } catch (ConfigurationException ex) { - LOG.debug(String.format("Failed to save '%s' configuration file to tomcat config folder", this.fileName)); - } - } - public Properties getProperties() { if (properties == null) { properties = new Properties(); @@ -165,7 +177,7 @@ public String getString(String key) { return sb.toString(); } - return null; + return ""; } public String getString(String key, String defaultValue) { diff --git a/jans-fido2/model/src/main/java/io/jans/fido2/model/error/ErrorResponseFactory.java b/jans-fido2/model/src/main/java/io/jans/fido2/model/error/ErrorResponseFactory.java index b8c771ae92d..96bbd9e3ac2 100644 --- a/jans-fido2/model/src/main/java/io/jans/fido2/model/error/ErrorResponseFactory.java +++ b/jans-fido2/model/src/main/java/io/jans/fido2/model/error/ErrorResponseFactory.java @@ -11,7 +11,7 @@ import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.BooleanUtils; +import org.apache.commons.lang3.BooleanUtils; import org.apache.logging.log4j.ThreadContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jans-fido2/server/src/main/java/io/jans/fido2/service/app/ConfigurationFactory.java b/jans-fido2/server/src/main/java/io/jans/fido2/service/app/ConfigurationFactory.java index 712ffc06b83..684b64f7cd5 100644 --- a/jans-fido2/server/src/main/java/io/jans/fido2/service/app/ConfigurationFactory.java +++ b/jans-fido2/server/src/main/java/io/jans/fido2/service/app/ConfigurationFactory.java @@ -18,7 +18,7 @@ import jakarta.enterprise.inject.Produces; import jakarta.inject.Inject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import io.jans.exception.ConfigurationException; import io.jans.fido2.model.conf.AppConfiguration; import io.jans.fido2.model.conf.Conf; diff --git a/jans-fido2/server/src/main/java/io/jans/fido2/service/operation/AssertionService.java b/jans-fido2/server/src/main/java/io/jans/fido2/service/operation/AssertionService.java index 82ddcb6e799..0e20f94f01c 100644 --- a/jans-fido2/server/src/main/java/io/jans/fido2/service/operation/AssertionService.java +++ b/jans-fido2/server/src/main/java/io/jans/fido2/service/operation/AssertionService.java @@ -38,7 +38,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.ws.rs.core.Context; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.slf4j.Logger; diff --git a/jans-fido2/server/src/main/java/io/jans/fido2/service/persist/AuthenticationPersistenceService.java b/jans-fido2/server/src/main/java/io/jans/fido2/service/persist/AuthenticationPersistenceService.java index be3a9e40163..3fd971787a3 100644 --- a/jans-fido2/server/src/main/java/io/jans/fido2/service/persist/AuthenticationPersistenceService.java +++ b/jans-fido2/server/src/main/java/io/jans/fido2/service/persist/AuthenticationPersistenceService.java @@ -15,7 +15,7 @@ import io.jans.fido2.model.assertion.AssertionErrorResponseType; import io.jans.fido2.model.attestation.AttestationErrorResponseType; import io.jans.fido2.model.error.ErrorResponseFactory; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import io.jans.as.common.model.common.User; diff --git a/jans-fido2/server/src/main/java/io/jans/fido2/service/persist/RegistrationPersistenceService.java b/jans-fido2/server/src/main/java/io/jans/fido2/service/persist/RegistrationPersistenceService.java index 73f2dee82e5..ac00742ee7e 100644 --- a/jans-fido2/server/src/main/java/io/jans/fido2/service/persist/RegistrationPersistenceService.java +++ b/jans-fido2/server/src/main/java/io/jans/fido2/service/persist/RegistrationPersistenceService.java @@ -17,7 +17,7 @@ import io.jans.fido2.model.attestation.AttestationErrorResponseType; import io.jans.fido2.model.error.ErrorResponseFactory; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import io.jans.as.common.model.common.User; diff --git a/jans-fido2/server/src/main/java/io/jans/fido2/service/persist/UserSessionIdService.java b/jans-fido2/server/src/main/java/io/jans/fido2/service/persist/UserSessionIdService.java index e45c834f109..56bf3eb8701 100644 --- a/jans-fido2/server/src/main/java/io/jans/fido2/service/persist/UserSessionIdService.java +++ b/jans-fido2/server/src/main/java/io/jans/fido2/service/persist/UserSessionIdService.java @@ -6,7 +6,7 @@ package io.jans.fido2.service.persist; -import static org.apache.commons.lang.BooleanUtils.isTrue; +import static org.apache.commons.lang3.BooleanUtils.isTrue; import java.util.Date; import java.util.Map; diff --git a/jans-fido2/server/src/main/java/io/jans/fido2/service/verifier/CommonVerifiers.java b/jans-fido2/server/src/main/java/io/jans/fido2/service/verifier/CommonVerifiers.java index 37a3d09acb0..0860466ca75 100644 --- a/jans-fido2/server/src/main/java/io/jans/fido2/service/verifier/CommonVerifiers.java +++ b/jans-fido2/server/src/main/java/io/jans/fido2/service/verifier/CommonVerifiers.java @@ -16,7 +16,7 @@ import io.jans.fido2.model.error.ErrorResponseFactory; import org.apache.commons.codec.binary.Hex; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import com.fasterxml.jackson.databind.JsonNode; diff --git a/jans-keycloak-integration/spi/src/main/java/io/jans/kc/spi/custom/impl/DefaultJansThinBridgeProviderFactory.java b/jans-keycloak-integration/spi/src/main/java/io/jans/kc/spi/custom/impl/DefaultJansThinBridgeProviderFactory.java index 3565a88a24f..a1cdac8c55c 100644 --- a/jans-keycloak-integration/spi/src/main/java/io/jans/kc/spi/custom/impl/DefaultJansThinBridgeProviderFactory.java +++ b/jans-keycloak-integration/spi/src/main/java/io/jans/kc/spi/custom/impl/DefaultJansThinBridgeProviderFactory.java @@ -18,7 +18,7 @@ import java.io.File; import java.util.Properties; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jboss.logging.Logger; diff --git a/jans-keycloak-link/server/src/main/java/io/jans/keycloak/link/service/config/ConfigurationFactory.java b/jans-keycloak-link/server/src/main/java/io/jans/keycloak/link/service/config/ConfigurationFactory.java index b9fcaa51f29..7bfdb63793f 100644 --- a/jans-keycloak-link/server/src/main/java/io/jans/keycloak/link/service/config/ConfigurationFactory.java +++ b/jans-keycloak-link/server/src/main/java/io/jans/keycloak/link/service/config/ConfigurationFactory.java @@ -27,7 +27,7 @@ import jakarta.enterprise.inject.Instance; import jakarta.enterprise.inject.Produces; import jakarta.inject.Inject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import java.io.File; diff --git a/jans-link/model/src/main/java/io/jans/link/model/IdType.java b/jans-link/model/src/main/java/io/jans/link/model/IdType.java index dd9ef7058aa..35c45505dda 100644 --- a/jans-link/model/src/main/java/io/jans/link/model/IdType.java +++ b/jans-link/model/src/main/java/io/jans/link/model/IdType.java @@ -6,7 +6,7 @@ package io.jans.link.model; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * @author Yuriy Zabrovarnyy diff --git a/jans-link/server/src/main/java/io/jans/link/service/config/ConfigurationFactory.java b/jans-link/server/src/main/java/io/jans/link/service/config/ConfigurationFactory.java index e10ea1770d9..a079c91a770 100644 --- a/jans-link/server/src/main/java/io/jans/link/service/config/ConfigurationFactory.java +++ b/jans-link/server/src/main/java/io/jans/link/service/config/ConfigurationFactory.java @@ -9,7 +9,7 @@ import java.io.File; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import io.jans.link.model.config.AppConfiguration; diff --git a/jans-link/service/src/main/java/io/jans/link/service/Fido2DeviceService.java b/jans-link/service/src/main/java/io/jans/link/service/Fido2DeviceService.java index 689d9040153..800f10f22c5 100644 --- a/jans-link/service/src/main/java/io/jans/link/service/Fido2DeviceService.java +++ b/jans-link/service/src/main/java/io/jans/link/service/Fido2DeviceService.java @@ -15,7 +15,7 @@ import io.jans.util.StringHelper; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @ApplicationScoped diff --git a/jans-link/service/src/main/java/io/jans/link/service/FidoDeviceService.java b/jans-link/service/src/main/java/io/jans/link/service/FidoDeviceService.java index 4c49e881e7d..916ae422582 100644 --- a/jans-link/service/src/main/java/io/jans/link/service/FidoDeviceService.java +++ b/jans-link/service/src/main/java/io/jans/link/service/FidoDeviceService.java @@ -11,7 +11,7 @@ import io.jans.orm.search.filter.Filter; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; /** diff --git a/jans-link/service/src/main/java/io/jans/link/util/PropertyUtil.java b/jans-link/service/src/main/java/io/jans/link/util/PropertyUtil.java index 18eab8881f8..7df96a6a0ea 100644 --- a/jans-link/service/src/main/java/io/jans/link/util/PropertyUtil.java +++ b/jans-link/service/src/main/java/io/jans/link/util/PropertyUtil.java @@ -9,7 +9,7 @@ import java.util.List; import jakarta.enterprise.context.ApplicationScoped; -import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang3.StringEscapeUtils; import org.apache.log4j.Logger; import io.jans.model.SimpleProperty; diff --git a/jans-lock/lock-server/server/src/main/java/io/jans/lock/service/config/ApplicationFactory.java b/jans-lock/lock-server/server/src/main/java/io/jans/lock/service/config/ApplicationFactory.java index 18f0564842d..5dd15ee2dd9 100644 --- a/jans-lock/lock-server/server/src/main/java/io/jans/lock/service/config/ApplicationFactory.java +++ b/jans-lock/lock-server/server/src/main/java/io/jans/lock/service/config/ApplicationFactory.java @@ -16,7 +16,7 @@ package io.jans.lock.service.config; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import io.jans.config.GluuConfiguration; diff --git a/jans-lock/lock-server/service/pom.xml b/jans-lock/lock-server/service/pom.xml index f040feb6bec..02d91f09c5e 100644 --- a/jans-lock/lock-server/service/pom.xml +++ b/jans-lock/lock-server/service/pom.xml @@ -114,8 +114,8 @@ commons-collections - commons-lang - commons-lang + org.apache.commons + commons-lang3 commons-io diff --git a/jans-lock/lock-server/service/src/main/java/io/jans/lock/service/TokenEndpointService.java b/jans-lock/lock-server/service/src/main/java/io/jans/lock/service/TokenEndpointService.java index e42254aff7f..0505a5e5add 100644 --- a/jans-lock/lock-server/service/src/main/java/io/jans/lock/service/TokenEndpointService.java +++ b/jans-lock/lock-server/service/src/main/java/io/jans/lock/service/TokenEndpointService.java @@ -8,7 +8,7 @@ import java.util.Map.Entry; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateUtils; import org.apache.http.HttpEntity; import org.apache.http.entity.ContentType; diff --git a/jans-lock/lock-server/service/src/main/java/io/jans/lock/service/audit/AuditService.java b/jans-lock/lock-server/service/src/main/java/io/jans/lock/service/audit/AuditService.java index de3afbaa95c..9e6e8b7f3ab 100644 --- a/jans-lock/lock-server/service/src/main/java/io/jans/lock/service/audit/AuditService.java +++ b/jans-lock/lock-server/service/src/main/java/io/jans/lock/service/audit/AuditService.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Optional; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.http.entity.ContentType; import org.slf4j.Logger; diff --git a/jans-lock/lock-server/service/src/main/java/io/jans/lock/service/config/ConfigurationFactory.java b/jans-lock/lock-server/service/src/main/java/io/jans/lock/service/config/ConfigurationFactory.java index 0662427bcd0..a3a1052764d 100644 --- a/jans-lock/lock-server/service/src/main/java/io/jans/lock/service/config/ConfigurationFactory.java +++ b/jans-lock/lock-server/service/src/main/java/io/jans/lock/service/config/ConfigurationFactory.java @@ -19,7 +19,7 @@ import java.io.File; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import io.jans.exception.ConfigurationException; diff --git a/jans-lock/lock-server/service/src/main/java/io/jans/lock/service/filter/openid/OpenIdProtectionService.java b/jans-lock/lock-server/service/src/main/java/io/jans/lock/service/filter/openid/OpenIdProtectionService.java index 67b1bca31a5..7dcd87831f7 100644 --- a/jans-lock/lock-server/service/src/main/java/io/jans/lock/service/filter/openid/OpenIdProtectionService.java +++ b/jans-lock/lock-server/service/src/main/java/io/jans/lock/service/filter/openid/OpenIdProtectionService.java @@ -14,7 +14,7 @@ import java.util.Map; import java.util.Optional; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; import org.slf4j.Logger; diff --git a/jans-orm/cdi/src/main/java/io/jans/orm/service/PersistanceFactoryService.java b/jans-orm/cdi/src/main/java/io/jans/orm/service/PersistanceFactoryService.java index 54df1a611a2..5fe4d969373 100644 --- a/jans-orm/cdi/src/main/java/io/jans/orm/service/PersistanceFactoryService.java +++ b/jans-orm/cdi/src/main/java/io/jans/orm/service/PersistanceFactoryService.java @@ -16,7 +16,7 @@ import jakarta.enterprise.inject.Instance; import jakarta.inject.Inject; -import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration2.PropertiesConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jans-orm/ldap/src/main/java/io/jans/orm/ldap/operation/impl/LdapOperationServiceImpl.java b/jans-orm/ldap/src/main/java/io/jans/orm/ldap/operation/impl/LdapOperationServiceImpl.java index 431ab6c4f7f..b45fd5d95f0 100644 --- a/jans-orm/ldap/src/main/java/io/jans/orm/ldap/operation/impl/LdapOperationServiceImpl.java +++ b/jans-orm/ldap/src/main/java/io/jans/orm/ldap/operation/impl/LdapOperationServiceImpl.java @@ -24,7 +24,7 @@ import java.util.TreeSet; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jans-orm/spanner-sample/src/test/java/io/jans/orm/cloud/spanner/test/SessionId.java b/jans-orm/spanner-sample/src/test/java/io/jans/orm/cloud/spanner/test/SessionId.java index a41792e79c6..7a4d0a8b4dc 100644 --- a/jans-orm/spanner-sample/src/test/java/io/jans/orm/cloud/spanner/test/SessionId.java +++ b/jans-orm/spanner-sample/src/test/java/io/jans/orm/cloud/spanner/test/SessionId.java @@ -16,7 +16,7 @@ import javax.annotation.Nonnull; import jakarta.persistence.Transient; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import com.google.common.collect.Maps; diff --git a/jans-orm/sql-sample/src/test/java/io/jans/orm/sql/test/SessionId.java b/jans-orm/sql-sample/src/test/java/io/jans/orm/sql/test/SessionId.java index b8a4ce0be07..0681dad6622 100644 --- a/jans-orm/sql-sample/src/test/java/io/jans/orm/sql/test/SessionId.java +++ b/jans-orm/sql-sample/src/test/java/io/jans/orm/sql/test/SessionId.java @@ -15,7 +15,7 @@ import javax.annotation.Nonnull; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import com.google.common.collect.Maps; diff --git a/jans-orm/util/pom.xml b/jans-orm/util/pom.xml index dc3ac0bf80f..841cce5e1c1 100644 --- a/jans-orm/util/pom.xml +++ b/jans-orm/util/pom.xml @@ -31,8 +31,8 @@ - commons-configuration - commons-configuration + org.apache.commons + commons-configuration2 org.apache.commons diff --git a/jans-orm/util/src/main/java/io/jans/orm/util/ArrayHelper.java b/jans-orm/util/src/main/java/io/jans/orm/util/ArrayHelper.java index b3d57112f6b..d5a0777f56a 100644 --- a/jans-orm/util/src/main/java/io/jans/orm/util/ArrayHelper.java +++ b/jans-orm/util/src/main/java/io/jans/orm/util/ArrayHelper.java @@ -13,7 +13,7 @@ * Utility methods to help work with arrays * * @author Yuriy Movchan Date: 10.21.2010 - * @see org.apache.commons.lang.ArrayUtils + * @see org.apache.commons.lang3.ArrayUtils */ public final class ArrayHelper { diff --git a/jans-orm/util/src/main/java/io/jans/orm/util/StringHelper.java b/jans-orm/util/src/main/java/io/jans/orm/util/StringHelper.java index 4c017082c5e..9b78eb333cb 100644 --- a/jans-orm/util/src/main/java/io/jans/orm/util/StringHelper.java +++ b/jans-orm/util/src/main/java/io/jans/orm/util/StringHelper.java @@ -423,10 +423,4 @@ public static String unescapeJson(Object str) { return result; } - public static String escapeSql(Object str) { - String result = org.apache.commons.lang.StringEscapeUtils.escapeSql(String.valueOf(str)); - - return result; - } - } diff --git a/jans-orm/util/src/main/java/io/jans/orm/util/properties/FileConfiguration.java b/jans-orm/util/src/main/java/io/jans/orm/util/properties/FileConfiguration.java index cdcf1f6b25c..0a61b86aa10 100644 --- a/jans-orm/util/src/main/java/io/jans/orm/util/properties/FileConfiguration.java +++ b/jans-orm/util/src/main/java/io/jans/orm/util/properties/FileConfiguration.java @@ -13,12 +13,16 @@ import java.util.Properties; import java.util.concurrent.locks.ReentrantLock; -import io.jans.orm.util.ArrayHelper; -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration2.PropertiesConfiguration; +import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder; +import org.apache.commons.configuration2.builder.fluent.Parameters; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.ex.ConfigurationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import io.jans.orm.util.ArrayHelper; + /** * @author Yuriy Movchan Date: 03.29.2011 */ @@ -62,7 +66,15 @@ public FileConfiguration(String fileName, PropertiesConfiguration propertiesConf protected void loadProperties() { try { - this.propertiesConfiguration = new PropertiesConfiguration(this.fileName); + FileBasedConfigurationBuilder builder = + new FileBasedConfigurationBuilder(PropertiesConfiguration.class) + .configure(new Parameters().properties() + .setFileName(this.fileName) + .setThrowExceptionOnMissing(true) + .setListDelimiterHandler(new DefaultListDelimiterHandler(';')) + .setIncludesAllowed(false)); + this.propertiesConfiguration = builder.getConfiguration(); + this.loaded = true; } catch (ConfigurationException ex) { LOG.error(String.format("Failed to load '%s' configuration file from config folder", this.fileName)); @@ -75,7 +87,15 @@ protected void loadProperties() { protected void loadResourceProperties() { LOG.debug(String.format("Loading '%s' configuration file from resources", this.fileName)); try { - this.propertiesConfiguration = new PropertiesConfiguration(this.fileName); + FileBasedConfigurationBuilder builder = + new FileBasedConfigurationBuilder(PropertiesConfiguration.class) + .configure(new Parameters().properties() + .setFileName(this.fileName) + .setThrowExceptionOnMissing(true) + .setListDelimiterHandler(new DefaultListDelimiterHandler(';')) + .setIncludesAllowed(false)); + this.propertiesConfiguration = builder.getConfiguration(); + this.loaded = true; } catch (ConfigurationException ex) { LOG.error(String.format("Failed to load '%s' configuration file from resources", this.fileName)); @@ -116,14 +136,6 @@ public boolean isLoaded() { return loaded; } - public void saveProperties() { - try { - this.propertiesConfiguration.save(); - } catch (ConfigurationException ex) { - LOG.debug(String.format("Failed to save '%s' configuration file to tomcat config folder", this.fileName)); - } - } - public Properties getProperties() { if (properties == null) { properties = new Properties(); @@ -165,7 +177,7 @@ public String getString(String key) { return sb.toString(); } - return null; + return ""; } public String getString(String key, String defaultValue) { diff --git a/jans-scim/client/src/main/java/io/jans/scim2/client/rest/provider/AuthorizationInjectionFilter.java b/jans-scim/client/src/main/java/io/jans/scim2/client/rest/provider/AuthorizationInjectionFilter.java index d99fd82aa66..1d5ad676055 100644 --- a/jans-scim/client/src/main/java/io/jans/scim2/client/rest/provider/AuthorizationInjectionFilter.java +++ b/jans-scim/client/src/main/java/io/jans/scim2/client/rest/provider/AuthorizationInjectionFilter.java @@ -6,7 +6,7 @@ package io.jans.scim2.client.rest.provider; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/jans-scim/model/src/main/java/io/jans/scim/model/scim2/CustomAttributes.java b/jans-scim/model/src/main/java/io/jans/scim/model/scim2/CustomAttributes.java index aef1b6f1a9e..b749e9cdcea 100644 --- a/jans-scim/model/src/main/java/io/jans/scim/model/scim2/CustomAttributes.java +++ b/jans-scim/model/src/main/java/io/jans/scim/model/scim2/CustomAttributes.java @@ -6,7 +6,7 @@ package io.jans.scim.model.scim2; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import io.jans.scim.model.scim2.util.DateUtil; import io.jans.scim.model.scim2.util.IntrospectUtil; diff --git a/jans-scim/model/src/main/java/io/jans/scim/model/scim2/user/Name.java b/jans-scim/model/src/main/java/io/jans/scim/model/scim2/user/Name.java index 7d47a49e9b9..3b1e5f037bd 100644 --- a/jans-scim/model/src/main/java/io/jans/scim/model/scim2/user/Name.java +++ b/jans-scim/model/src/main/java/io/jans/scim/model/scim2/user/Name.java @@ -6,7 +6,7 @@ package io.jans.scim.model.scim2.user; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import io.jans.scim.model.scim2.annotations.Attribute; import io.jans.scim.model.scim2.annotations.StoreReference; diff --git a/jans-scim/model/src/main/java/io/jans/scim/model/scim2/util/IntrospectUtil.java b/jans-scim/model/src/main/java/io/jans/scim/model/scim2/util/IntrospectUtil.java index 4e1f6037e26..7d2228a7f74 100644 --- a/jans-scim/model/src/main/java/io/jans/scim/model/scim2/util/IntrospectUtil.java +++ b/jans-scim/model/src/main/java/io/jans/scim/model/scim2/util/IntrospectUtil.java @@ -6,7 +6,7 @@ package io.jans.scim.model.scim2.util; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; import io.jans.scim.model.scim2.AttributeDefinition; diff --git a/jans-scim/model/src/main/java/io/jans/scim/model/scim2/util/ScimResourceUtil.java b/jans-scim/model/src/main/java/io/jans/scim/model/scim2/util/ScimResourceUtil.java index 2f0c8026382..55cd8e927da 100644 --- a/jans-scim/model/src/main/java/io/jans/scim/model/scim2/util/ScimResourceUtil.java +++ b/jans-scim/model/src/main/java/io/jans/scim/model/scim2/util/ScimResourceUtil.java @@ -6,7 +6,7 @@ package io.jans.scim.model.scim2.util; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import io.jans.scim.model.scim2.BaseScimResource; diff --git a/jans-scim/server/pom.xml b/jans-scim/server/pom.xml index d9c43f395c1..6bed3919ff3 100644 --- a/jans-scim/server/pom.xml +++ b/jans-scim/server/pom.xml @@ -139,6 +139,10 @@ swagger-annotations 1.5.3-M1 + + commons-beanutils + commons-beanutils + \ No newline at end of file diff --git a/jans-scim/server/src/main/java/io/jans/scim/service/antlr/scimFilter/FilterListener.java b/jans-scim/server/src/main/java/io/jans/scim/service/antlr/scimFilter/FilterListener.java index f653ed16519..8eb291d4834 100644 --- a/jans-scim/server/src/main/java/io/jans/scim/service/antlr/scimFilter/FilterListener.java +++ b/jans-scim/server/src/main/java/io/jans/scim/service/antlr/scimFilter/FilterListener.java @@ -1,6 +1,6 @@ package io.jans.scim.service.antlr.scimFilter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import io.jans.scim.model.scim2.AttributeDefinition.Type; diff --git a/jans-scim/server/src/main/java/io/jans/scim/service/antlr/scimFilter/ScimFilterParserService.java b/jans-scim/server/src/main/java/io/jans/scim/service/antlr/scimFilter/ScimFilterParserService.java index 067393240dc..8ad0719807d 100644 --- a/jans-scim/server/src/main/java/io/jans/scim/service/antlr/scimFilter/ScimFilterParserService.java +++ b/jans-scim/server/src/main/java/io/jans/scim/service/antlr/scimFilter/ScimFilterParserService.java @@ -19,7 +19,7 @@ import org.antlr.v4.runtime.CommonTokenStream; import org.antlr.v4.runtime.tree.ParseTree; import org.antlr.v4.runtime.tree.ParseTreeWalker; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import io.jans.scim.model.exception.SCIMException; import io.jans.scim.model.scim2.BaseScimResource; import io.jans.scim.service.AttributeService; diff --git a/jans-scim/server/src/main/java/io/jans/scim/service/antlr/scimFilter/util/SimpleExpression.java b/jans-scim/server/src/main/java/io/jans/scim/service/antlr/scimFilter/util/SimpleExpression.java index ecc7aeb8f75..140eef252be 100644 --- a/jans-scim/server/src/main/java/io/jans/scim/service/antlr/scimFilter/util/SimpleExpression.java +++ b/jans-scim/server/src/main/java/io/jans/scim/service/antlr/scimFilter/util/SimpleExpression.java @@ -10,7 +10,7 @@ import java.util.Map; import java.time.Instant; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import io.jans.scim.model.scim2.AttributeDefinition.Type; diff --git a/jans-scim/server/src/main/java/io/jans/scim/service/scim2/ExtensionService.java b/jans-scim/server/src/main/java/io/jans/scim/service/scim2/ExtensionService.java index 132fd29bf29..66052a4e135 100644 --- a/jans-scim/server/src/main/java/io/jans/scim/service/scim2/ExtensionService.java +++ b/jans-scim/server/src/main/java/io/jans/scim/service/scim2/ExtensionService.java @@ -21,7 +21,7 @@ import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import io.jans.model.JansAttribute; import io.jans.scim.model.conf.AppConfiguration; diff --git a/jans-scim/server/src/main/java/io/jans/scim/service/scim2/ExternalConstraintsService.java b/jans-scim/server/src/main/java/io/jans/scim/service/scim2/ExternalConstraintsService.java index b54f710c166..3865fd7ffaa 100644 --- a/jans-scim/server/src/main/java/io/jans/scim/service/scim2/ExternalConstraintsService.java +++ b/jans-scim/server/src/main/java/io/jans/scim/service/scim2/ExternalConstraintsService.java @@ -19,7 +19,7 @@ import io.jans.scim.service.external.TokenDetails; import io.jans.scim.ws.rs.scim2.BaseScimWebService; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.codec.digest.DigestUtils; import org.slf4j.Logger; diff --git a/jans-scim/server/src/main/java/io/jans/scim/service/scim2/Scim2PatchService.java b/jans-scim/server/src/main/java/io/jans/scim/service/scim2/Scim2PatchService.java index 66fb39a6a0f..c6aa54cf27e 100644 --- a/jans-scim/server/src/main/java/io/jans/scim/service/scim2/Scim2PatchService.java +++ b/jans-scim/server/src/main/java/io/jans/scim/service/scim2/Scim2PatchService.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.antlr.v4.runtime.tree.ParseTree; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import io.jans.scim.model.exception.SCIMException; import io.jans.scim.model.scim2.AttributeDefinition; diff --git a/jans-scim/server/src/main/java/io/jans/scim/service/scim2/Scim2UserService.java b/jans-scim/server/src/main/java/io/jans/scim/service/scim2/Scim2UserService.java index 34eebc90e4b..66f49e783a3 100644 --- a/jans-scim/server/src/main/java/io/jans/scim/service/scim2/Scim2UserService.java +++ b/jans-scim/server/src/main/java/io/jans/scim/service/scim2/Scim2UserService.java @@ -25,7 +25,7 @@ import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.Response.Status; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/BaseScimWebService.java b/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/BaseScimWebService.java index df804177196..b7681655a38 100644 --- a/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/BaseScimWebService.java +++ b/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/BaseScimWebService.java @@ -22,7 +22,7 @@ import jakarta.ws.rs.core.UriInfo; import jakarta.ws.rs.Path; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/BulkWebService.java b/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/BulkWebService.java index d46483aca0f..946b3b44d34 100644 --- a/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/BulkWebService.java +++ b/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/BulkWebService.java @@ -36,7 +36,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import io.jans.scim.model.scim2.ErrorScimType; import io.jans.scim.model.scim2.bulk.BulkOperation; import io.jans.scim.model.scim2.bulk.BulkRequest; diff --git a/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/Fido2DeviceWebService.java b/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/Fido2DeviceWebService.java index a04f416e4c1..320a2a8169e 100644 --- a/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/Fido2DeviceWebService.java +++ b/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/Fido2DeviceWebService.java @@ -41,7 +41,7 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import io.jans.scim.model.exception.SCIMException; import io.jans.scim.model.fido2.Fido2DeviceData; diff --git a/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/FidoDeviceWebService.java b/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/FidoDeviceWebService.java index 0168bdb315f..e6948227320 100644 --- a/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/FidoDeviceWebService.java +++ b/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/FidoDeviceWebService.java @@ -34,7 +34,7 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import io.jans.orm.PersistenceEntryManager; import io.jans.orm.model.PagedResult; diff --git a/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/GroupWebService.java b/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/GroupWebService.java index 15ce9759c8b..27cc7108c7c 100644 --- a/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/GroupWebService.java +++ b/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/GroupWebService.java @@ -35,7 +35,7 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import io.jans.orm.exception.operation.DuplicateEntryException; import io.jans.orm.model.PagedResult; diff --git a/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/ScimResourcesUpdatedWebService.java b/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/ScimResourcesUpdatedWebService.java index 011ea73bea2..db7b0ea7941 100644 --- a/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/ScimResourcesUpdatedWebService.java +++ b/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/ScimResourcesUpdatedWebService.java @@ -2,7 +2,7 @@ //import io.jans.scim.ldap.service.IGroupService; //import io.jans.scim.model.GluuGroup; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import io.jans.model.attribute.AttributeDataType; import io.jans.scim.model.scim.ScimCustomPerson; //import io.jans.scim.model.scim2.group.GroupResource; diff --git a/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/UserWebService.java b/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/UserWebService.java index 383a8067873..cd3b0eed558 100644 --- a/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/UserWebService.java +++ b/jans-scim/server/src/main/java/io/jans/scim/ws/rs/scim2/UserWebService.java @@ -35,7 +35,7 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import io.jans.orm.exception.operation.DuplicateEntryException; import io.jans.orm.model.PagedResult; diff --git a/jans-scim/service/src/main/java/io/jans/scim/auth/oauth/BaseOAuthProtectionService.java b/jans-scim/service/src/main/java/io/jans/scim/auth/oauth/BaseOAuthProtectionService.java index c5ed03102f8..10d28585e36 100644 --- a/jans-scim/service/src/main/java/io/jans/scim/auth/oauth/BaseOAuthProtectionService.java +++ b/jans-scim/service/src/main/java/io/jans/scim/auth/oauth/BaseOAuthProtectionService.java @@ -33,7 +33,7 @@ import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; import org.slf4j.Logger; diff --git a/jans-scim/service/src/main/java/io/jans/scim/service/ConfigurationFactory.java b/jans-scim/service/src/main/java/io/jans/scim/service/ConfigurationFactory.java index 4ff0a1adb08..6857c30af43 100644 --- a/jans-scim/service/src/main/java/io/jans/scim/service/ConfigurationFactory.java +++ b/jans-scim/service/src/main/java/io/jans/scim/service/ConfigurationFactory.java @@ -37,7 +37,7 @@ import io.jans.util.StringHelper; import io.jans.util.properties.FileConfiguration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; /** diff --git a/jans-scim/service/src/main/java/io/jans/scim/service/Fido2DeviceService.java b/jans-scim/service/src/main/java/io/jans/scim/service/Fido2DeviceService.java index 1d3a0bc13f0..b865e009b6d 100644 --- a/jans-scim/service/src/main/java/io/jans/scim/service/Fido2DeviceService.java +++ b/jans-scim/service/src/main/java/io/jans/scim/service/Fido2DeviceService.java @@ -13,7 +13,7 @@ import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import io.jans.orm.PersistenceEntryManager; import io.jans.orm.exception.EntryPersistenceException; import io.jans.orm.search.filter.Filter; diff --git a/jans-scim/service/src/main/java/io/jans/scim/service/FidoDeviceService.java b/jans-scim/service/src/main/java/io/jans/scim/service/FidoDeviceService.java index c14af1f489f..5c2120cd58a 100644 --- a/jans-scim/service/src/main/java/io/jans/scim/service/FidoDeviceService.java +++ b/jans-scim/service/src/main/java/io/jans/scim/service/FidoDeviceService.java @@ -13,7 +13,7 @@ import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import io.jans.orm.PersistenceEntryManager; import io.jans.orm.search.filter.Filter;