diff --git a/broker/oidc/src/main/java/org/keycloak/broker/oidc/AbstractOAuth2IdentityProvider.java b/broker/oidc/src/main/java/org/keycloak/broker/oidc/AbstractOAuth2IdentityProvider.java index 376210db27..0c8dc3c8a2 100755 --- a/broker/oidc/src/main/java/org/keycloak/broker/oidc/AbstractOAuth2IdentityProvider.java +++ b/broker/oidc/src/main/java/org/keycloak/broker/oidc/AbstractOAuth2IdentityProvider.java @@ -20,7 +20,7 @@ package org.keycloak.broker.oidc; import org.codehaus.jackson.JsonNode; import org.codehaus.jackson.map.ObjectMapper; import org.jboss.logging.Logger; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.OAuth2Constants; import org.keycloak.broker.provider.util.SimpleHttp; import org.keycloak.broker.provider.AbstractIdentityProvider; diff --git a/broker/oidc/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProvider.java b/broker/oidc/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProvider.java index e49842bc51..4d5b45ed7f 100755 --- a/broker/oidc/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProvider.java +++ b/broker/oidc/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProvider.java @@ -42,7 +42,7 @@ import org.keycloak.services.messages.Messages; import org.keycloak.services.resources.IdentityBrokerService; import org.keycloak.services.resources.RealmsResource; import org.keycloak.util.JsonSerialization; -import org.keycloak.util.PemUtils; +import org.keycloak.common.util.PemUtils; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/broker/saml/src/main/java/org/keycloak/broker/saml/SAMLEndpoint.java b/broker/saml/src/main/java/org/keycloak/broker/saml/SAMLEndpoint.java index 24b56bbcb3..c237b8db1c 100755 --- a/broker/saml/src/main/java/org/keycloak/broker/saml/SAMLEndpoint.java +++ b/broker/saml/src/main/java/org/keycloak/broker/saml/SAMLEndpoint.java @@ -1,8 +1,8 @@ package org.keycloak.broker.saml; import org.jboss.logging.Logger; -import org.keycloak.ClientConnection; -import org.keycloak.VerificationException; +import org.keycloak.common.ClientConnection; +import org.keycloak.common.VerificationException; import org.keycloak.broker.provider.BrokeredIdentityContext; import org.keycloak.broker.provider.IdentityBrokerException; import org.keycloak.broker.provider.IdentityProvider; diff --git a/client-api/src/main/java/org/keycloak/client/registration/ClientRegistration.java b/client-api/src/main/java/org/keycloak/client/registration/ClientRegistration.java index 24422c5667..82a3b3759b 100644 --- a/client-api/src/main/java/org/keycloak/client/registration/ClientRegistration.java +++ b/client-api/src/main/java/org/keycloak/client/registration/ClientRegistration.java @@ -12,7 +12,7 @@ import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.keycloak.representations.idm.ClientRepresentation; -import org.keycloak.util.Base64; +import org.keycloak.common.util.Base64; import org.keycloak.util.JsonSerialization; import java.io.IOException; diff --git a/common/pom.xml b/common/pom.xml index 3d9cb48ae6..3bfb411f8e 100755 --- a/common/pom.xml +++ b/common/pom.xml @@ -18,7 +18,7 @@ ${maven.build.timestamp} yyyy-MM-dd HH:mm - org.keycloak.* + org.keycloak.common.* *;resolution:=optional diff --git a/common/src/main/java/org/keycloak/ClientConnection.java b/common/src/main/java/org/keycloak/common/ClientConnection.java similarity index 90% rename from common/src/main/java/org/keycloak/ClientConnection.java rename to common/src/main/java/org/keycloak/common/ClientConnection.java index a9e95c59a6..789574a88d 100755 --- a/common/src/main/java/org/keycloak/ClientConnection.java +++ b/common/src/main/java/org/keycloak/common/ClientConnection.java @@ -1,4 +1,4 @@ -package org.keycloak; +package org.keycloak.common; /** * Information about the client connection diff --git a/common/src/main/java/org/keycloak/VerificationException.java b/common/src/main/java/org/keycloak/common/VerificationException.java similarity index 94% rename from common/src/main/java/org/keycloak/VerificationException.java rename to common/src/main/java/org/keycloak/common/VerificationException.java index ee34b71829..509e29eee6 100755 --- a/common/src/main/java/org/keycloak/VerificationException.java +++ b/common/src/main/java/org/keycloak/common/VerificationException.java @@ -1,4 +1,4 @@ -package org.keycloak; +package org.keycloak.common; /** * @author Bill Burke diff --git a/common/src/main/java/org/keycloak/Version.java b/common/src/main/java/org/keycloak/common/Version.java similarity index 94% rename from common/src/main/java/org/keycloak/Version.java rename to common/src/main/java/org/keycloak/common/Version.java index 65096b24ec..73c4959665 100755 --- a/common/src/main/java/org/keycloak/Version.java +++ b/common/src/main/java/org/keycloak/common/Version.java @@ -1,6 +1,6 @@ -package org.keycloak; +package org.keycloak.common; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import java.io.IOException; import java.io.InputStream; diff --git a/common/src/main/java/org/keycloak/constants/GenericConstants.java b/common/src/main/java/org/keycloak/common/constants/GenericConstants.java similarity index 81% rename from common/src/main/java/org/keycloak/constants/GenericConstants.java rename to common/src/main/java/org/keycloak/common/constants/GenericConstants.java index a5a8f83e43..91248c6e75 100644 --- a/common/src/main/java/org/keycloak/constants/GenericConstants.java +++ b/common/src/main/java/org/keycloak/common/constants/GenericConstants.java @@ -1,4 +1,4 @@ -package org.keycloak.constants; +package org.keycloak.common.constants; /** * @author Marek Posolda diff --git a/common/src/main/java/org/keycloak/constants/KerberosConstants.java b/common/src/main/java/org/keycloak/common/constants/KerberosConstants.java similarity index 98% rename from common/src/main/java/org/keycloak/constants/KerberosConstants.java rename to common/src/main/java/org/keycloak/common/constants/KerberosConstants.java index 3b7aa60934..9ae145e8a0 100644 --- a/common/src/main/java/org/keycloak/constants/KerberosConstants.java +++ b/common/src/main/java/org/keycloak/common/constants/KerberosConstants.java @@ -1,4 +1,4 @@ -package org.keycloak.constants; +package org.keycloak.common.constants; /** * @author Marek Posolda diff --git a/common/src/main/java/org/keycloak/constants/ServiceAccountConstants.java b/common/src/main/java/org/keycloak/common/constants/ServiceAccountConstants.java similarity index 92% rename from common/src/main/java/org/keycloak/constants/ServiceAccountConstants.java rename to common/src/main/java/org/keycloak/common/constants/ServiceAccountConstants.java index 561a5d078b..8218baa4cd 100644 --- a/common/src/main/java/org/keycloak/constants/ServiceAccountConstants.java +++ b/common/src/main/java/org/keycloak/common/constants/ServiceAccountConstants.java @@ -1,4 +1,4 @@ -package org.keycloak.constants; +package org.keycloak.common.constants; /** * @author Marek Posolda diff --git a/common/src/main/java/org/keycloak/enums/RelativeUrlsUsed.java b/common/src/main/java/org/keycloak/common/enums/RelativeUrlsUsed.java similarity index 96% rename from common/src/main/java/org/keycloak/enums/RelativeUrlsUsed.java rename to common/src/main/java/org/keycloak/common/enums/RelativeUrlsUsed.java index cadeb14570..91bb89b82c 100644 --- a/common/src/main/java/org/keycloak/enums/RelativeUrlsUsed.java +++ b/common/src/main/java/org/keycloak/common/enums/RelativeUrlsUsed.java @@ -1,4 +1,4 @@ -package org.keycloak.enums; +package org.keycloak.common.enums; /** * @author Marek Posolda diff --git a/common/src/main/java/org/keycloak/enums/SslRequired.java b/common/src/main/java/org/keycloak/common/enums/SslRequired.java similarity index 92% rename from common/src/main/java/org/keycloak/enums/SslRequired.java rename to common/src/main/java/org/keycloak/common/enums/SslRequired.java index 0dd34ab52b..249a7835fb 100644 --- a/common/src/main/java/org/keycloak/enums/SslRequired.java +++ b/common/src/main/java/org/keycloak/common/enums/SslRequired.java @@ -1,6 +1,6 @@ -package org.keycloak.enums; +package org.keycloak.common.enums; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/common/src/main/java/org/keycloak/util/Base64.java b/common/src/main/java/org/keycloak/common/util/Base64.java similarity index 99% rename from common/src/main/java/org/keycloak/util/Base64.java rename to common/src/main/java/org/keycloak/common/util/Base64.java index ee837936fb..163bf2eead 100644 --- a/common/src/main/java/org/keycloak/util/Base64.java +++ b/common/src/main/java/org/keycloak/common/util/Base64.java @@ -1,4 +1,4 @@ -package org.keycloak.util; +package org.keycloak.common.util; /** *

Encodes and decodes to and from Base64 notation.

diff --git a/common/src/main/java/org/keycloak/util/Base64Url.java b/common/src/main/java/org/keycloak/common/util/Base64Url.java similarity index 95% rename from common/src/main/java/org/keycloak/util/Base64Url.java rename to common/src/main/java/org/keycloak/common/util/Base64Url.java index c5d99e8b27..3cb597936a 100755 --- a/common/src/main/java/org/keycloak/util/Base64Url.java +++ b/common/src/main/java/org/keycloak/common/util/Base64Url.java @@ -1,8 +1,6 @@ -package org.keycloak.util; +package org.keycloak.common.util; -import org.keycloak.util.Base64; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/common/src/main/java/org/keycloak/util/BouncyIntegration.java b/common/src/main/java/org/keycloak/common/util/BouncyIntegration.java similarity index 92% rename from common/src/main/java/org/keycloak/util/BouncyIntegration.java rename to common/src/main/java/org/keycloak/common/util/BouncyIntegration.java index 0a7e6a3b67..f9cec9c4e0 100755 --- a/common/src/main/java/org/keycloak/util/BouncyIntegration.java +++ b/common/src/main/java/org/keycloak/common/util/BouncyIntegration.java @@ -1,4 +1,4 @@ -package org.keycloak.util; +package org.keycloak.common.util; import org.bouncycastle.jce.provider.BouncyCastleProvider; diff --git a/common/src/main/java/org/keycloak/util/CertificateUtils.java b/common/src/main/java/org/keycloak/common/util/CertificateUtils.java similarity index 99% rename from common/src/main/java/org/keycloak/util/CertificateUtils.java rename to common/src/main/java/org/keycloak/common/util/CertificateUtils.java index 8a47c7f48f..8bdf98fe2e 100755 --- a/common/src/main/java/org/keycloak/util/CertificateUtils.java +++ b/common/src/main/java/org/keycloak/common/util/CertificateUtils.java @@ -1,10 +1,9 @@ -package org.keycloak.util; +package org.keycloak.common.util; import java.math.BigInteger; import java.security.KeyPair; import java.security.PrivateKey; import java.security.SecureRandom; -import java.security.Security; import java.security.cert.X509Certificate; import java.util.Calendar; import java.util.Date; diff --git a/common/src/main/java/org/keycloak/util/CollectionUtil.java b/common/src/main/java/org/keycloak/common/util/CollectionUtil.java similarity index 95% rename from common/src/main/java/org/keycloak/util/CollectionUtil.java rename to common/src/main/java/org/keycloak/common/util/CollectionUtil.java index 41df40e698..747b0bb567 100644 --- a/common/src/main/java/org/keycloak/util/CollectionUtil.java +++ b/common/src/main/java/org/keycloak/common/util/CollectionUtil.java @@ -1,4 +1,4 @@ -package org.keycloak.util; +package org.keycloak.common.util; import java.util.Collection; import java.util.Iterator; diff --git a/common/src/main/java/org/keycloak/util/DerUtils.java b/common/src/main/java/org/keycloak/common/util/DerUtils.java similarity index 98% rename from common/src/main/java/org/keycloak/util/DerUtils.java rename to common/src/main/java/org/keycloak/common/util/DerUtils.java index a3aa745a45..5ae4b70212 100755 --- a/common/src/main/java/org/keycloak/util/DerUtils.java +++ b/common/src/main/java/org/keycloak/common/util/DerUtils.java @@ -1,4 +1,4 @@ -package org.keycloak.util; +package org.keycloak.common.util; import java.io.DataInputStream; import java.io.InputStream; diff --git a/common/src/main/java/org/keycloak/util/Encode.java b/common/src/main/java/org/keycloak/common/util/Encode.java similarity index 99% rename from common/src/main/java/org/keycloak/util/Encode.java rename to common/src/main/java/org/keycloak/common/util/Encode.java index 0f3c496a36..3a0ab14a3b 100755 --- a/common/src/main/java/org/keycloak/util/Encode.java +++ b/common/src/main/java/org/keycloak/common/util/Encode.java @@ -1,4 +1,4 @@ -package org.keycloak.util; +package org.keycloak.common.util; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; diff --git a/common/src/main/java/org/keycloak/util/EnvUtil.java b/common/src/main/java/org/keycloak/common/util/EnvUtil.java similarity index 96% rename from common/src/main/java/org/keycloak/util/EnvUtil.java rename to common/src/main/java/org/keycloak/common/util/EnvUtil.java index f40db1e6db..ca4d518c27 100755 --- a/common/src/main/java/org/keycloak/util/EnvUtil.java +++ b/common/src/main/java/org/keycloak/common/util/EnvUtil.java @@ -1,4 +1,4 @@ -package org.keycloak.util; +package org.keycloak.common.util; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/common/src/main/java/org/keycloak/util/FindFile.java b/common/src/main/java/org/keycloak/common/util/FindFile.java similarity index 93% rename from common/src/main/java/org/keycloak/util/FindFile.java rename to common/src/main/java/org/keycloak/common/util/FindFile.java index d7f1579e4a..6b68c6ba8d 100755 --- a/common/src/main/java/org/keycloak/util/FindFile.java +++ b/common/src/main/java/org/keycloak/common/util/FindFile.java @@ -1,6 +1,6 @@ -package org.keycloak.util; +package org.keycloak.common.util; -import org.keycloak.constants.GenericConstants; +import org.keycloak.common.constants.GenericConstants; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/common/src/main/java/org/keycloak/util/HostUtils.java b/common/src/main/java/org/keycloak/common/util/HostUtils.java similarity index 98% rename from common/src/main/java/org/keycloak/util/HostUtils.java rename to common/src/main/java/org/keycloak/common/util/HostUtils.java index 391964aac8..05bf2829a4 100644 --- a/common/src/main/java/org/keycloak/util/HostUtils.java +++ b/common/src/main/java/org/keycloak/common/util/HostUtils.java @@ -1,4 +1,4 @@ -package org.keycloak.util; +package org.keycloak.common.util; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/common/src/main/java/org/keycloak/util/HtmlUtils.java b/common/src/main/java/org/keycloak/common/util/HtmlUtils.java similarity index 97% rename from common/src/main/java/org/keycloak/util/HtmlUtils.java rename to common/src/main/java/org/keycloak/common/util/HtmlUtils.java index 2387482df4..a320ad48b0 100755 --- a/common/src/main/java/org/keycloak/util/HtmlUtils.java +++ b/common/src/main/java/org/keycloak/common/util/HtmlUtils.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.util; +package org.keycloak.common.util; /** * @author pedroigor diff --git a/common/src/main/java/org/keycloak/util/KerberosSerializationUtils.java b/common/src/main/java/org/keycloak/common/util/KerberosSerializationUtils.java similarity index 98% rename from common/src/main/java/org/keycloak/util/KerberosSerializationUtils.java rename to common/src/main/java/org/keycloak/common/util/KerberosSerializationUtils.java index e95beaa7ab..ef2053a8f7 100644 --- a/common/src/main/java/org/keycloak/util/KerberosSerializationUtils.java +++ b/common/src/main/java/org/keycloak/common/util/KerberosSerializationUtils.java @@ -1,4 +1,4 @@ -package org.keycloak.util; +package org.keycloak.common.util; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -12,13 +12,12 @@ import java.lang.reflect.Method; import javax.security.auth.kerberos.KerberosTicket; -import org.keycloak.util.Base64; import org.ietf.jgss.GSSCredential; import org.ietf.jgss.GSSException; import org.ietf.jgss.GSSManager; import org.ietf.jgss.Oid; -import org.keycloak.constants.KerberosConstants; -import org.keycloak.util.reflections.Reflections; +import org.keycloak.common.constants.KerberosConstants; +import org.keycloak.common.util.reflections.Reflections; import sun.security.jgss.GSSCredentialImpl; import sun.security.jgss.GSSManagerImpl; import sun.security.jgss.krb5.Krb5InitCredential; diff --git a/common/src/main/java/org/keycloak/util/KeycloakUriBuilder.java b/common/src/main/java/org/keycloak/common/util/KeycloakUriBuilder.java similarity index 99% rename from common/src/main/java/org/keycloak/util/KeycloakUriBuilder.java rename to common/src/main/java/org/keycloak/common/util/KeycloakUriBuilder.java index f27979c6fe..328916e0b9 100755 --- a/common/src/main/java/org/keycloak/util/KeycloakUriBuilder.java +++ b/common/src/main/java/org/keycloak/common/util/KeycloakUriBuilder.java @@ -1,4 +1,4 @@ -package org.keycloak.util; +package org.keycloak.common.util; import java.net.URI; diff --git a/common/src/main/java/org/keycloak/util/KeystoreUtil.java b/common/src/main/java/org/keycloak/common/util/KeystoreUtil.java similarity index 95% rename from common/src/main/java/org/keycloak/util/KeystoreUtil.java rename to common/src/main/java/org/keycloak/common/util/KeystoreUtil.java index 0be87bc553..bebf6b6bb6 100755 --- a/common/src/main/java/org/keycloak/util/KeystoreUtil.java +++ b/common/src/main/java/org/keycloak/common/util/KeystoreUtil.java @@ -1,4 +1,4 @@ -package org.keycloak.util; +package org.keycloak.common.util; import java.io.File; import java.io.FileInputStream; @@ -6,7 +6,7 @@ import java.io.InputStream; import java.security.KeyStore; import java.security.PrivateKey; -import org.keycloak.constants.GenericConstants; +import org.keycloak.common.constants.GenericConstants; /** * @author Bill Burke diff --git a/common/src/main/java/org/keycloak/util/MimeTypeUtil.java b/common/src/main/java/org/keycloak/common/util/MimeTypeUtil.java similarity index 95% rename from common/src/main/java/org/keycloak/util/MimeTypeUtil.java rename to common/src/main/java/org/keycloak/common/util/MimeTypeUtil.java index 75270bd382..6993216b7f 100644 --- a/common/src/main/java/org/keycloak/util/MimeTypeUtil.java +++ b/common/src/main/java/org/keycloak/common/util/MimeTypeUtil.java @@ -1,4 +1,4 @@ -package org.keycloak.util; +package org.keycloak.common.util; import javax.activation.MimetypesFileTypeMap; import java.io.File; diff --git a/common/src/main/java/org/keycloak/util/MultivaluedHashMap.java b/common/src/main/java/org/keycloak/common/util/MultivaluedHashMap.java similarity index 98% rename from common/src/main/java/org/keycloak/util/MultivaluedHashMap.java rename to common/src/main/java/org/keycloak/common/util/MultivaluedHashMap.java index bdfb77fd95..97dc6ed253 100755 --- a/common/src/main/java/org/keycloak/util/MultivaluedHashMap.java +++ b/common/src/main/java/org/keycloak/common/util/MultivaluedHashMap.java @@ -1,4 +1,4 @@ -package org.keycloak.util; +package org.keycloak.common.util; import java.util.ArrayList; import java.util.Collection; diff --git a/common/src/main/java/org/keycloak/util/NetworkUtils.java b/common/src/main/java/org/keycloak/common/util/NetworkUtils.java similarity index 99% rename from common/src/main/java/org/keycloak/util/NetworkUtils.java rename to common/src/main/java/org/keycloak/common/util/NetworkUtils.java index 8d9bd15246..7841cad9e3 100644 --- a/common/src/main/java/org/keycloak/util/NetworkUtils.java +++ b/common/src/main/java/org/keycloak/common/util/NetworkUtils.java @@ -1,4 +1,4 @@ -package org.keycloak.util; +package org.keycloak.common.util; /* * JBoss, Home of Professional Open Source. diff --git a/common/src/main/java/org/keycloak/util/ObjectUtil.java b/common/src/main/java/org/keycloak/common/util/ObjectUtil.java similarity index 94% rename from common/src/main/java/org/keycloak/util/ObjectUtil.java rename to common/src/main/java/org/keycloak/common/util/ObjectUtil.java index 23a6bef345..cec9ea984b 100644 --- a/common/src/main/java/org/keycloak/util/ObjectUtil.java +++ b/common/src/main/java/org/keycloak/common/util/ObjectUtil.java @@ -1,4 +1,4 @@ -package org.keycloak.util; +package org.keycloak.common.util; /** * @author Marek Posolda diff --git a/common/src/main/java/org/keycloak/util/PathHelper.java b/common/src/main/java/org/keycloak/common/util/PathHelper.java similarity index 98% rename from common/src/main/java/org/keycloak/util/PathHelper.java rename to common/src/main/java/org/keycloak/common/util/PathHelper.java index 644f03e811..0a3c68d011 100755 --- a/common/src/main/java/org/keycloak/util/PathHelper.java +++ b/common/src/main/java/org/keycloak/common/util/PathHelper.java @@ -1,7 +1,7 @@ /** * */ -package org.keycloak.util; +package org.keycloak.common.util; import java.util.regex.Pattern; diff --git a/common/src/main/java/org/keycloak/util/PemUtils.java b/common/src/main/java/org/keycloak/common/util/PemUtils.java similarity index 97% rename from common/src/main/java/org/keycloak/util/PemUtils.java rename to common/src/main/java/org/keycloak/common/util/PemUtils.java index ea07e35855..6916d4d820 100755 --- a/common/src/main/java/org/keycloak/util/PemUtils.java +++ b/common/src/main/java/org/keycloak/common/util/PemUtils.java @@ -1,8 +1,6 @@ -package org.keycloak.util; +package org.keycloak.common.util; -import org.keycloak.util.Base64; - import java.io.ByteArrayInputStream; import java.io.DataInputStream; import java.io.IOException; diff --git a/common/src/main/java/org/keycloak/util/ServerCookie.java b/common/src/main/java/org/keycloak/common/util/ServerCookie.java similarity index 99% rename from common/src/main/java/org/keycloak/util/ServerCookie.java rename to common/src/main/java/org/keycloak/common/util/ServerCookie.java index 777fb50db4..f9b2ad3162 100755 --- a/common/src/main/java/org/keycloak/util/ServerCookie.java +++ b/common/src/main/java/org/keycloak/common/util/ServerCookie.java @@ -1,4 +1,4 @@ -package org.keycloak.util; +package org.keycloak.common.util; import java.io.Serializable; import java.text.DateFormat; diff --git a/common/src/main/java/org/keycloak/util/StreamUtil.java b/common/src/main/java/org/keycloak/common/util/StreamUtil.java similarity index 96% rename from common/src/main/java/org/keycloak/util/StreamUtil.java rename to common/src/main/java/org/keycloak/common/util/StreamUtil.java index 059932c09a..7a570296bd 100755 --- a/common/src/main/java/org/keycloak/util/StreamUtil.java +++ b/common/src/main/java/org/keycloak/common/util/StreamUtil.java @@ -1,4 +1,4 @@ -package org.keycloak.util; +package org.keycloak.common.util; import java.io.BufferedReader; import java.io.IOException; diff --git a/common/src/main/java/org/keycloak/util/StringPropertyReplacer.java b/common/src/main/java/org/keycloak/common/util/StringPropertyReplacer.java similarity index 99% rename from common/src/main/java/org/keycloak/util/StringPropertyReplacer.java rename to common/src/main/java/org/keycloak/common/util/StringPropertyReplacer.java index 14c90459fa..a01665b003 100755 --- a/common/src/main/java/org/keycloak/util/StringPropertyReplacer.java +++ b/common/src/main/java/org/keycloak/common/util/StringPropertyReplacer.java @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.keycloak.util; +package org.keycloak.common.util; import java.io.File; import java.util.Properties; diff --git a/common/src/main/java/org/keycloak/util/SystemEnvProperties.java b/common/src/main/java/org/keycloak/common/util/SystemEnvProperties.java similarity index 94% rename from common/src/main/java/org/keycloak/util/SystemEnvProperties.java rename to common/src/main/java/org/keycloak/common/util/SystemEnvProperties.java index 1e54b52ce2..7d17e8ca65 100644 --- a/common/src/main/java/org/keycloak/util/SystemEnvProperties.java +++ b/common/src/main/java/org/keycloak/common/util/SystemEnvProperties.java @@ -1,4 +1,4 @@ -package org.keycloak.util; +package org.keycloak.common.util; import java.util.Properties; diff --git a/common/src/main/java/org/keycloak/util/Time.java b/common/src/main/java/org/keycloak/common/util/Time.java similarity index 94% rename from common/src/main/java/org/keycloak/util/Time.java rename to common/src/main/java/org/keycloak/common/util/Time.java index a5334ddb03..525f746215 100644 --- a/common/src/main/java/org/keycloak/util/Time.java +++ b/common/src/main/java/org/keycloak/common/util/Time.java @@ -1,4 +1,4 @@ -package org.keycloak.util; +package org.keycloak.common.util; import java.util.Date; diff --git a/common/src/main/java/org/keycloak/util/UriUtils.java b/common/src/main/java/org/keycloak/common/util/UriUtils.java similarity index 98% rename from common/src/main/java/org/keycloak/util/UriUtils.java rename to common/src/main/java/org/keycloak/common/util/UriUtils.java index 775729adb8..d332979d75 100755 --- a/common/src/main/java/org/keycloak/util/UriUtils.java +++ b/common/src/main/java/org/keycloak/common/util/UriUtils.java @@ -1,4 +1,4 @@ -package org.keycloak.util; +package org.keycloak.common.util; import java.io.UnsupportedEncodingException; import java.net.URI; diff --git a/common/src/main/java/org/keycloak/util/reflections/Reflections.java b/common/src/main/java/org/keycloak/common/util/reflections/Reflections.java similarity index 99% rename from common/src/main/java/org/keycloak/util/reflections/Reflections.java rename to common/src/main/java/org/keycloak/common/util/reflections/Reflections.java index b5adfc6999..13693efbb6 100644 --- a/common/src/main/java/org/keycloak/util/reflections/Reflections.java +++ b/common/src/main/java/org/keycloak/common/util/reflections/Reflections.java @@ -1,4 +1,4 @@ -package org.keycloak.util.reflections; +package org.keycloak.common.util.reflections; import java.beans.Introspector; import java.io.Serializable; diff --git a/common/src/main/java/org/keycloak/util/reflections/SetAccessiblePrivilegedAction.java b/common/src/main/java/org/keycloak/common/util/reflections/SetAccessiblePrivilegedAction.java similarity index 92% rename from common/src/main/java/org/keycloak/util/reflections/SetAccessiblePrivilegedAction.java rename to common/src/main/java/org/keycloak/common/util/reflections/SetAccessiblePrivilegedAction.java index be7c10ac38..89255678f0 100644 --- a/common/src/main/java/org/keycloak/util/reflections/SetAccessiblePrivilegedAction.java +++ b/common/src/main/java/org/keycloak/common/util/reflections/SetAccessiblePrivilegedAction.java @@ -1,4 +1,4 @@ -package org.keycloak.util.reflections; +package org.keycloak.common.util.reflections; import java.lang.reflect.AccessibleObject; import java.security.PrivilegedAction; diff --git a/common/src/main/java/org/keycloak/util/reflections/Types.java b/common/src/main/java/org/keycloak/common/util/reflections/Types.java similarity index 96% rename from common/src/main/java/org/keycloak/util/reflections/Types.java rename to common/src/main/java/org/keycloak/common/util/reflections/Types.java index 01b1059426..dcf93b1c65 100644 --- a/common/src/main/java/org/keycloak/util/reflections/Types.java +++ b/common/src/main/java/org/keycloak/common/util/reflections/Types.java @@ -1,4 +1,4 @@ -package org.keycloak.util.reflections; +package org.keycloak.common.util.reflections; import java.lang.reflect.Type; diff --git a/connections/http-client/src/main/java/org/keycloak/connections/httpclient/DefaultHttpClientFactory.java b/connections/http-client/src/main/java/org/keycloak/connections/httpclient/DefaultHttpClientFactory.java index 703660fce8..a06b296025 100755 --- a/connections/http-client/src/main/java/org/keycloak/connections/httpclient/DefaultHttpClientFactory.java +++ b/connections/http-client/src/main/java/org/keycloak/connections/httpclient/DefaultHttpClientFactory.java @@ -12,8 +12,8 @@ import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.util.EnvUtil; -import org.keycloak.util.KeystoreUtil; +import org.keycloak.common.util.EnvUtil; +import org.keycloak.common.util.KeystoreUtil; import java.io.IOException; import java.io.InputStream; diff --git a/connections/mongo/src/main/java/org/keycloak/connections/mongo/impl/types/BasicDBObjectMapper.java b/connections/mongo/src/main/java/org/keycloak/connections/mongo/impl/types/BasicDBObjectMapper.java index b93e2b95de..77d2a4c5f8 100644 --- a/connections/mongo/src/main/java/org/keycloak/connections/mongo/impl/types/BasicDBObjectMapper.java +++ b/connections/mongo/src/main/java/org/keycloak/connections/mongo/impl/types/BasicDBObjectMapper.java @@ -9,11 +9,10 @@ import org.keycloak.connections.mongo.api.types.MapperRegistry; import org.keycloak.connections.mongo.impl.EntityInfo; import org.keycloak.connections.mongo.impl.MongoStoreImpl; import org.keycloak.models.utils.reflection.Property; -import org.keycloak.util.reflections.Types; +import org.keycloak.common.util.reflections.Types; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/core/src/main/java/org/keycloak/AbstractOAuthClient.java b/core/src/main/java/org/keycloak/AbstractOAuthClient.java index 3e32bbded2..2c14ada9a1 100755 --- a/core/src/main/java/org/keycloak/AbstractOAuthClient.java +++ b/core/src/main/java/org/keycloak/AbstractOAuthClient.java @@ -1,7 +1,7 @@ package org.keycloak; -import org.keycloak.enums.RelativeUrlsUsed; -import org.keycloak.util.KeycloakUriBuilder; +import org.keycloak.common.enums.RelativeUrlsUsed; +import org.keycloak.common.util.KeycloakUriBuilder; import java.util.Map; import java.util.UUID; diff --git a/core/src/main/java/org/keycloak/KeycloakSecurityContext.java b/core/src/main/java/org/keycloak/KeycloakSecurityContext.java index e480d87300..e8fd32e1ed 100755 --- a/core/src/main/java/org/keycloak/KeycloakSecurityContext.java +++ b/core/src/main/java/org/keycloak/KeycloakSecurityContext.java @@ -2,7 +2,7 @@ package org.keycloak; import org.keycloak.representations.AccessToken; import org.keycloak.representations.IDToken; -import org.keycloak.util.Base64Url; +import org.keycloak.common.util.Base64Url; import org.keycloak.util.JsonSerialization; import java.io.IOException; diff --git a/core/src/main/java/org/keycloak/RSATokenVerifier.java b/core/src/main/java/org/keycloak/RSATokenVerifier.java index 80a4cd64a6..f177166740 100755 --- a/core/src/main/java/org/keycloak/RSATokenVerifier.java +++ b/core/src/main/java/org/keycloak/RSATokenVerifier.java @@ -1,5 +1,6 @@ package org.keycloak; +import org.keycloak.common.VerificationException; import org.keycloak.jose.jws.JWSInput; import org.keycloak.jose.jws.crypto.RSAProvider; import org.keycloak.representations.AccessToken; diff --git a/core/src/main/java/org/keycloak/jose/jwk/JWKBuilder.java b/core/src/main/java/org/keycloak/jose/jwk/JWKBuilder.java index bc3a228e51..f3b141a513 100644 --- a/core/src/main/java/org/keycloak/jose/jwk/JWKBuilder.java +++ b/core/src/main/java/org/keycloak/jose/jwk/JWKBuilder.java @@ -1,14 +1,12 @@ package org.keycloak.jose.jwk; -import org.keycloak.util.Base64Url; +import org.keycloak.common.util.Base64Url; import java.math.BigInteger; import java.security.Key; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.security.PrivateKey; import java.security.PublicKey; -import java.security.interfaces.RSAPrivateKey; import java.security.interfaces.RSAPublicKey; /** diff --git a/core/src/main/java/org/keycloak/jose/jwk/JWKParser.java b/core/src/main/java/org/keycloak/jose/jwk/JWKParser.java index b498cc15a2..35604ea202 100755 --- a/core/src/main/java/org/keycloak/jose/jwk/JWKParser.java +++ b/core/src/main/java/org/keycloak/jose/jwk/JWKParser.java @@ -1,7 +1,7 @@ package org.keycloak.jose.jwk; import org.codehaus.jackson.type.TypeReference; -import org.keycloak.util.Base64Url; +import org.keycloak.common.util.Base64Url; import org.keycloak.util.JsonSerialization; import java.math.BigInteger; diff --git a/core/src/main/java/org/keycloak/jose/jws/JWSBuilder.java b/core/src/main/java/org/keycloak/jose/jws/JWSBuilder.java index 5c057e18cd..a1b3b8052e 100755 --- a/core/src/main/java/org/keycloak/jose/jws/JWSBuilder.java +++ b/core/src/main/java/org/keycloak/jose/jws/JWSBuilder.java @@ -2,7 +2,7 @@ package org.keycloak.jose.jws; import org.keycloak.jose.jws.crypto.HMACProvider; import org.keycloak.jose.jws.crypto.RSAProvider; -import org.keycloak.util.Base64Url; +import org.keycloak.common.util.Base64Url; import org.keycloak.util.JsonSerialization; import javax.crypto.SecretKey; diff --git a/core/src/main/java/org/keycloak/jose/jws/JWSInput.java b/core/src/main/java/org/keycloak/jose/jws/JWSInput.java index d20da6dbc6..b01355f603 100755 --- a/core/src/main/java/org/keycloak/jose/jws/JWSInput.java +++ b/core/src/main/java/org/keycloak/jose/jws/JWSInput.java @@ -1,8 +1,7 @@ package org.keycloak.jose.jws; -import org.keycloak.util.Base64Url; +import org.keycloak.common.util.Base64Url; import org.keycloak.util.JsonSerialization; -import static org.keycloak.jose.jws.Algorithm.*; import java.io.IOException; import java.io.UnsupportedEncodingException; diff --git a/core/src/main/java/org/keycloak/jose/jws/crypto/HMACProvider.java b/core/src/main/java/org/keycloak/jose/jws/crypto/HMACProvider.java index 5157577c58..df8312f9dd 100755 --- a/core/src/main/java/org/keycloak/jose/jws/crypto/HMACProvider.java +++ b/core/src/main/java/org/keycloak/jose/jws/crypto/HMACProvider.java @@ -3,7 +3,7 @@ package org.keycloak.jose.jws.crypto; import org.keycloak.jose.jws.Algorithm; import org.keycloak.jose.jws.JWSInput; -import org.keycloak.util.Base64Url; +import org.keycloak.common.util.Base64Url; import javax.crypto.Mac; import javax.crypto.SecretKey; diff --git a/core/src/main/java/org/keycloak/jose/jws/crypto/RSAProvider.java b/core/src/main/java/org/keycloak/jose/jws/crypto/RSAProvider.java index fc68f6cd62..59e25ee737 100755 --- a/core/src/main/java/org/keycloak/jose/jws/crypto/RSAProvider.java +++ b/core/src/main/java/org/keycloak/jose/jws/crypto/RSAProvider.java @@ -3,7 +3,7 @@ package org.keycloak.jose.jws.crypto; import org.keycloak.jose.jws.Algorithm; import org.keycloak.jose.jws.JWSInput; -import org.keycloak.util.PemUtils; +import org.keycloak.common.util.PemUtils; import java.security.PrivateKey; import java.security.PublicKey; diff --git a/core/src/main/java/org/keycloak/representations/JsonWebToken.java b/core/src/main/java/org/keycloak/representations/JsonWebToken.java index b547fcabe4..c286f40fbb 100755 --- a/core/src/main/java/org/keycloak/representations/JsonWebToken.java +++ b/core/src/main/java/org/keycloak/representations/JsonWebToken.java @@ -8,7 +8,7 @@ import org.codehaus.jackson.map.annotate.JsonDeserialize; import org.codehaus.jackson.map.annotate.JsonSerialize; import org.keycloak.json.StringOrArrayDeserializer; import org.keycloak.json.StringOrArraySerializer; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import java.io.Serializable; import java.util.HashMap; diff --git a/core/src/main/java/org/keycloak/representations/PasswordToken.java b/core/src/main/java/org/keycloak/representations/PasswordToken.java index 8ae9ffcd79..187747eed0 100644 --- a/core/src/main/java/org/keycloak/representations/PasswordToken.java +++ b/core/src/main/java/org/keycloak/representations/PasswordToken.java @@ -1,6 +1,6 @@ package org.keycloak.representations; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; /** * @author Stian Thorgersen diff --git a/core/src/main/java/org/keycloak/representations/VersionRepresentation.java b/core/src/main/java/org/keycloak/representations/VersionRepresentation.java index 09505525f3..a906202e98 100755 --- a/core/src/main/java/org/keycloak/representations/VersionRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/VersionRepresentation.java @@ -1,7 +1,7 @@ package org.keycloak.representations; import org.codehaus.jackson.annotate.JsonProperty; -import org.keycloak.Version; +import org.keycloak.common.Version; /** * @author Bill Burke diff --git a/core/src/main/java/org/keycloak/representations/adapters/action/AdminAction.java b/core/src/main/java/org/keycloak/representations/adapters/action/AdminAction.java index fd9dad0f62..d3ea76a911 100755 --- a/core/src/main/java/org/keycloak/representations/adapters/action/AdminAction.java +++ b/core/src/main/java/org/keycloak/representations/adapters/action/AdminAction.java @@ -1,7 +1,7 @@ package org.keycloak.representations.adapters.action; import org.codehaus.jackson.annotate.JsonIgnore; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; /** * Posted to managed client from admin server. diff --git a/core/src/main/java/org/keycloak/representations/idm/PublishedRealmRepresentation.java b/core/src/main/java/org/keycloak/representations/idm/PublishedRealmRepresentation.java index 5fd33ad6c7..94ff04b4dd 100755 --- a/core/src/main/java/org/keycloak/representations/idm/PublishedRealmRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/idm/PublishedRealmRepresentation.java @@ -3,7 +3,7 @@ package org.keycloak.representations.idm; import org.bouncycastle.openssl.PEMWriter; import org.codehaus.jackson.annotate.JsonIgnore; import org.codehaus.jackson.annotate.JsonProperty; -import org.keycloak.util.PemUtils; +import org.keycloak.common.util.PemUtils; import java.io.IOException; import java.io.StringWriter; diff --git a/core/src/main/java/org/keycloak/util/BasicAuthHelper.java b/core/src/main/java/org/keycloak/util/BasicAuthHelper.java index 65f8e88c5f..c4dd53ff5a 100755 --- a/core/src/main/java/org/keycloak/util/BasicAuthHelper.java +++ b/core/src/main/java/org/keycloak/util/BasicAuthHelper.java @@ -1,6 +1,6 @@ package org.keycloak.util; -import org.keycloak.util.Base64; +import org.keycloak.common.util.Base64; import java.io.IOException; import java.io.UnsupportedEncodingException; diff --git a/core/src/main/java/org/keycloak/util/SystemPropertiesJsonParserFactory.java b/core/src/main/java/org/keycloak/util/SystemPropertiesJsonParserFactory.java index a09a91bc73..2ba00f31cd 100644 --- a/core/src/main/java/org/keycloak/util/SystemPropertiesJsonParserFactory.java +++ b/core/src/main/java/org/keycloak/util/SystemPropertiesJsonParserFactory.java @@ -3,13 +3,14 @@ package org.keycloak.util; import java.io.IOException; import java.io.InputStream; import java.io.Reader; -import java.util.Map; import java.util.Properties; import org.codehaus.jackson.JsonParser; import org.codehaus.jackson.io.IOContext; import org.codehaus.jackson.map.MappingJsonFactory; import org.codehaus.jackson.util.JsonParserDelegate; +import org.keycloak.common.util.StringPropertyReplacer; +import org.keycloak.common.util.SystemEnvProperties; /** * Provides replacing of system properties for parsed values diff --git a/core/src/test/java/org/keycloak/RSAVerifierTest.java b/core/src/test/java/org/keycloak/RSAVerifierTest.java index acdbb323be..f12c34c817 100755 --- a/core/src/test/java/org/keycloak/RSAVerifierTest.java +++ b/core/src/test/java/org/keycloak/RSAVerifierTest.java @@ -7,9 +7,10 @@ import org.bouncycastle.x509.X509V1CertificateGenerator; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.keycloak.common.VerificationException; import org.keycloak.jose.jws.JWSBuilder; import org.keycloak.representations.AccessToken; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import org.keycloak.util.TokenUtil; import javax.security.auth.x500.X500Principal; diff --git a/core/src/test/java/org/keycloak/util/UriUtilsTest.java b/core/src/test/java/org/keycloak/util/UriUtilsTest.java index 0740ec232f..cf999622e5 100644 --- a/core/src/test/java/org/keycloak/util/UriUtilsTest.java +++ b/core/src/test/java/org/keycloak/util/UriUtilsTest.java @@ -1,6 +1,7 @@ package org.keycloak.util; import org.junit.Test; +import org.keycloak.common.util.UriUtils; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -50,7 +51,7 @@ public class UriUtilsTest { assertEquals("http://localhost",UriUtils.stripQueryParam("http://localhost?login_hint=michael@me.com","login_hint")); assertEquals("http://localhost?param=test",UriUtils.stripQueryParam("http://localhost?param=test&login_hint=michael","login_hint")); assertEquals("http://localhost?param=test",UriUtils.stripQueryParam("http://localhost?param=test&login_hint=michael@me.com","login_hint")); - assertEquals("http://localhost?param=test",UriUtils.stripQueryParam("http://localhost?login_hint=michael¶m=test","login_hint")); + assertEquals("http://localhost?param=test", UriUtils.stripQueryParam("http://localhost?login_hint=michael¶m=test", "login_hint")); assertEquals("http://localhost?param=test",UriUtils.stripQueryParam("http://localhost?login_hint=michael@me.com¶m=test","login_hint")); assertEquals("http://localhost?pre=test¶m=test",UriUtils.stripQueryParam("http://localhost?pre=test&login_hint=michael¶m=test","login_hint")); assertEquals("http://localhost?pre=test¶m=test",UriUtils.stripQueryParam("http://localhost?pre=test&login_hint=michael@me.com¶m=test","login_hint")); diff --git a/distribution/adapters/osgi/features/src/main/resources/features.xml b/distribution/adapters/osgi/features/src/main/resources/features.xml index 4230886b75..8a55535369 100755 --- a/distribution/adapters/osgi/features/src/main/resources/features.xml +++ b/distribution/adapters/osgi/features/src/main/resources/features.xml @@ -12,6 +12,7 @@ mvn:org.jboss.logging/jboss-logging/${jboss.logging.version} mvn:org.keycloak/keycloak-common/${project.version} mvn:org.keycloak/keycloak-core/${project.version} + mvn:org.keycloak/keycloak-adapter-spi/${project.version} mvn:org.keycloak/keycloak-adapter-core/${project.version} @@ -26,6 +27,7 @@
The keycloak Jetty8 adapter
keycloak-adapter-core jetty + mvn:org.keycloak/keycloak-jetty-adapter-spi/${project.version} mvn:org.keycloak/keycloak-jetty-core/${project.version} mvn:org.keycloak/keycloak-jetty81-adapter/${project.version} diff --git a/docbook/auth-server-docs/reference/en/en-US/modules/multi-tenancy.xml b/docbook/auth-server-docs/reference/en/en-US/modules/multi-tenancy.xml index e7b385ee8c..0963ddec43 100644 --- a/docbook/auth-server-docs/reference/en/en-US/modules/multi-tenancy.xml +++ b/docbook/auth-server-docs/reference/en/en-US/modules/multi-tenancy.xml @@ -43,7 +43,7 @@ A concrete implementation of org.keycloak.adapters.KeycloakConfigResolver. Keycloak will call the - resolve(org.keycloak.adapters.HttpFacade.Request) method and expects a complete + resolve(org.keycloak.adapters.spi.HttpFacade.Request) method and expects a complete org.keycloak.adapters.KeycloakDeployment in response. Note that Keycloak will call this for every request, so, take the usual performance precautions. diff --git a/docbook/saml-adapter-docs/reference/en/en-US/modules/multi-tenancy.xml b/docbook/saml-adapter-docs/reference/en/en-US/modules/multi-tenancy.xml index 322aadb059..ae4564fa0e 100755 --- a/docbook/saml-adapter-docs/reference/en/en-US/modules/multi-tenancy.xml +++ b/docbook/saml-adapter-docs/reference/en/en-US/modules/multi-tenancy.xml @@ -43,7 +43,7 @@ A concrete implementation of org.keycloak.adapters.KeycloakConfigResolver. Keycloak will call the - resolve(org.keycloak.adapters.HttpFacade.Request) method and expects a complete + resolve(org.keycloak.adapters.spi.HttpFacade.Request) method and expects a complete org.keycloak.adapters.KeycloakDeployment in response. Note that Keycloak will call this for every request, so, take the usual performance precautions. diff --git a/events/api/src/main/java/org/keycloak/events/EventBuilder.java b/events/api/src/main/java/org/keycloak/events/EventBuilder.java index 641f2335f3..a510c4a966 100755 --- a/events/api/src/main/java/org/keycloak/events/EventBuilder.java +++ b/events/api/src/main/java/org/keycloak/events/EventBuilder.java @@ -1,13 +1,13 @@ package org.keycloak.events; import org.jboss.logging.Logger; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import java.util.HashMap; import java.util.LinkedList; diff --git a/examples/admin-client/src/main/webapp/index.jsp b/examples/admin-client/src/main/webapp/index.jsp index 47b52c15e1..b52246b8a5 100644 --- a/examples/admin-client/src/main/webapp/index.jsp +++ b/examples/admin-client/src/main/webapp/index.jsp @@ -1,7 +1,7 @@ <%@ page import="org.keycloak.admin.client.Keycloak" %> <%@ page import="org.keycloak.admin.client.resource.ClientsResource" %> <%@ page import="org.keycloak.representations.idm.ClientRepresentation" %> -<%@ page import="org.keycloak.util.UriUtils" %> +<%@ page import="org.keycloak.common.util.UriUtils" %> <%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1" %> <%@ page session="false" %> diff --git a/examples/demo-template/admin-access-app/src/main/java/org/keycloak/example/AdminClient.java b/examples/demo-template/admin-access-app/src/main/java/org/keycloak/example/AdminClient.java index d682d7551f..4005a244b5 100755 --- a/examples/demo-template/admin-access-app/src/main/java/org/keycloak/example/AdminClient.java +++ b/examples/demo-template/admin-access-app/src/main/java/org/keycloak/example/AdminClient.java @@ -13,10 +13,10 @@ import org.keycloak.OAuth2Constants; import org.keycloak.constants.ServiceUrlConstants; import org.keycloak.representations.AccessTokenResponse; import org.keycloak.representations.idm.RoleRepresentation; -import org.keycloak.util.HostUtils; +import org.keycloak.common.util.HostUtils; import org.keycloak.util.JsonSerialization; -import org.keycloak.util.KeycloakUriBuilder; -import org.keycloak.util.UriUtils; +import org.keycloak.common.util.KeycloakUriBuilder; +import org.keycloak.common.util.UriUtils; import javax.servlet.http.HttpServletRequest; import java.io.ByteArrayOutputStream; diff --git a/examples/demo-template/customer-app-cli/src/main/java/org/keycloak/example/CustomerCli.java b/examples/demo-template/customer-app-cli/src/main/java/org/keycloak/example/CustomerCli.java index d3c75f5e53..58b50f8143 100755 --- a/examples/demo-template/customer-app-cli/src/main/java/org/keycloak/example/CustomerCli.java +++ b/examples/demo-template/customer-app-cli/src/main/java/org/keycloak/example/CustomerCli.java @@ -7,7 +7,7 @@ import org.codehaus.jackson.map.SerializationConfig; import org.codehaus.jackson.map.annotate.JsonSerialize; import org.keycloak.adapters.ServerRequest; import org.keycloak.adapters.installed.KeycloakInstalled; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import java.io.BufferedReader; import java.io.IOException; diff --git a/examples/demo-template/customer-app/src/main/webapp/customers/session.jsp b/examples/demo-template/customer-app/src/main/webapp/customers/session.jsp index 2c3ddb3582..79aafdb249 100755 --- a/examples/demo-template/customer-app/src/main/webapp/customers/session.jsp +++ b/examples/demo-template/customer-app/src/main/webapp/customers/session.jsp @@ -3,7 +3,7 @@ <%@ page import="org.keycloak.constants.ServiceUrlConstants" %> <%@ page import="org.keycloak.example.CustomerDatabaseClient" %> <%@ page import="org.keycloak.representations.IDToken" %> -<%@ page import="org.keycloak.util.HostUtils" %> +<%@ page import="org.keycloak.common.util.HostUtils" %> Customer Session Page diff --git a/examples/demo-template/customer-app/src/main/webapp/customers/view.jsp b/examples/demo-template/customer-app/src/main/webapp/customers/view.jsp index 440a9e9da2..55d19e7e3b 100755 --- a/examples/demo-template/customer-app/src/main/webapp/customers/view.jsp +++ b/examples/demo-template/customer-app/src/main/webapp/customers/view.jsp @@ -3,7 +3,7 @@ <%@ page import="org.keycloak.constants.ServiceUrlConstants" %> <%@ page import="org.keycloak.example.CustomerDatabaseClient" %> <%@ page import="org.keycloak.representations.IDToken" %> -<%@ page import="org.keycloak.util.KeycloakUriBuilder" %> +<%@ page import="org.keycloak.common.util.KeycloakUriBuilder" %> <%@ page session="false" %> diff --git a/examples/demo-template/offline-access-app/src/main/java/org/keycloak/example/OfflineAccessPortalServlet.java b/examples/demo-template/offline-access-app/src/main/java/org/keycloak/example/OfflineAccessPortalServlet.java index 354a778fc4..ec791d1a57 100644 --- a/examples/demo-template/offline-access-app/src/main/java/org/keycloak/example/OfflineAccessPortalServlet.java +++ b/examples/demo-template/offline-access-app/src/main/java/org/keycloak/example/OfflineAccessPortalServlet.java @@ -17,7 +17,7 @@ import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.DefaultHttpClient; import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.AdapterDeploymentContext; -import org.keycloak.adapters.HttpFacade; +import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.RefreshableKeycloakSecurityContext; import org.keycloak.adapters.ServerRequest; @@ -25,9 +25,9 @@ import org.keycloak.representations.AccessTokenResponse; import org.keycloak.representations.RefreshToken; import org.keycloak.util.JsonSerialization; import org.keycloak.util.TokenUtil; -import org.keycloak.util.StreamUtil; -import org.keycloak.util.Time; -import org.keycloak.util.UriUtils; +import org.keycloak.common.util.StreamUtil; +import org.keycloak.common.util.Time; +import org.keycloak.common.util.UriUtils; /** * @author Marek Posolda diff --git a/examples/demo-template/offline-access-app/src/main/java/org/keycloak/example/OfflineExampleUris.java b/examples/demo-template/offline-access-app/src/main/java/org/keycloak/example/OfflineExampleUris.java index 0e56c71ca3..960c2f396c 100644 --- a/examples/demo-template/offline-access-app/src/main/java/org/keycloak/example/OfflineExampleUris.java +++ b/examples/demo-template/offline-access-app/src/main/java/org/keycloak/example/OfflineExampleUris.java @@ -1,7 +1,7 @@ package org.keycloak.example; import org.keycloak.constants.ServiceUrlConstants; -import org.keycloak.util.KeycloakUriBuilder; +import org.keycloak.common.util.KeycloakUriBuilder; /** * @author Marek Posolda diff --git a/examples/demo-template/offline-access-app/src/main/java/org/keycloak/example/RefreshTokenDAO.java b/examples/demo-template/offline-access-app/src/main/java/org/keycloak/example/RefreshTokenDAO.java index 2c94e199ad..96e23cf523 100644 --- a/examples/demo-template/offline-access-app/src/main/java/org/keycloak/example/RefreshTokenDAO.java +++ b/examples/demo-template/offline-access-app/src/main/java/org/keycloak/example/RefreshTokenDAO.java @@ -7,7 +7,7 @@ import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; -import org.keycloak.util.StreamUtil; +import org.keycloak.common.util.StreamUtil; /** * Very simple DAO, which stores/loads just one token per whole application into file in tmp directory. Useful just for example purposes. diff --git a/examples/demo-template/product-app/src/main/webapp/products/view.jsp b/examples/demo-template/product-app/src/main/webapp/products/view.jsp index 69be5845c9..29b750a154 100755 --- a/examples/demo-template/product-app/src/main/webapp/products/view.jsp +++ b/examples/demo-template/product-app/src/main/webapp/products/view.jsp @@ -2,7 +2,7 @@ pageEncoding="ISO-8859-1"%> <%@ page import="org.keycloak.constants.ServiceUrlConstants" %> <%@ page import="org.keycloak.example.oauth.ProductDatabaseClient" %> -<%@ page import="org.keycloak.util.KeycloakUriBuilder" %> +<%@ page import="org.keycloak.common.util.KeycloakUriBuilder" %> <%@ page session="false" %> diff --git a/examples/demo-template/service-account/src/main/java/org/keycloak/example/ProductServiceAccountServlet.java b/examples/demo-template/service-account/src/main/java/org/keycloak/example/ProductServiceAccountServlet.java index 13ab6468b4..42ee23d5a1 100644 --- a/examples/demo-template/service-account/src/main/java/org/keycloak/example/ProductServiceAccountServlet.java +++ b/examples/demo-template/service-account/src/main/java/org/keycloak/example/ProductServiceAccountServlet.java @@ -24,7 +24,7 @@ import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.message.BasicNameValuePair; import org.keycloak.OAuth2Constants; import org.keycloak.RSATokenVerifier; -import org.keycloak.VerificationException; +import org.keycloak.common.VerificationException; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.KeycloakDeploymentBuilder; import org.keycloak.adapters.ServerRequest; @@ -32,7 +32,7 @@ import org.keycloak.adapters.authentication.ClientCredentialsProviderUtils; import org.keycloak.representations.AccessToken; import org.keycloak.representations.AccessTokenResponse; import org.keycloak.util.JsonSerialization; -import org.keycloak.util.UriUtils; +import org.keycloak.common.util.UriUtils; /** * @author Marek Posolda diff --git a/examples/demo-template/service-account/src/main/webapp/WEB-INF/page.jsp b/examples/demo-template/service-account/src/main/webapp/WEB-INF/page.jsp index 8296ddb43b..8ca1201ea6 100644 --- a/examples/demo-template/service-account/src/main/webapp/WEB-INF/page.jsp +++ b/examples/demo-template/service-account/src/main/webapp/WEB-INF/page.jsp @@ -2,8 +2,8 @@ pageEncoding="ISO-8859-1" %> <%@ page import="org.keycloak.example.ProductServiceAccountServlet" %> <%@ page import="org.keycloak.representations.AccessToken" %> -<%@ page import="org.keycloak.constants.ServiceAccountConstants" %> -<%@ page import="org.keycloak.util.Time" %> +<%@ page import="org.keycloak.common.constants.ServiceAccountConstants" %> +<%@ page import="org.keycloak.common.util.Time" %> Service account portal diff --git a/examples/demo-template/third-party-cdi/src/main/java/org/keycloak/example/oauth/DatabaseClient.java b/examples/demo-template/third-party-cdi/src/main/java/org/keycloak/example/oauth/DatabaseClient.java index 981c973cb2..56b5ebe4c9 100755 --- a/examples/demo-template/third-party-cdi/src/main/java/org/keycloak/example/oauth/DatabaseClient.java +++ b/examples/demo-template/third-party-cdi/src/main/java/org/keycloak/example/oauth/DatabaseClient.java @@ -10,7 +10,6 @@ import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.AdapterUtils; import org.keycloak.servlet.ServletOAuthClient; import org.keycloak.util.JsonSerialization; -import org.keycloak.util.UriUtils; import javax.enterprise.context.ApplicationScoped; import javax.faces.application.FacesMessage; diff --git a/examples/demo-template/third-party/src/main/java/org/keycloak/example/oauth/ProductDatabaseClient.java b/examples/demo-template/third-party/src/main/java/org/keycloak/example/oauth/ProductDatabaseClient.java index 3c4af785fa..c72ee05761 100755 --- a/examples/demo-template/third-party/src/main/java/org/keycloak/example/oauth/ProductDatabaseClient.java +++ b/examples/demo-template/third-party/src/main/java/org/keycloak/example/oauth/ProductDatabaseClient.java @@ -11,7 +11,7 @@ import org.keycloak.adapters.ServerRequest; import org.keycloak.representations.AccessTokenResponse; import org.keycloak.servlet.ServletOAuthClient; import org.keycloak.util.JsonSerialization; -import org.keycloak.util.UriUtils; +import org.keycloak.common.util.UriUtils; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/examples/fuse/README.md b/examples/fuse/README.md index e4a2ea5c91..874214730b 100644 --- a/examples/fuse/README.md +++ b/examples/fuse/README.md @@ -71,8 +71,8 @@ which automatically installs all other needed stuff. Once you run Apache Karaf, you need to run these commands from Karaf console (Make sure to replace keycloak versions in the example with actual Keycloak version): ``` -feature:repo-add mvn:org.apache.camel.karaf/apache-camel/2.12.5/xml/features -feature:repo-add mvn:org.apache.cxf.karaf/apache-cxf/2.7.14/xml/features +feature:repo-add mvn:org.apache.camel.karaf/apache-camel/2.15.1/xml/features +feature:repo-add mvn:org.apache.cxf.karaf/apache-cxf/3.0.4/xml/features feature:repo-add mvn:org.keycloak/keycloak-osgi-features/1.2.0.Beta1/xml/features feature:repo-add mvn:org.keycloak.example.demo/keycloak-fuse-example-features/1.2.0.Beta1/xml/features feature:install keycloak-fuse-example diff --git a/examples/fuse/camel/pom.xml b/examples/fuse/camel/pom.xml index 9744daefa6..b5a71f365a 100755 --- a/examples/fuse/camel/pom.xml +++ b/examples/fuse/camel/pom.xml @@ -15,7 +15,7 @@ - 2.12.5 + 2.15.1 diff --git a/examples/fuse/camel/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/examples/fuse/camel/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 79bdd63399..fa3a62e947 100644 --- a/examples/fuse/camel/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/examples/fuse/camel/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -46,7 +46,7 @@ - + diff --git a/examples/fuse/customer-app-fuse/src/main/java/org/keycloak/example/CxfRsClient.java b/examples/fuse/customer-app-fuse/src/main/java/org/keycloak/example/CxfRsClient.java index 4d64429804..e73802af0f 100644 --- a/examples/fuse/customer-app-fuse/src/main/java/org/keycloak/example/CxfRsClient.java +++ b/examples/fuse/customer-app-fuse/src/main/java/org/keycloak/example/CxfRsClient.java @@ -15,7 +15,7 @@ import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.HttpClientBuilder; import org.keycloak.representations.IDToken; import org.keycloak.util.JsonSerialization; -import org.keycloak.util.UriUtils; +import org.keycloak.common.util.UriUtils; /** * @author Bill Burke diff --git a/examples/fuse/customer-app-fuse/src/main/webapp/customers/cxf-rs.jsp b/examples/fuse/customer-app-fuse/src/main/webapp/customers/cxf-rs.jsp index 45c5dcb8a2..f1b63d7a01 100755 --- a/examples/fuse/customer-app-fuse/src/main/webapp/customers/cxf-rs.jsp +++ b/examples/fuse/customer-app-fuse/src/main/webapp/customers/cxf-rs.jsp @@ -3,7 +3,7 @@ <%@ page import="org.keycloak.constants.ServiceUrlConstants" %> <%@ page import="org.keycloak.example.CxfRsClient" %> <%@ page import="org.keycloak.representations.IDToken" %> -<%@ page import="org.keycloak.util.KeycloakUriBuilder" %> +<%@ page import="org.keycloak.common.util.KeycloakUriBuilder" %> <%@ page session="false" %> diff --git a/examples/fuse/cxf-jaxrs/pom.xml b/examples/fuse/cxf-jaxrs/pom.xml index 82678c0837..78e11caaf1 100755 --- a/examples/fuse/cxf-jaxrs/pom.xml +++ b/examples/fuse/cxf-jaxrs/pom.xml @@ -14,7 +14,7 @@ CXF JAXRS Example - Secured in Karaf/Fuse - 2.7.14 + 3.0.4 diff --git a/examples/fuse/cxf-jaxws/pom.xml b/examples/fuse/cxf-jaxws/pom.xml index e3940d8a0f..55781438f8 100755 --- a/examples/fuse/cxf-jaxws/pom.xml +++ b/examples/fuse/cxf-jaxws/pom.xml @@ -15,7 +15,7 @@ - 2.7.14 + 3.0.4 diff --git a/examples/fuse/product-app-fuse/src/main/java/org/keycloak/example/ProductPortalServlet.java b/examples/fuse/product-app-fuse/src/main/java/org/keycloak/example/ProductPortalServlet.java index 248e00e5e5..8d659b09c8 100644 --- a/examples/fuse/product-app-fuse/src/main/java/org/keycloak/example/ProductPortalServlet.java +++ b/examples/fuse/product-app-fuse/src/main/java/org/keycloak/example/ProductPortalServlet.java @@ -21,7 +21,7 @@ import org.keycloak.KeycloakSecurityContext; import org.keycloak.constants.ServiceUrlConstants; import org.keycloak.example.ws.Product; import org.keycloak.example.ws.UnknownProductFault; -import org.keycloak.util.KeycloakUriBuilder; +import org.keycloak.common.util.KeycloakUriBuilder; /** * Servlet for receiving informations about products from backend JAXWS service diff --git a/examples/kerberos/README.md b/examples/kerberos/README.md index c0f2800318..02bffddf99 100644 --- a/examples/kerberos/README.md +++ b/examples/kerberos/README.md @@ -196,8 +196,8 @@ GSSException: Invalid name provided (Mechanism level: KrbException: Cannot locat ### Symptom ``` -17:32:19,825 ERROR [stderr] (default task-24) org.keycloak.util.KerberosSerializationUtils$KerberosSerializationException: Null credential given as input. Did you enable kerberos credential delegation for your web browser and mapping of gss credential to access token?, Java version: 1.8.0_60, runtime version: 1.8.0_60-b27, vendor: Oracle Corporation, os: 4.1.6-200.fc22.x86_64 -17:32:19,826 ERROR [stderr] (default task-24) at org.keycloak.util.KerberosSerializationUtils.deserializeCredential(KerberosSerializationUtils.java:109) +17:32:19,825 ERROR [stderr] (default task-24) org.keycloak.common.util.KerberosSerializationUtils$KerberosSerializationException: Null credential given as input. Did you enable kerberos credential delegation for your web browser and mapping of gss credential to access token?, Java version: 1.8.0_60, runtime version: 1.8.0_60-b27, vendor: Oracle Corporation, os: 4.1.6-200.fc22.x86_64 +17:32:19,826 ERROR [stderr] (default task-24) at org.keycloak.common.util.KerberosSerializationUtils.deserializeCredential(KerberosSerializationUtils.java:109) 17:32:19,827 ERROR [stderr] (default task-24) at org.keycloak.example.kerberos.GSSCredentialsClient.getUserFromLDAP(GSSCredentialsClient.java:42) ``` diff --git a/examples/kerberos/src/main/java/org/keycloak/example/kerberos/GSSCredentialsClient.java b/examples/kerberos/src/main/java/org/keycloak/example/kerberos/GSSCredentialsClient.java index 3017b1e7a3..df58bc4ebd 100644 --- a/examples/kerberos/src/main/java/org/keycloak/example/kerberos/GSSCredentialsClient.java +++ b/examples/kerberos/src/main/java/org/keycloak/example/kerberos/GSSCredentialsClient.java @@ -12,9 +12,9 @@ import javax.servlet.http.HttpServletRequest; import org.ietf.jgss.GSSCredential; import org.keycloak.KeycloakPrincipal; -import org.keycloak.constants.KerberosConstants; +import org.keycloak.common.constants.KerberosConstants; import org.keycloak.representations.AccessToken; -import org.keycloak.util.KerberosSerializationUtils; +import org.keycloak.common.util.KerberosSerializationUtils; /** * Sample client able to authenticate against ApacheDS LDAP server with Krb5 GSS Credential. diff --git a/examples/kerberos/src/main/webapp/index.jsp b/examples/kerberos/src/main/webapp/index.jsp index c1df8f0878..e680d93d07 100644 --- a/examples/kerberos/src/main/webapp/index.jsp +++ b/examples/kerberos/src/main/webapp/index.jsp @@ -1,7 +1,7 @@ <%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1" %> <%@ page import="org.keycloak.constants.ServiceUrlConstants" %> -<%@ page import="org.keycloak.util.KeycloakUriBuilder" %> +<%@ page import="org.keycloak.common.util.KeycloakUriBuilder" %> <%@ page import="org.keycloak.example.kerberos.GSSCredentialsClient" %> <%@ page import="org.keycloak.example.kerberos.GSSCredentialsClient.LDAPUser" %> <%@ page session="false" %> diff --git a/examples/ldap/src/main/webapp/index.jsp b/examples/ldap/src/main/webapp/index.jsp index f2bf4cb99e..49821de076 100644 --- a/examples/ldap/src/main/webapp/index.jsp +++ b/examples/ldap/src/main/webapp/index.jsp @@ -1,7 +1,7 @@ <%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1" %> <%@ page import="org.keycloak.constants.ServiceUrlConstants" %> -<%@ page import="org.keycloak.util.KeycloakUriBuilder" %> +<%@ page import="org.keycloak.common.util.KeycloakUriBuilder" %> <%@ page import="org.keycloak.KeycloakSecurityContext" %> <%@ page import="org.keycloak.representations.IDToken" %> <%@ page import="org.keycloak.representations.AccessToken" %> diff --git a/export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/ExportUtils.java b/export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/ExportUtils.java index 9963ea13d7..6073e57055 100755 --- a/export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/ExportUtils.java +++ b/export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/ExportUtils.java @@ -1,9 +1,6 @@ package org.keycloak.exportimport.util; -import org.keycloak.models.session.PersistentClientSessionModel; -import org.keycloak.models.session.PersistentUserSessionModel; -import org.keycloak.representations.idm.OfflineUserSessionRepresentation; -import org.keycloak.util.Base64; +import org.keycloak.common.util.Base64; import org.codehaus.jackson.JsonEncoding; import org.codehaus.jackson.JsonFactory; import org.codehaus.jackson.JsonGenerator; diff --git a/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/CommonKerberosConfig.java b/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/CommonKerberosConfig.java index f98364ad6b..9e8ecfd074 100644 --- a/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/CommonKerberosConfig.java +++ b/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/CommonKerberosConfig.java @@ -3,7 +3,7 @@ package org.keycloak.federation.kerberos; import java.util.Map; import org.keycloak.models.UserFederationProviderModel; -import org.keycloak.constants.KerberosConstants; +import org.keycloak.common.constants.KerberosConstants; /** * Common configuration useful for all providers diff --git a/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/KerberosConfig.java b/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/KerberosConfig.java index 32349b7829..b118e4cb18 100644 --- a/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/KerberosConfig.java +++ b/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/KerberosConfig.java @@ -1,6 +1,6 @@ package org.keycloak.federation.kerberos; -import org.keycloak.constants.KerberosConstants; +import org.keycloak.common.constants.KerberosConstants; import org.keycloak.models.LDAPConstants; import org.keycloak.models.UserFederationProvider; import org.keycloak.models.UserFederationProviderModel; diff --git a/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/KerberosFederationProvider.java b/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/KerberosFederationProvider.java index 7f3b9f9541..ec1a905010 100644 --- a/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/KerberosFederationProvider.java +++ b/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/KerberosFederationProvider.java @@ -20,7 +20,7 @@ import org.keycloak.models.UserCredentialValueModel; import org.keycloak.models.UserFederationProvider; import org.keycloak.models.UserFederationProviderModel; import org.keycloak.models.UserModel; -import org.keycloak.constants.KerberosConstants; +import org.keycloak.common.constants.KerberosConstants; /** * @author Marek Posolda diff --git a/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/impl/SPNEGOAuthenticator.java b/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/impl/SPNEGOAuthenticator.java index beaebf2144..8dba869f6a 100644 --- a/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/impl/SPNEGOAuthenticator.java +++ b/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/impl/SPNEGOAuthenticator.java @@ -5,14 +5,14 @@ import java.security.PrivilegedExceptionAction; import javax.security.auth.Subject; -import org.keycloak.util.Base64; +import org.keycloak.common.util.Base64; import org.ietf.jgss.GSSContext; import org.ietf.jgss.GSSCredential; import org.ietf.jgss.GSSException; import org.ietf.jgss.GSSManager; import org.jboss.logging.Logger; import org.keycloak.federation.kerberos.CommonKerberosConfig; -import org.keycloak.util.KerberosSerializationUtils; +import org.keycloak.common.util.KerberosSerializationUtils; /** * @author Marek Posolda diff --git a/federation/ldap/src/main/java/org/keycloak/federation/ldap/LDAPFederationProvider.java b/federation/ldap/src/main/java/org/keycloak/federation/ldap/LDAPFederationProvider.java index 6fdb33c30c..322155b61a 100755 --- a/federation/ldap/src/main/java/org/keycloak/federation/ldap/LDAPFederationProvider.java +++ b/federation/ldap/src/main/java/org/keycloak/federation/ldap/LDAPFederationProvider.java @@ -13,7 +13,6 @@ import org.keycloak.federation.ldap.kerberos.LDAPProviderKerberosConfig; import org.keycloak.federation.ldap.mappers.LDAPFederationMapper; import org.keycloak.models.CredentialValidationOutput; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.KeycloakSessionTask; import org.keycloak.models.LDAPConstants; import org.keycloak.models.ModelDuplicateException; import org.keycloak.models.ModelException; @@ -25,10 +24,8 @@ import org.keycloak.mappers.UserFederationMapper; import org.keycloak.models.UserFederationMapperModel; import org.keycloak.models.UserFederationProvider; import org.keycloak.models.UserFederationProviderModel; -import org.keycloak.models.UserFederationSyncResult; import org.keycloak.models.UserModel; -import org.keycloak.constants.KerberosConstants; -import org.keycloak.models.utils.KeycloakModelUtils; +import org.keycloak.common.constants.KerberosConstants; import java.util.ArrayList; import java.util.Arrays; diff --git a/federation/ldap/src/main/java/org/keycloak/federation/ldap/kerberos/LDAPProviderKerberosConfig.java b/federation/ldap/src/main/java/org/keycloak/federation/ldap/kerberos/LDAPProviderKerberosConfig.java index d4d5c97775..15e6b05a2e 100644 --- a/federation/ldap/src/main/java/org/keycloak/federation/ldap/kerberos/LDAPProviderKerberosConfig.java +++ b/federation/ldap/src/main/java/org/keycloak/federation/ldap/kerberos/LDAPProviderKerberosConfig.java @@ -1,7 +1,7 @@ package org.keycloak.federation.ldap.kerberos; import org.keycloak.federation.kerberos.CommonKerberosConfig; -import org.keycloak.constants.KerberosConstants; +import org.keycloak.common.constants.KerberosConstants; import org.keycloak.models.UserFederationProviderModel; /** diff --git a/forms/account-freemarker/src/main/java/org/keycloak/account/freemarker/model/AccountBean.java b/forms/account-freemarker/src/main/java/org/keycloak/account/freemarker/model/AccountBean.java index c152e11143..fe8c83d17e 100755 --- a/forms/account-freemarker/src/main/java/org/keycloak/account/freemarker/model/AccountBean.java +++ b/forms/account-freemarker/src/main/java/org/keycloak/account/freemarker/model/AccountBean.java @@ -2,7 +2,6 @@ package org.keycloak.account.freemarker.model; import org.jboss.logging.Logger; import org.keycloak.models.UserModel; -import org.keycloak.util.MultivaluedHashMap; import javax.ws.rs.core.MultivaluedMap; import java.util.HashMap; diff --git a/forms/account-freemarker/src/main/java/org/keycloak/account/freemarker/model/ApplicationsBean.java b/forms/account-freemarker/src/main/java/org/keycloak/account/freemarker/model/ApplicationsBean.java index 95ebe4fe44..cf38357a22 100644 --- a/forms/account-freemarker/src/main/java/org/keycloak/account/freemarker/model/ApplicationsBean.java +++ b/forms/account-freemarker/src/main/java/org/keycloak/account/freemarker/model/ApplicationsBean.java @@ -14,7 +14,7 @@ import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; import org.keycloak.protocol.oidc.TokenManager; import org.keycloak.services.managers.UserSessionManager; -import org.keycloak.util.MultivaluedHashMap; +import org.keycloak.common.util.MultivaluedHashMap; /** * @author Marek Posolda diff --git a/forms/account-freemarker/src/main/java/org/keycloak/account/freemarker/model/SessionsBean.java b/forms/account-freemarker/src/main/java/org/keycloak/account/freemarker/model/SessionsBean.java index 646b44b4fd..78aabd4171 100755 --- a/forms/account-freemarker/src/main/java/org/keycloak/account/freemarker/model/SessionsBean.java +++ b/forms/account-freemarker/src/main/java/org/keycloak/account/freemarker/model/SessionsBean.java @@ -4,7 +4,7 @@ import org.keycloak.models.ClientModel; import org.keycloak.models.ClientSessionModel; import org.keycloak.models.RealmModel; import org.keycloak.models.UserSessionModel; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import java.util.Date; import java.util.HashSet; diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/AdapterDeploymentContext.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/AdapterDeploymentContext.java index 76aaec38ce..47eb58e0a3 100755 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/AdapterDeploymentContext.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/AdapterDeploymentContext.java @@ -6,13 +6,14 @@ import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; import org.jboss.logging.Logger; import org.keycloak.adapters.authentication.ClientCredentialsProvider; -import org.keycloak.enums.RelativeUrlsUsed; -import org.keycloak.enums.SslRequired; +import org.keycloak.adapters.spi.HttpFacade; +import org.keycloak.common.enums.RelativeUrlsUsed; +import org.keycloak.common.enums.SslRequired; import org.keycloak.enums.TokenStore; import org.keycloak.representations.adapters.config.AdapterConfig; import org.keycloak.representations.idm.PublishedRealmRepresentation; import org.keycloak.util.JsonSerialization; -import org.keycloak.util.KeycloakUriBuilder; +import org.keycloak.common.util.KeycloakUriBuilder; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/AdapterTokenStore.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/AdapterTokenStore.java index 70eeebb8e4..2bc9279c5c 100755 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/AdapterTokenStore.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/AdapterTokenStore.java @@ -1,5 +1,7 @@ package org.keycloak.adapters; +import org.keycloak.adapters.spi.AdapterSessionStore; + /** * Abstraction for storing token info on adapter side. Intended to be per-request object * diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/AdapterUtils.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/AdapterUtils.java index 70a71e25fc..ee220c880e 100755 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/AdapterUtils.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/AdapterUtils.java @@ -4,7 +4,7 @@ import org.jboss.logging.Logger; import org.keycloak.KeycloakPrincipal; import org.keycloak.KeycloakSecurityContext; import org.keycloak.representations.AccessToken; -import org.keycloak.util.UriUtils; +import org.keycloak.common.util.UriUtils; import java.util.Collections; import java.util.Set; diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/AuthenticatedActionsHandler.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/AuthenticatedActionsHandler.java index f4eced9da9..5e243de419 100755 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/AuthenticatedActionsHandler.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/AuthenticatedActionsHandler.java @@ -4,7 +4,7 @@ import org.jboss.logging.Logger; import org.keycloak.KeycloakSecurityContext; import org.keycloak.constants.AdapterConstants; import org.keycloak.representations.AccessToken; -import org.keycloak.util.UriUtils; +import org.keycloak.common.util.UriUtils; import java.io.IOException; import java.util.Set; diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/BasicAuthRequestAuthenticator.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/BasicAuthRequestAuthenticator.java index e16137bed3..6b90105d83 100644 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/BasicAuthRequestAuthenticator.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/BasicAuthRequestAuthenticator.java @@ -10,11 +10,13 @@ import org.apache.http.message.BasicNameValuePair; import org.jboss.logging.Logger; import org.keycloak.OAuth2Constants; import org.keycloak.adapters.authentication.ClientCredentialsProviderUtils; +import org.keycloak.adapters.spi.AuthOutcome; +import org.keycloak.adapters.spi.HttpFacade; +import org.keycloak.common.util.Base64; import org.keycloak.constants.ServiceUrlConstants; import org.keycloak.representations.AccessTokenResponse; -import org.keycloak.util.BasicAuthHelper; import org.keycloak.util.JsonSerialization; -import org.keycloak.util.KeycloakUriBuilder; +import org.keycloak.common.util.KeycloakUriBuilder; import java.util.List; @@ -50,7 +52,7 @@ public class BasicAuthRequestAuthenticator extends BearerTokenRequestAuthenticat AccessTokenResponse atr=null; try { - String userpw=new String(org.keycloak.util.Base64.decode(tokenString)); + String userpw=new String(Base64.decode(tokenString)); String[] parts=userpw.split(":"); atr = getToken(parts[0], parts[1]); diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/BearerTokenRequestAuthenticator.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/BearerTokenRequestAuthenticator.java index c377b1fc55..92b03dab54 100755 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/BearerTokenRequestAuthenticator.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/BearerTokenRequestAuthenticator.java @@ -2,7 +2,10 @@ package org.keycloak.adapters; import org.jboss.logging.Logger; import org.keycloak.RSATokenVerifier; -import org.keycloak.VerificationException; +import org.keycloak.adapters.spi.AuthChallenge; +import org.keycloak.adapters.spi.AuthOutcome; +import org.keycloak.adapters.spi.HttpFacade; +import org.keycloak.common.VerificationException; import org.keycloak.representations.AccessToken; import javax.security.cert.X509Certificate; diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/CookieTokenStore.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/CookieTokenStore.java index 40604a4f07..b1bd12406e 100755 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/CookieTokenStore.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/CookieTokenStore.java @@ -5,12 +5,13 @@ import java.io.IOException; import org.jboss.logging.Logger; import org.keycloak.KeycloakPrincipal; import org.keycloak.RSATokenVerifier; -import org.keycloak.VerificationException; +import org.keycloak.adapters.spi.HttpFacade; +import org.keycloak.common.VerificationException; import org.keycloak.constants.AdapterConstants; import org.keycloak.jose.jws.JWSInput; import org.keycloak.representations.AccessToken; import org.keycloak.representations.IDToken; -import org.keycloak.util.KeycloakUriBuilder; +import org.keycloak.common.util.KeycloakUriBuilder; /** * @author Marek Posolda diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/HttpClientBuilder.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/HttpClientBuilder.java index fdf6186caf..97600a79c4 100755 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/HttpClientBuilder.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/HttpClientBuilder.java @@ -18,8 +18,8 @@ import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; import org.apache.http.params.BasicHttpParams; import org.apache.http.params.HttpConnectionParams; import org.keycloak.representations.adapters.config.AdapterConfig; -import org.keycloak.util.EnvUtil; -import org.keycloak.util.KeystoreUtil; +import org.keycloak.common.util.EnvUtil; +import org.keycloak.common.util.KeystoreUtil; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/KeycloakConfigResolver.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/KeycloakConfigResolver.java index 8ba41437e2..3b80ea667b 100644 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/KeycloakConfigResolver.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/KeycloakConfigResolver.java @@ -16,7 +16,7 @@ */ package org.keycloak.adapters; -import org.keycloak.adapters.HttpFacade.Request; +import org.keycloak.adapters.spi.HttpFacade.Request; /** * On multi-tenant scenarios, Keycloak will defer the resolution of a diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/KeycloakDeployment.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/KeycloakDeployment.java index f927382553..5edaa817ff 100755 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/KeycloakDeployment.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/KeycloakDeployment.java @@ -4,11 +4,11 @@ import org.apache.http.client.HttpClient; import org.jboss.logging.Logger; import org.keycloak.adapters.authentication.ClientCredentialsProvider; import org.keycloak.constants.ServiceUrlConstants; -import org.keycloak.enums.RelativeUrlsUsed; -import org.keycloak.enums.SslRequired; +import org.keycloak.common.enums.RelativeUrlsUsed; +import org.keycloak.common.enums.SslRequired; import org.keycloak.enums.TokenStore; import org.keycloak.representations.adapters.config.AdapterConfig; -import org.keycloak.util.KeycloakUriBuilder; +import org.keycloak.common.util.KeycloakUriBuilder; import java.net.URI; import java.security.PublicKey; diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/KeycloakDeploymentBuilder.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/KeycloakDeploymentBuilder.java index c4302583b3..4fc33b3db9 100755 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/KeycloakDeploymentBuilder.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/KeycloakDeploymentBuilder.java @@ -4,10 +4,10 @@ import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.annotate.JsonSerialize; import org.jboss.logging.Logger; import org.keycloak.adapters.authentication.ClientCredentialsProviderUtils; -import org.keycloak.enums.SslRequired; +import org.keycloak.common.enums.SslRequired; import org.keycloak.enums.TokenStore; import org.keycloak.representations.adapters.config.AdapterConfig; -import org.keycloak.util.PemUtils; +import org.keycloak.common.util.PemUtils; import org.keycloak.util.SystemPropertiesJsonParserFactory; import java.io.IOException; diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/NodesRegistrationManagement.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/NodesRegistrationManagement.java index 86b54fa1a6..a31faf1387 100755 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/NodesRegistrationManagement.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/NodesRegistrationManagement.java @@ -8,8 +8,8 @@ import java.util.concurrent.Executor; import java.util.concurrent.Executors; import org.jboss.logging.Logger; -import org.keycloak.util.HostUtils; -import org.keycloak.util.Time; +import org.keycloak.common.util.HostUtils; +import org.keycloak.common.util.Time; /** * @author Marek Posolda diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/OAuthRequestAuthenticator.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/OAuthRequestAuthenticator.java index c6ffce5bd8..908d2398aa 100755 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/OAuthRequestAuthenticator.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/OAuthRequestAuthenticator.java @@ -3,15 +3,19 @@ package org.keycloak.adapters; import org.jboss.logging.Logger; import org.keycloak.OAuth2Constants; import org.keycloak.RSATokenVerifier; -import org.keycloak.VerificationException; +import org.keycloak.adapters.spi.AdapterSessionStore; +import org.keycloak.adapters.spi.AuthChallenge; +import org.keycloak.adapters.spi.AuthOutcome; +import org.keycloak.adapters.spi.HttpFacade; +import org.keycloak.common.VerificationException; import org.keycloak.constants.AdapterConstants; import org.keycloak.enums.TokenStore; import org.keycloak.jose.jws.JWSInput; import org.keycloak.representations.AccessToken; import org.keycloak.representations.AccessTokenResponse; import org.keycloak.representations.IDToken; -import org.keycloak.util.KeycloakUriBuilder; -import org.keycloak.util.UriUtils; +import org.keycloak.common.util.KeycloakUriBuilder; +import org.keycloak.common.util.UriUtils; import java.io.IOException; import java.util.concurrent.atomic.AtomicLong; diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/OIDCHttpFacade.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/OIDCHttpFacade.java index 5b1cadcf4b..6718f05750 100755 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/OIDCHttpFacade.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/OIDCHttpFacade.java @@ -1,6 +1,7 @@ package org.keycloak.adapters; import org.keycloak.KeycloakSecurityContext; +import org.keycloak.adapters.spi.HttpFacade; /** * Bridge between core adapter and HTTP Engine diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/OidcKeycloakAccount.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/OidcKeycloakAccount.java index fffc2427c1..f1be0982d6 100755 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/OidcKeycloakAccount.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/OidcKeycloakAccount.java @@ -1,6 +1,7 @@ package org.keycloak.adapters; import org.keycloak.KeycloakSecurityContext; +import org.keycloak.adapters.spi.KeycloakAccount; /** * @author Bill Burke diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/PreAuthActionsHandler.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/PreAuthActionsHandler.java index 5380e007d4..2588c407c1 100755 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/PreAuthActionsHandler.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/PreAuthActionsHandler.java @@ -1,6 +1,8 @@ package org.keycloak.adapters; import org.jboss.logging.Logger; +import org.keycloak.adapters.spi.HttpFacade; +import org.keycloak.adapters.spi.UserSessionManagement; import org.keycloak.representations.VersionRepresentation; import org.keycloak.constants.AdapterConstants; import org.keycloak.jose.jws.JWSInput; @@ -10,7 +12,7 @@ import org.keycloak.representations.adapters.action.LogoutAction; import org.keycloak.representations.adapters.action.PushNotBeforeAction; import org.keycloak.representations.adapters.action.TestAvailabilityAction; import org.keycloak.util.JsonSerialization; -import org.keycloak.util.StreamUtil; +import org.keycloak.common.util.StreamUtil; /** * @author Bill Burke diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/RefreshableKeycloakSecurityContext.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/RefreshableKeycloakSecurityContext.java index b938a0bf62..b9bdb0dc2f 100755 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/RefreshableKeycloakSecurityContext.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/RefreshableKeycloakSecurityContext.java @@ -3,7 +3,7 @@ package org.keycloak.adapters; import org.jboss.logging.Logger; import org.keycloak.KeycloakSecurityContext; import org.keycloak.RSATokenVerifier; -import org.keycloak.VerificationException; +import org.keycloak.common.VerificationException; import org.keycloak.representations.AccessToken; import org.keycloak.representations.AccessTokenResponse; import org.keycloak.representations.IDToken; diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/RequestAuthenticator.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/RequestAuthenticator.java index daf205a3fd..6b4d9f003d 100755 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/RequestAuthenticator.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/RequestAuthenticator.java @@ -2,6 +2,9 @@ package org.keycloak.adapters; import org.jboss.logging.Logger; import org.keycloak.KeycloakPrincipal; +import org.keycloak.adapters.spi.AuthChallenge; +import org.keycloak.adapters.spi.AuthOutcome; +import org.keycloak.adapters.spi.HttpFacade; /** * @author Bill Burke diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/ServerRequest.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/ServerRequest.java index bbfd869c59..aa2a451dac 100755 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/ServerRequest.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/ServerRequest.java @@ -11,10 +11,10 @@ import org.keycloak.OAuth2Constants; import org.keycloak.adapters.authentication.ClientCredentialsProviderUtils; import org.keycloak.constants.AdapterConstants; import org.keycloak.representations.AccessTokenResponse; -import org.keycloak.util.HostUtils; +import org.keycloak.common.util.HostUtils; import org.keycloak.util.JsonSerialization; -import org.keycloak.util.KeycloakUriBuilder; -import org.keycloak.util.StreamUtil; +import org.keycloak.common.util.KeycloakUriBuilder; +import org.keycloak.common.util.StreamUtil; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/authentication/JWTClientCredentialsProvider.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/authentication/JWTClientCredentialsProvider.java index 1c8907e21c..c8e2378acb 100644 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/authentication/JWTClientCredentialsProvider.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/authentication/JWTClientCredentialsProvider.java @@ -8,8 +8,8 @@ import org.keycloak.adapters.AdapterUtils; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.jose.jws.JWSBuilder; import org.keycloak.representations.JsonWebToken; -import org.keycloak.util.KeystoreUtil; -import org.keycloak.util.Time; +import org.keycloak.common.util.KeystoreUtil; +import org.keycloak.common.util.Time; /** * Client authentication based on JWT signed by client private key . diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/jaas/AbstractKeycloakLoginModule.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/jaas/AbstractKeycloakLoginModule.java index 152a9d8117..7402d1b107 100755 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/jaas/AbstractKeycloakLoginModule.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/jaas/AbstractKeycloakLoginModule.java @@ -21,15 +21,15 @@ import javax.security.auth.spi.LoginModule; import org.jboss.logging.Logger; import org.keycloak.KeycloakPrincipal; import org.keycloak.RSATokenVerifier; -import org.keycloak.VerificationException; +import org.keycloak.common.VerificationException; import org.keycloak.adapters.AdapterDeploymentContext; import org.keycloak.adapters.AdapterUtils; -import org.keycloak.util.FindFile; +import org.keycloak.common.util.FindFile; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.KeycloakDeploymentBuilder; import org.keycloak.adapters.RefreshableKeycloakSecurityContext; import org.keycloak.representations.AccessToken; -import org.keycloak.util.reflections.Reflections; +import org.keycloak.common.util.reflections.Reflections; /** * @author Marek Posolda diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/jaas/BearerTokenLoginModule.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/jaas/BearerTokenLoginModule.java index 10f8d7b318..9d24d6ad35 100755 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/jaas/BearerTokenLoginModule.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/jaas/BearerTokenLoginModule.java @@ -1,7 +1,7 @@ package org.keycloak.adapters.jaas; import org.jboss.logging.Logger; -import org.keycloak.VerificationException; +import org.keycloak.common.VerificationException; /** * Login module, which allows to authenticate Keycloak access token in environments, which rely on JAAS diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/jaas/DirectAccessGrantsLoginModule.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/jaas/DirectAccessGrantsLoginModule.java index 6ae1ed608d..4f1e0e2fa9 100644 --- a/integration/adapter-core/src/main/java/org/keycloak/adapters/jaas/DirectAccessGrantsLoginModule.java +++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/jaas/DirectAccessGrantsLoginModule.java @@ -22,13 +22,12 @@ import org.apache.http.client.methods.HttpPost; import org.apache.http.message.BasicNameValuePair; import org.jboss.logging.Logger; import org.keycloak.OAuth2Constants; -import org.keycloak.VerificationException; +import org.keycloak.common.VerificationException; import org.keycloak.adapters.authentication.ClientCredentialsProviderUtils; import org.keycloak.constants.ServiceUrlConstants; import org.keycloak.representations.AccessTokenResponse; -import org.keycloak.util.BasicAuthHelper; import org.keycloak.util.JsonSerialization; -import org.keycloak.util.KeycloakUriBuilder; +import org.keycloak.common.util.KeycloakUriBuilder; /** * Login module based on Resource Owner password credentials grant from OAuth2 specs. It's supposed to be used in environments. which diff --git a/integration/adapter-core/src/test/java/org/keycloak/adapters/KeycloakDeploymentBuilderTest.java b/integration/adapter-core/src/test/java/org/keycloak/adapters/KeycloakDeploymentBuilderTest.java index a0a24b27db..99d8fef962 100644 --- a/integration/adapter-core/src/test/java/org/keycloak/adapters/KeycloakDeploymentBuilderTest.java +++ b/integration/adapter-core/src/test/java/org/keycloak/adapters/KeycloakDeploymentBuilderTest.java @@ -4,10 +4,10 @@ import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; import org.junit.Test; import org.keycloak.adapters.authentication.ClientIdAndSecretCredentialsProvider; import org.keycloak.adapters.authentication.JWTClientCredentialsProvider; -import org.keycloak.enums.RelativeUrlsUsed; -import org.keycloak.enums.SslRequired; +import org.keycloak.common.enums.RelativeUrlsUsed; +import org.keycloak.common.enums.SslRequired; import org.keycloak.enums.TokenStore; -import org.keycloak.util.PemUtils; +import org.keycloak.common.util.PemUtils; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/integration/adapter-spi/pom.xml b/integration/adapter-spi/pom.xml index 1e18e76d11..f067186c23 100755 --- a/integration/adapter-spi/pom.xml +++ b/integration/adapter-spi/pom.xml @@ -15,13 +15,10 @@ - org.keycloak.adapters.* + org.keycloak.adapters.spi.* org.keycloak.*;version="${project.version}", - org.apache.http.*;version=${apache.httpcomponents.version}, - org.apache.karaf.jaas.boot.principal;resolution:=optional, - org.apache.karaf.jaas.modules;resolution:=optional, *;resolution:=optional diff --git a/integration/adapter-spi/src/main/java/org/keycloak/adapters/AdapterSessionStore.java b/integration/adapter-spi/src/main/java/org/keycloak/adapters/spi/AdapterSessionStore.java similarity index 84% rename from integration/adapter-spi/src/main/java/org/keycloak/adapters/AdapterSessionStore.java rename to integration/adapter-spi/src/main/java/org/keycloak/adapters/spi/AdapterSessionStore.java index 8c5f2e2b7d..986d18b85f 100755 --- a/integration/adapter-spi/src/main/java/org/keycloak/adapters/AdapterSessionStore.java +++ b/integration/adapter-spi/src/main/java/org/keycloak/adapters/spi/AdapterSessionStore.java @@ -1,4 +1,4 @@ -package org.keycloak.adapters; +package org.keycloak.adapters.spi; /** * @author Bill Burke diff --git a/integration/adapter-spi/src/main/java/org/keycloak/adapters/AuthChallenge.java b/integration/adapter-spi/src/main/java/org/keycloak/adapters/spi/AuthChallenge.java similarity index 94% rename from integration/adapter-spi/src/main/java/org/keycloak/adapters/AuthChallenge.java rename to integration/adapter-spi/src/main/java/org/keycloak/adapters/spi/AuthChallenge.java index 47c07c2c12..ff0960f5e8 100755 --- a/integration/adapter-spi/src/main/java/org/keycloak/adapters/AuthChallenge.java +++ b/integration/adapter-spi/src/main/java/org/keycloak/adapters/spi/AuthChallenge.java @@ -1,4 +1,4 @@ -package org.keycloak.adapters; +package org.keycloak.adapters.spi; /** * @author Bill Burke diff --git a/integration/adapter-spi/src/main/java/org/keycloak/adapters/AuthOutcome.java b/integration/adapter-spi/src/main/java/org/keycloak/adapters/spi/AuthOutcome.java similarity index 84% rename from integration/adapter-spi/src/main/java/org/keycloak/adapters/AuthOutcome.java rename to integration/adapter-spi/src/main/java/org/keycloak/adapters/spi/AuthOutcome.java index a4c55cb1bf..60a34b2b20 100755 --- a/integration/adapter-spi/src/main/java/org/keycloak/adapters/AuthOutcome.java +++ b/integration/adapter-spi/src/main/java/org/keycloak/adapters/spi/AuthOutcome.java @@ -1,4 +1,4 @@ -package org.keycloak.adapters; +package org.keycloak.adapters.spi; /** * @author Bill Burke diff --git a/integration/adapter-spi/src/main/java/org/keycloak/adapters/HttpFacade.java b/integration/adapter-spi/src/main/java/org/keycloak/adapters/spi/HttpFacade.java similarity index 98% rename from integration/adapter-spi/src/main/java/org/keycloak/adapters/HttpFacade.java rename to integration/adapter-spi/src/main/java/org/keycloak/adapters/spi/HttpFacade.java index 49a39b4ab6..fb3804e299 100755 --- a/integration/adapter-spi/src/main/java/org/keycloak/adapters/HttpFacade.java +++ b/integration/adapter-spi/src/main/java/org/keycloak/adapters/spi/HttpFacade.java @@ -1,4 +1,4 @@ -package org.keycloak.adapters; +package org.keycloak.adapters.spi; import javax.security.cert.X509Certificate; import java.io.InputStream; diff --git a/integration/adapter-spi/src/main/java/org/keycloak/adapters/InMemorySessionIdMapper.java b/integration/adapter-spi/src/main/java/org/keycloak/adapters/spi/InMemorySessionIdMapper.java similarity index 98% rename from integration/adapter-spi/src/main/java/org/keycloak/adapters/InMemorySessionIdMapper.java rename to integration/adapter-spi/src/main/java/org/keycloak/adapters/spi/InMemorySessionIdMapper.java index c4a8081e90..deadc8b81f 100755 --- a/integration/adapter-spi/src/main/java/org/keycloak/adapters/InMemorySessionIdMapper.java +++ b/integration/adapter-spi/src/main/java/org/keycloak/adapters/spi/InMemorySessionIdMapper.java @@ -1,4 +1,4 @@ -package org.keycloak.adapters; +package org.keycloak.adapters.spi; import java.util.Collections; import java.util.HashSet; diff --git a/integration/adapter-spi/src/main/java/org/keycloak/adapters/KeycloakAccount.java b/integration/adapter-spi/src/main/java/org/keycloak/adapters/spi/KeycloakAccount.java similarity index 87% rename from integration/adapter-spi/src/main/java/org/keycloak/adapters/KeycloakAccount.java rename to integration/adapter-spi/src/main/java/org/keycloak/adapters/spi/KeycloakAccount.java index 26299448ef..e3b61318b0 100755 --- a/integration/adapter-spi/src/main/java/org/keycloak/adapters/KeycloakAccount.java +++ b/integration/adapter-spi/src/main/java/org/keycloak/adapters/spi/KeycloakAccount.java @@ -1,4 +1,4 @@ -package org.keycloak.adapters; +package org.keycloak.adapters.spi; import java.security.Principal; import java.util.Set; diff --git a/integration/adapter-spi/src/main/java/org/keycloak/adapters/SessionIdMapper.java b/integration/adapter-spi/src/main/java/org/keycloak/adapters/spi/SessionIdMapper.java similarity index 92% rename from integration/adapter-spi/src/main/java/org/keycloak/adapters/SessionIdMapper.java rename to integration/adapter-spi/src/main/java/org/keycloak/adapters/spi/SessionIdMapper.java index 0f8715590f..2d41ccec01 100755 --- a/integration/adapter-spi/src/main/java/org/keycloak/adapters/SessionIdMapper.java +++ b/integration/adapter-spi/src/main/java/org/keycloak/adapters/spi/SessionIdMapper.java @@ -1,4 +1,4 @@ -package org.keycloak.adapters; +package org.keycloak.adapters.spi; import java.util.Set; diff --git a/integration/adapter-spi/src/main/java/org/keycloak/adapters/UserSessionManagement.java b/integration/adapter-spi/src/main/java/org/keycloak/adapters/spi/UserSessionManagement.java similarity index 87% rename from integration/adapter-spi/src/main/java/org/keycloak/adapters/UserSessionManagement.java rename to integration/adapter-spi/src/main/java/org/keycloak/adapters/spi/UserSessionManagement.java index 5ff908a67a..c75fd641f9 100755 --- a/integration/adapter-spi/src/main/java/org/keycloak/adapters/UserSessionManagement.java +++ b/integration/adapter-spi/src/main/java/org/keycloak/adapters/spi/UserSessionManagement.java @@ -1,4 +1,4 @@ -package org.keycloak.adapters; +package org.keycloak.adapters.spi; import java.util.List; diff --git a/integration/as7-eap6/as7-adapter-spi/src/main/java/org/keycloak/adapters/jbossweb/JBossWebPrincipalFactory.java b/integration/as7-eap6/as7-adapter-spi/src/main/java/org/keycloak/adapters/jbossweb/JBossWebPrincipalFactory.java index b3925955c3..953697047f 100755 --- a/integration/as7-eap6/as7-adapter-spi/src/main/java/org/keycloak/adapters/jbossweb/JBossWebPrincipalFactory.java +++ b/integration/as7-eap6/as7-adapter-spi/src/main/java/org/keycloak/adapters/jbossweb/JBossWebPrincipalFactory.java @@ -9,7 +9,7 @@ import org.jboss.security.SecurityContext; import org.jboss.security.SecurityContextAssociation; import org.jboss.security.SimpleGroup; import org.jboss.security.SimplePrincipal; -import org.keycloak.adapters.KeycloakAccount; +import org.keycloak.adapters.spi.KeycloakAccount; import org.keycloak.adapters.tomcat.GenericPrincipalFactory; import javax.security.auth.Subject; diff --git a/integration/installed/src/main/java/org/keycloak/adapters/installed/KeycloakInstalled.java b/integration/installed/src/main/java/org/keycloak/adapters/installed/KeycloakInstalled.java index cc2aeb183d..c468f8d839 100644 --- a/integration/installed/src/main/java/org/keycloak/adapters/installed/KeycloakInstalled.java +++ b/integration/installed/src/main/java/org/keycloak/adapters/installed/KeycloakInstalled.java @@ -3,7 +3,7 @@ package org.keycloak.adapters.installed; import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.RSATokenVerifier; -import org.keycloak.VerificationException; +import org.keycloak.common.VerificationException; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.KeycloakDeploymentBuilder; import org.keycloak.adapters.ServerRequest; diff --git a/integration/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsBearerTokenFilterImpl.java b/integration/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsBearerTokenFilterImpl.java index 5a8fae2f79..bb8105d79d 100755 --- a/integration/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsBearerTokenFilterImpl.java +++ b/integration/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsBearerTokenFilterImpl.java @@ -3,8 +3,8 @@ package org.keycloak.jaxrs; import org.keycloak.KeycloakPrincipal; import org.keycloak.adapters.AdapterDeploymentContext; import org.keycloak.adapters.AdapterUtils; -import org.keycloak.adapters.AuthChallenge; -import org.keycloak.adapters.AuthOutcome; +import org.keycloak.adapters.spi.AuthChallenge; +import org.keycloak.adapters.spi.AuthOutcome; import org.keycloak.adapters.AuthenticatedActionsHandler; import org.keycloak.adapters.BasicAuthRequestAuthenticator; import org.keycloak.adapters.BearerTokenRequestAuthenticator; @@ -14,8 +14,8 @@ import org.keycloak.adapters.KeycloakDeploymentBuilder; import org.keycloak.adapters.NodesRegistrationManagement; import org.keycloak.adapters.PreAuthActionsHandler; import org.keycloak.adapters.RefreshableKeycloakSecurityContext; -import org.keycloak.adapters.UserSessionManagement; -import org.keycloak.constants.GenericConstants; +import org.keycloak.adapters.spi.UserSessionManagement; +import org.keycloak.common.constants.GenericConstants; import javax.annotation.Priority; import javax.ws.rs.Priorities; diff --git a/integration/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsHttpFacade.java b/integration/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsHttpFacade.java index 490d42db2c..cce85d541d 100755 --- a/integration/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsHttpFacade.java +++ b/integration/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/JaxrsHttpFacade.java @@ -12,7 +12,7 @@ import javax.ws.rs.core.SecurityContext; import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.OIDCHttpFacade; -import org.keycloak.util.HostUtils; +import org.keycloak.common.util.HostUtils; /** * @author Marek Posolda diff --git a/integration/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/OsgiJaxrsBearerTokenFilterImpl.java b/integration/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/OsgiJaxrsBearerTokenFilterImpl.java index 2c2f4b05c9..eed342add6 100644 --- a/integration/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/OsgiJaxrsBearerTokenFilterImpl.java +++ b/integration/jaxrs-oauth-client/src/main/java/org/keycloak/jaxrs/OsgiJaxrsBearerTokenFilterImpl.java @@ -10,7 +10,7 @@ import javax.ws.rs.Priorities; import javax.ws.rs.container.PreMatching; import org.keycloak.adapters.KeycloakConfigResolver; -import org.keycloak.constants.GenericConstants; +import org.keycloak.common.constants.GenericConstants; import org.osgi.framework.BundleContext; /** diff --git a/integration/jboss-adapter-core/src/main/java/org/keycloak/adapters/jboss/KeycloakLoginModule.java b/integration/jboss-adapter-core/src/main/java/org/keycloak/adapters/jboss/KeycloakLoginModule.java index 8271b39093..250517e813 100755 --- a/integration/jboss-adapter-core/src/main/java/org/keycloak/adapters/jboss/KeycloakLoginModule.java +++ b/integration/jboss-adapter-core/src/main/java/org/keycloak/adapters/jboss/KeycloakLoginModule.java @@ -5,7 +5,7 @@ import org.jboss.security.SimpleGroup; import org.jboss.security.SimplePrincipal; import org.jboss.security.auth.callback.ObjectCallback; import org.jboss.security.auth.spi.AbstractServerLoginModule; -import org.keycloak.adapters.KeycloakAccount; +import org.keycloak.adapters.spi.KeycloakAccount; import javax.security.auth.callback.Callback; import javax.security.auth.callback.NameCallback; diff --git a/integration/jetty/jetty-adapter-spi/pom.xml b/integration/jetty/jetty-adapter-spi/pom.xml index 32044fe4f1..97d8a59b35 100755 --- a/integration/jetty/jetty-adapter-spi/pom.xml +++ b/integration/jetty/jetty-adapter-spi/pom.xml @@ -14,7 +14,7 @@ 8.1.16.v20140903 - org.keycloak.adapters.jetty.core.* + org.keycloak.adapters.jetty.spi.* org.eclipse.jetty.*;version="[8.1,10)";resolution:=optional, diff --git a/integration/jetty/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/core/JettyHttpFacade.java b/integration/jetty/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettyHttpFacade.java similarity index 96% rename from integration/jetty/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/core/JettyHttpFacade.java rename to integration/jetty/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettyHttpFacade.java index 145f5ef7c1..ea2b3afcbb 100755 --- a/integration/jetty/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/core/JettyHttpFacade.java +++ b/integration/jetty/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettyHttpFacade.java @@ -1,8 +1,8 @@ -package org.keycloak.adapters.jetty.core; +package org.keycloak.adapters.jetty.spi; -import org.keycloak.adapters.HttpFacade; -import org.keycloak.util.MultivaluedHashMap; -import org.keycloak.util.UriUtils; +import org.keycloak.adapters.spi.HttpFacade; +import org.keycloak.common.util.MultivaluedHashMap; +import org.keycloak.common.util.UriUtils; import javax.security.cert.X509Certificate; import javax.servlet.http.HttpServletResponse; diff --git a/integration/jetty/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/core/JettyUserSessionManagement.java b/integration/jetty/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettyUserSessionManagement.java similarity index 91% rename from integration/jetty/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/core/JettyUserSessionManagement.java rename to integration/jetty/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettyUserSessionManagement.java index 415850325d..47c0c17048 100755 --- a/integration/jetty/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/core/JettyUserSessionManagement.java +++ b/integration/jetty/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/JettyUserSessionManagement.java @@ -1,8 +1,8 @@ -package org.keycloak.adapters.jetty.core; +package org.keycloak.adapters.jetty.spi; import org.eclipse.jetty.server.SessionManager; import org.jboss.logging.Logger; -import org.keycloak.adapters.UserSessionManagement; +import org.keycloak.adapters.spi.UserSessionManagement; import javax.servlet.http.HttpSession; import java.util.List; diff --git a/integration/jetty/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/core/WrappingSessionHandler.java b/integration/jetty/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/WrappingSessionHandler.java similarity index 95% rename from integration/jetty/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/core/WrappingSessionHandler.java rename to integration/jetty/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/WrappingSessionHandler.java index 529b6f0d5c..da94fe542e 100644 --- a/integration/jetty/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/core/WrappingSessionHandler.java +++ b/integration/jetty/jetty-adapter-spi/src/main/java/org/keycloak/adapters/jetty/spi/WrappingSessionHandler.java @@ -1,4 +1,4 @@ -package org.keycloak.adapters.jetty.core; +package org.keycloak.adapters.jetty.spi; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.SessionManager; diff --git a/integration/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/AbstractKeycloakJettyAuthenticator.java b/integration/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/AbstractKeycloakJettyAuthenticator.java index 6b0233c381..d3790afa0c 100755 --- a/integration/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/AbstractKeycloakJettyAuthenticator.java +++ b/integration/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/AbstractKeycloakJettyAuthenticator.java @@ -18,10 +18,12 @@ import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.AdapterDeploymentContext; import org.keycloak.adapters.AdapterTokenStore; import org.keycloak.adapters.AdapterUtils; -import org.keycloak.adapters.AuthChallenge; -import org.keycloak.adapters.AuthOutcome; +import org.keycloak.adapters.jetty.spi.JettyHttpFacade; +import org.keycloak.adapters.jetty.spi.JettyUserSessionManagement; +import org.keycloak.adapters.spi.AuthChallenge; +import org.keycloak.adapters.spi.AuthOutcome; import org.keycloak.adapters.AuthenticatedActionsHandler; -import org.keycloak.adapters.HttpFacade; +import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.KeycloakConfigResolver; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.KeycloakDeploymentBuilder; diff --git a/integration/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettyCookieTokenStore.java b/integration/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettyCookieTokenStore.java index cb7e0bc0d6..b62bc9ec31 100755 --- a/integration/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettyCookieTokenStore.java +++ b/integration/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettyCookieTokenStore.java @@ -6,7 +6,7 @@ import org.keycloak.KeycloakPrincipal; import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.AdapterTokenStore; import org.keycloak.adapters.CookieTokenStore; -import org.keycloak.adapters.HttpFacade; +import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.OidcKeycloakAccount; import org.keycloak.adapters.RefreshableKeycloakSecurityContext; diff --git a/integration/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettyRequestAuthenticator.java b/integration/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettyRequestAuthenticator.java index 1ab68b6afa..2d0d2a2c20 100755 --- a/integration/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettyRequestAuthenticator.java +++ b/integration/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettyRequestAuthenticator.java @@ -6,7 +6,7 @@ import org.keycloak.KeycloakPrincipal; import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.AdapterTokenStore; import org.keycloak.adapters.AdapterUtils; -import org.keycloak.adapters.HttpFacade; +import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.OAuthRequestAuthenticator; import org.keycloak.adapters.OidcKeycloakAccount; diff --git a/integration/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettySessionTokenStore.java b/integration/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettySessionTokenStore.java index b007b06841..a51998ec27 100755 --- a/integration/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettySessionTokenStore.java +++ b/integration/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/JettySessionTokenStore.java @@ -4,7 +4,7 @@ import org.eclipse.jetty.server.Request; import org.jboss.logging.Logger; import org.keycloak.KeycloakPrincipal; import org.keycloak.KeycloakSecurityContext; -import org.keycloak.adapters.AdapterSessionStore; +import org.keycloak.adapters.spi.AdapterSessionStore; import org.keycloak.adapters.AdapterTokenStore; import org.keycloak.adapters.AdapterUtils; import org.keycloak.adapters.KeycloakDeployment; diff --git a/integration/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/OIDCJettyHttpFacade.java b/integration/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/OIDCJettyHttpFacade.java index 3f6bd0b1e5..42727cc12d 100755 --- a/integration/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/OIDCJettyHttpFacade.java +++ b/integration/jetty/jetty-core/src/main/java/org/keycloak/adapters/jetty/core/OIDCJettyHttpFacade.java @@ -2,6 +2,7 @@ package org.keycloak.adapters.jetty.core; import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.OIDCHttpFacade; +import org.keycloak.adapters.jetty.spi.JettyHttpFacade; import javax.servlet.http.HttpServletResponse; diff --git a/integration/jetty/jetty8.1/src/main/java/org/keycloak/adapters/jetty/JettyAdapterSessionStore.java b/integration/jetty/jetty8.1/src/main/java/org/keycloak/adapters/jetty/JettyAdapterSessionStore.java index cadb3bc3ca..ec7a7e8af7 100755 --- a/integration/jetty/jetty8.1/src/main/java/org/keycloak/adapters/jetty/JettyAdapterSessionStore.java +++ b/integration/jetty/jetty8.1/src/main/java/org/keycloak/adapters/jetty/JettyAdapterSessionStore.java @@ -3,9 +3,9 @@ package org.keycloak.adapters.jetty; import org.eclipse.jetty.security.authentication.FormAuthenticator; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.util.MultiMap; -import org.keycloak.adapters.AdapterSessionStore; -import org.keycloak.adapters.jetty.core.JettyHttpFacade; -import org.keycloak.util.MultivaluedHashMap; +import org.keycloak.adapters.spi.AdapterSessionStore; +import org.keycloak.adapters.jetty.spi.JettyHttpFacade; +import org.keycloak.common.util.MultivaluedHashMap; import javax.servlet.http.HttpSession; diff --git a/integration/jetty/jetty9.1/src/main/java/org/keycloak/adapters/jetty/JettyAdapterSessionStore.java b/integration/jetty/jetty9.1/src/main/java/org/keycloak/adapters/jetty/JettyAdapterSessionStore.java index 95e81f97a9..874bf56ab4 100755 --- a/integration/jetty/jetty9.1/src/main/java/org/keycloak/adapters/jetty/JettyAdapterSessionStore.java +++ b/integration/jetty/jetty9.1/src/main/java/org/keycloak/adapters/jetty/JettyAdapterSessionStore.java @@ -4,9 +4,9 @@ import org.eclipse.jetty.http.HttpMethod; import org.eclipse.jetty.security.authentication.FormAuthenticator; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.util.MultiMap; -import org.keycloak.adapters.AdapterSessionStore; -import org.keycloak.adapters.jetty.core.JettyHttpFacade; -import org.keycloak.util.MultivaluedHashMap; +import org.keycloak.adapters.spi.AdapterSessionStore; +import org.keycloak.adapters.jetty.spi.JettyHttpFacade; +import org.keycloak.common.util.MultivaluedHashMap; import javax.servlet.http.HttpSession; diff --git a/integration/jetty/jetty9.2/src/main/java/org/keycloak/adapters/jetty/JettyAdapterSessionStore.java b/integration/jetty/jetty9.2/src/main/java/org/keycloak/adapters/jetty/JettyAdapterSessionStore.java index e8caf2ea77..bc01360e43 100755 --- a/integration/jetty/jetty9.2/src/main/java/org/keycloak/adapters/jetty/JettyAdapterSessionStore.java +++ b/integration/jetty/jetty9.2/src/main/java/org/keycloak/adapters/jetty/JettyAdapterSessionStore.java @@ -4,9 +4,9 @@ import org.eclipse.jetty.http.HttpMethod; import org.eclipse.jetty.security.authentication.FormAuthenticator; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.util.MultiMap; -import org.keycloak.adapters.AdapterSessionStore; -import org.keycloak.adapters.jetty.core.JettyHttpFacade; -import org.keycloak.util.MultivaluedHashMap; +import org.keycloak.adapters.spi.AdapterSessionStore; +import org.keycloak.adapters.jetty.spi.JettyHttpFacade; +import org.keycloak.common.util.MultivaluedHashMap; import javax.servlet.http.HttpSession; diff --git a/integration/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/FilterSessionStore.java b/integration/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/FilterSessionStore.java index b6ddbc7250..aad0ec5ec5 100755 --- a/integration/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/FilterSessionStore.java +++ b/integration/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/FilterSessionStore.java @@ -1,10 +1,10 @@ package org.keycloak.adapters.servlet; -import org.keycloak.adapters.AdapterSessionStore; -import org.keycloak.adapters.HttpFacade; -import org.keycloak.adapters.KeycloakAccount; -import org.keycloak.util.Encode; -import org.keycloak.util.MultivaluedHashMap; +import org.keycloak.adapters.spi.AdapterSessionStore; +import org.keycloak.adapters.spi.HttpFacade; +import org.keycloak.adapters.spi.KeycloakAccount; +import org.keycloak.common.util.Encode; +import org.keycloak.common.util.MultivaluedHashMap; import javax.servlet.ServletException; import javax.servlet.ServletInputStream; @@ -17,8 +17,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.Reader; -import java.io.UnsupportedEncodingException; import java.security.Principal; import java.util.Collections; import java.util.Enumeration; diff --git a/integration/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/ServletHttpFacade.java b/integration/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/ServletHttpFacade.java index f12c9ca8a7..1550eaa745 100755 --- a/integration/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/ServletHttpFacade.java +++ b/integration/servlet-adapter-spi/src/main/java/org/keycloak/adapters/servlet/ServletHttpFacade.java @@ -1,11 +1,9 @@ package org.keycloak.adapters.servlet; -import org.bouncycastle.ocsp.Req; -import org.keycloak.adapters.HttpFacade; -import org.keycloak.util.KeycloakUriBuilder; -import org.keycloak.util.MultivaluedHashMap; -import org.keycloak.util.ServerCookie; -import org.keycloak.util.UriUtils; +import org.keycloak.adapters.spi.HttpFacade; +import org.keycloak.common.util.MultivaluedHashMap; +import org.keycloak.common.util.ServerCookie; +import org.keycloak.common.util.UriUtils; import javax.security.cert.X509Certificate; import javax.servlet.http.HttpServletRequest; @@ -13,7 +11,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.net.URI; import java.util.Enumeration; import java.util.LinkedList; import java.util.List; diff --git a/integration/servlet-filter/src/main/java/org/keycloak/adapters/servlet/KeycloakOIDCFilter.java b/integration/servlet-filter/src/main/java/org/keycloak/adapters/servlet/KeycloakOIDCFilter.java index 1dab8c3fdb..57bd93d608 100755 --- a/integration/servlet-filter/src/main/java/org/keycloak/adapters/servlet/KeycloakOIDCFilter.java +++ b/integration/servlet-filter/src/main/java/org/keycloak/adapters/servlet/KeycloakOIDCFilter.java @@ -1,30 +1,28 @@ package org.keycloak.adapters.servlet; import org.keycloak.adapters.AdapterDeploymentContext; -import org.keycloak.adapters.AuthChallenge; -import org.keycloak.adapters.AuthOutcome; +import org.keycloak.adapters.spi.AuthChallenge; +import org.keycloak.adapters.spi.AuthOutcome; import org.keycloak.adapters.AuthenticatedActionsHandler; -import org.keycloak.adapters.InMemorySessionIdMapper; +import org.keycloak.adapters.spi.InMemorySessionIdMapper; import org.keycloak.adapters.KeycloakConfigResolver; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.KeycloakDeploymentBuilder; import org.keycloak.adapters.NodesRegistrationManagement; import org.keycloak.adapters.PreAuthActionsHandler; -import org.keycloak.adapters.SessionIdMapper; -import org.keycloak.adapters.UserSessionManagement; +import org.keycloak.adapters.spi.SessionIdMapper; +import org.keycloak.adapters.spi.UserSessionManagement; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpServletResponse; -import java.io.ByteArrayInputStream; + import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/integration/servlet-filter/src/main/java/org/keycloak/adapters/servlet/OIDCFilterSessionStore.java b/integration/servlet-filter/src/main/java/org/keycloak/adapters/servlet/OIDCFilterSessionStore.java index bab5cbe3e4..0fa30dc83d 100755 --- a/integration/servlet-filter/src/main/java/org/keycloak/adapters/servlet/OIDCFilterSessionStore.java +++ b/integration/servlet-filter/src/main/java/org/keycloak/adapters/servlet/OIDCFilterSessionStore.java @@ -2,13 +2,13 @@ package org.keycloak.adapters.servlet; import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.AdapterTokenStore; -import org.keycloak.adapters.HttpFacade; -import org.keycloak.adapters.KeycloakAccount; +import org.keycloak.adapters.spi.HttpFacade; +import org.keycloak.adapters.spi.KeycloakAccount; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.OidcKeycloakAccount; import org.keycloak.adapters.RefreshableKeycloakSecurityContext; import org.keycloak.adapters.RequestAuthenticator; -import org.keycloak.adapters.SessionIdMapper; +import org.keycloak.adapters.spi.SessionIdMapper; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; diff --git a/integration/servlet-oauth-client/src/main/java/org/keycloak/servlet/KeycloakDeploymentDelegateOAuthClient.java b/integration/servlet-oauth-client/src/main/java/org/keycloak/servlet/KeycloakDeploymentDelegateOAuthClient.java index fc2445ba46..ae4bc4b2e5 100644 --- a/integration/servlet-oauth-client/src/main/java/org/keycloak/servlet/KeycloakDeploymentDelegateOAuthClient.java +++ b/integration/servlet-oauth-client/src/main/java/org/keycloak/servlet/KeycloakDeploymentDelegateOAuthClient.java @@ -4,9 +4,7 @@ import java.util.Map; import org.keycloak.AbstractOAuthClient; import org.keycloak.adapters.KeycloakDeployment; -import org.keycloak.constants.ServiceUrlConstants; -import org.keycloak.enums.RelativeUrlsUsed; -import org.keycloak.util.KeycloakUriBuilder; +import org.keycloak.common.enums.RelativeUrlsUsed; /** * @author Marek Posolda diff --git a/integration/servlet-oauth-client/src/main/java/org/keycloak/servlet/ServletOAuthClient.java b/integration/servlet-oauth-client/src/main/java/org/keycloak/servlet/ServletOAuthClient.java index ed8744ebf5..c3f1dfd3d5 100755 --- a/integration/servlet-oauth-client/src/main/java/org/keycloak/servlet/ServletOAuthClient.java +++ b/integration/servlet-oauth-client/src/main/java/org/keycloak/servlet/ServletOAuthClient.java @@ -9,7 +9,7 @@ import org.keycloak.adapters.ServerRequest; import org.keycloak.jose.jws.JWSInput; import org.keycloak.representations.AccessTokenResponse; import org.keycloak.representations.IDToken; -import org.keycloak.util.KeycloakUriBuilder; +import org.keycloak.common.util.KeycloakUriBuilder; import javax.security.cert.X509Certificate; import javax.servlet.http.Cookie; diff --git a/integration/servlet-oauth-client/src/test/java/org/keycloak/servlet/ServletOAuthClientBuilderTest.java b/integration/servlet-oauth-client/src/test/java/org/keycloak/servlet/ServletOAuthClientBuilderTest.java index d8f78e2744..c4847e9fc7 100644 --- a/integration/servlet-oauth-client/src/test/java/org/keycloak/servlet/ServletOAuthClientBuilderTest.java +++ b/integration/servlet-oauth-client/src/test/java/org/keycloak/servlet/ServletOAuthClientBuilderTest.java @@ -2,7 +2,7 @@ package org.keycloak.servlet; import org.junit.Assert; import org.junit.Test; -import org.keycloak.enums.RelativeUrlsUsed; +import org.keycloak.common.enums.RelativeUrlsUsed; import org.keycloak.representations.idm.CredentialRepresentation; import static org.junit.Assert.assertEquals; diff --git a/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/SpringSecurityRequestAuthenticator.java b/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/SpringSecurityRequestAuthenticator.java index a080acf004..5e1ed05896 100755 --- a/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/SpringSecurityRequestAuthenticator.java +++ b/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/authentication/SpringSecurityRequestAuthenticator.java @@ -4,8 +4,8 @@ import org.keycloak.KeycloakPrincipal; import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.AdapterTokenStore; import org.keycloak.adapters.AdapterUtils; -import org.keycloak.adapters.HttpFacade; -import org.keycloak.adapters.KeycloakAccount; +import org.keycloak.adapters.spi.HttpFacade; +import org.keycloak.adapters.spi.KeycloakAccount; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.OAuthRequestAuthenticator; import org.keycloak.adapters.OidcKeycloakAccount; diff --git a/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletRequest.java b/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletRequest.java index c72888fb0c..79074da098 100755 --- a/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletRequest.java +++ b/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletRequest.java @@ -1,7 +1,7 @@ package org.keycloak.adapters.springsecurity.facade; -import org.keycloak.adapters.HttpFacade.Cookie; -import org.keycloak.adapters.HttpFacade.Request; +import org.keycloak.adapters.spi.HttpFacade.Cookie; +import org.keycloak.adapters.spi.HttpFacade.Request; import org.springframework.util.Assert; import javax.servlet.http.HttpServletRequest; diff --git a/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletResponse.java b/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletResponse.java index ade1b21812..c6b352fd42 100644 --- a/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletResponse.java +++ b/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/facade/WrappedHttpServletResponse.java @@ -1,6 +1,6 @@ package org.keycloak.adapters.springsecurity.facade; -import org.keycloak.adapters.HttpFacade.Response; +import org.keycloak.adapters.spi.HttpFacade.Response; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -8,7 +8,6 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; /** diff --git a/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticationProcessingFilter.java b/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticationProcessingFilter.java index 961a09e0e7..965c1624ab 100644 --- a/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticationProcessingFilter.java +++ b/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticationProcessingFilter.java @@ -1,8 +1,8 @@ package org.keycloak.adapters.springsecurity.filter; import org.keycloak.adapters.AdapterTokenStore; -import org.keycloak.adapters.AuthChallenge; -import org.keycloak.adapters.AuthOutcome; +import org.keycloak.adapters.spi.AuthChallenge; +import org.keycloak.adapters.spi.AuthOutcome; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.RequestAuthenticator; import org.keycloak.adapters.springsecurity.AdapterDeploymentContextBean; diff --git a/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakPreAuthActionsFilter.java b/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakPreAuthActionsFilter.java index 6605a6bbec..2363b3f1f3 100755 --- a/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakPreAuthActionsFilter.java +++ b/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/filter/KeycloakPreAuthActionsFilter.java @@ -1,18 +1,15 @@ package org.keycloak.adapters.springsecurity.filter; import org.keycloak.adapters.AdapterDeploymentContext; -import org.keycloak.adapters.HttpFacade; -import org.keycloak.adapters.KeycloakDeployment; -import org.keycloak.adapters.KeycloakDeploymentBuilder; +import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.NodesRegistrationManagement; import org.keycloak.adapters.PreAuthActionsHandler; -import org.keycloak.adapters.UserSessionManagement; +import org.keycloak.adapters.spi.UserSessionManagement; import org.keycloak.adapters.springsecurity.AdapterDeploymentContextBean; import org.keycloak.adapters.springsecurity.facade.SimpleHttpFacade; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.web.filter.GenericFilterBean; @@ -24,8 +21,6 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.io.InputStream; -import java.io.Serializable; /** * Exposes a Keycloak adapter {@link PreAuthActionsHandler} as a Spring Security filter. diff --git a/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/HttpSessionManager.java b/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/HttpSessionManager.java index 3492e38dbd..9443de6a9d 100644 --- a/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/HttpSessionManager.java +++ b/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/management/HttpSessionManager.java @@ -1,6 +1,6 @@ package org.keycloak.adapters.springsecurity.management; -import org.keycloak.adapters.UserSessionManagement; +import org.keycloak.adapters.spi.UserSessionManagement; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/KeycloakAuthenticationToken.java b/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/KeycloakAuthenticationToken.java index 12fed2d3c9..6661d84066 100755 --- a/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/KeycloakAuthenticationToken.java +++ b/integration/spring-security/src/main/java/org/keycloak/adapters/springsecurity/token/KeycloakAuthenticationToken.java @@ -1,6 +1,6 @@ package org.keycloak.adapters.springsecurity.token; -import org.keycloak.adapters.KeycloakAccount; +import org.keycloak.adapters.spi.KeycloakAccount; import org.keycloak.adapters.OidcKeycloakAccount; import org.springframework.security.authentication.AbstractAuthenticationToken; import org.springframework.security.authentication.AuthenticationManager; diff --git a/integration/spring-security/src/test/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationProviderTest.java b/integration/spring-security/src/test/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationProviderTest.java index 6f81c0b11c..1865bfda5b 100644 --- a/integration/spring-security/src/test/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationProviderTest.java +++ b/integration/spring-security/src/test/java/org/keycloak/adapters/springsecurity/authentication/KeycloakAuthenticationProviderTest.java @@ -2,7 +2,7 @@ package org.keycloak.adapters.springsecurity.authentication; import org.junit.Before; import org.junit.Test; -import org.keycloak.adapters.KeycloakAccount; +import org.keycloak.adapters.spi.KeycloakAccount; import org.keycloak.adapters.RefreshableKeycloakSecurityContext; import org.keycloak.adapters.springsecurity.account.SimpleKeycloakAccount; import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken; diff --git a/integration/spring-security/src/test/java/org/keycloak/adapters/springsecurity/authentication/SpringSecurityRequestAuthenticatorTest.java b/integration/spring-security/src/test/java/org/keycloak/adapters/springsecurity/authentication/SpringSecurityRequestAuthenticatorTest.java index 301c344d8a..c44610d97b 100755 --- a/integration/spring-security/src/test/java/org/keycloak/adapters/springsecurity/authentication/SpringSecurityRequestAuthenticatorTest.java +++ b/integration/spring-security/src/test/java/org/keycloak/adapters/springsecurity/authentication/SpringSecurityRequestAuthenticatorTest.java @@ -5,7 +5,7 @@ import org.junit.Test; import org.keycloak.KeycloakPrincipal; import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.AdapterTokenStore; -import org.keycloak.adapters.HttpFacade; +import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.OAuthRequestAuthenticator; import org.keycloak.adapters.OidcKeycloakAccount; diff --git a/integration/spring-security/src/test/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticationProcessingFilterTest.java b/integration/spring-security/src/test/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticationProcessingFilterTest.java index f1e29c5825..ab4c03258f 100755 --- a/integration/spring-security/src/test/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticationProcessingFilterTest.java +++ b/integration/spring-security/src/test/java/org/keycloak/adapters/springsecurity/filter/KeycloakAuthenticationProcessingFilterTest.java @@ -4,16 +4,14 @@ import org.junit.Before; import org.junit.Test; import org.keycloak.KeycloakPrincipal; import org.keycloak.KeycloakSecurityContext; -import org.keycloak.adapters.KeycloakAccount; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.OidcKeycloakAccount; import org.keycloak.adapters.springsecurity.AdapterDeploymentContextBean; import org.keycloak.adapters.springsecurity.KeycloakAuthenticationException; import org.keycloak.adapters.springsecurity.account.KeycloakRole; import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken; -import org.keycloak.enums.SslRequired; -import org.keycloak.representations.adapters.config.AdapterConfig; -import org.keycloak.util.KeycloakUriBuilder; +import org.keycloak.common.enums.SslRequired; +import org.keycloak.common.util.KeycloakUriBuilder; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.springframework.context.ApplicationContext; @@ -23,7 +21,6 @@ import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.authentication.AuthenticationFailureHandler; import org.springframework.security.web.authentication.AuthenticationSuccessHandler; diff --git a/integration/spring-security/src/test/java/org/keycloak/adapters/springsecurity/token/SpringSecurityAdapterTokenStoreFactoryTest.java b/integration/spring-security/src/test/java/org/keycloak/adapters/springsecurity/token/SpringSecurityAdapterTokenStoreFactoryTest.java index a5f5b0705b..c0f27e16ee 100755 --- a/integration/spring-security/src/test/java/org/keycloak/adapters/springsecurity/token/SpringSecurityAdapterTokenStoreFactoryTest.java +++ b/integration/spring-security/src/test/java/org/keycloak/adapters/springsecurity/token/SpringSecurityAdapterTokenStoreFactoryTest.java @@ -2,7 +2,7 @@ package org.keycloak.adapters.springsecurity.token; import org.junit.Before; import org.junit.Test; -import org.keycloak.adapters.AdapterSessionStore; +import org.keycloak.adapters.spi.AdapterSessionStore; import org.keycloak.adapters.KeycloakDeployment; import org.mockito.Mock; import org.mockito.MockitoAnnotations; diff --git a/integration/tomcat/tomcat-adapter-spi/src/main/java/org/keycloak/adapters/tomcat/CatalinaHttpFacade.java b/integration/tomcat/tomcat-adapter-spi/src/main/java/org/keycloak/adapters/tomcat/CatalinaHttpFacade.java index b195f393e0..cdac621243 100755 --- a/integration/tomcat/tomcat-adapter-spi/src/main/java/org/keycloak/adapters/tomcat/CatalinaHttpFacade.java +++ b/integration/tomcat/tomcat-adapter-spi/src/main/java/org/keycloak/adapters/tomcat/CatalinaHttpFacade.java @@ -1,9 +1,9 @@ package org.keycloak.adapters.tomcat; -import org.keycloak.adapters.HttpFacade; -import org.keycloak.util.MultivaluedHashMap; -import org.keycloak.util.ServerCookie; -import org.keycloak.util.UriUtils; +import org.keycloak.adapters.spi.HttpFacade; +import org.keycloak.common.util.MultivaluedHashMap; +import org.keycloak.common.util.ServerCookie; +import org.keycloak.common.util.UriUtils; import javax.security.cert.X509Certificate; import javax.servlet.http.HttpServletResponse; diff --git a/integration/tomcat/tomcat-adapter-spi/src/main/java/org/keycloak/adapters/tomcat/CatalinaUserSessionManagementWrapper.java b/integration/tomcat/tomcat-adapter-spi/src/main/java/org/keycloak/adapters/tomcat/CatalinaUserSessionManagementWrapper.java index 5c3cf62dca..53982d2630 100755 --- a/integration/tomcat/tomcat-adapter-spi/src/main/java/org/keycloak/adapters/tomcat/CatalinaUserSessionManagementWrapper.java +++ b/integration/tomcat/tomcat-adapter-spi/src/main/java/org/keycloak/adapters/tomcat/CatalinaUserSessionManagementWrapper.java @@ -3,7 +3,7 @@ package org.keycloak.adapters.tomcat; import java.util.List; import org.apache.catalina.Manager; -import org.keycloak.adapters.UserSessionManagement; +import org.keycloak.adapters.spi.UserSessionManagement; /** * @author Marek Posolda diff --git a/integration/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/AbstractKeycloakAuthenticatorValve.java b/integration/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/AbstractKeycloakAuthenticatorValve.java index 51b89f81ab..89bee43e3e 100755 --- a/integration/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/AbstractKeycloakAuthenticatorValve.java +++ b/integration/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/AbstractKeycloakAuthenticatorValve.java @@ -12,9 +12,9 @@ import org.keycloak.KeycloakSecurityContext; import org.keycloak.constants.AdapterConstants; import org.keycloak.adapters.AdapterDeploymentContext; import org.keycloak.adapters.AdapterTokenStore; -import org.keycloak.adapters.AuthChallenge; -import org.keycloak.adapters.AuthOutcome; -import org.keycloak.adapters.HttpFacade; +import org.keycloak.adapters.spi.AuthChallenge; +import org.keycloak.adapters.spi.AuthOutcome; +import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.KeycloakDeploymentBuilder; import org.keycloak.adapters.NodesRegistrationManagement; diff --git a/integration/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/CatalinaAdapterSessionStore.java b/integration/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/CatalinaAdapterSessionStore.java index f1ffbf07d4..d4edf2f291 100755 --- a/integration/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/CatalinaAdapterSessionStore.java +++ b/integration/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/CatalinaAdapterSessionStore.java @@ -1,7 +1,7 @@ package org.keycloak.adapters.tomcat; import org.apache.catalina.connector.Request; -import org.keycloak.adapters.AdapterSessionStore; +import org.keycloak.adapters.spi.AdapterSessionStore; import java.io.IOException; diff --git a/integration/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/CatalinaCookieTokenStore.java b/integration/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/CatalinaCookieTokenStore.java index c70fa06c0e..471e5581b0 100755 --- a/integration/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/CatalinaCookieTokenStore.java +++ b/integration/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/CatalinaCookieTokenStore.java @@ -10,7 +10,7 @@ import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.AdapterTokenStore; import org.keycloak.adapters.AdapterUtils; import org.keycloak.adapters.CookieTokenStore; -import org.keycloak.adapters.HttpFacade; +import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.OidcKeycloakAccount; import org.keycloak.adapters.RefreshableKeycloakSecurityContext; diff --git a/integration/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/ServletHttpFacade.java b/integration/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/ServletHttpFacade.java index 60bfaa4836..0b10188c44 100755 --- a/integration/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/ServletHttpFacade.java +++ b/integration/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/ServletHttpFacade.java @@ -2,13 +2,9 @@ package org.keycloak.adapters.undertow; import io.undertow.server.HttpServerExchange; import io.undertow.servlet.handlers.ServletRequestContext; -import org.keycloak.adapters.HttpFacade; -import javax.security.cert.X509Certificate; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.InputStream; -import java.util.List; /** * @author Bill Burke diff --git a/integration/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/SessionManagementBridge.java b/integration/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/SessionManagementBridge.java index a0cde4ca15..f9ac9aed75 100755 --- a/integration/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/SessionManagementBridge.java +++ b/integration/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/SessionManagementBridge.java @@ -17,10 +17,9 @@ package org.keycloak.adapters.undertow; import io.undertow.server.session.SessionManager; -import org.keycloak.adapters.UserSessionManagement; +import org.keycloak.adapters.spi.UserSessionManagement; import java.util.List; -import java.util.Set; /** * @author Bill Burke diff --git a/integration/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpFacade.java b/integration/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpFacade.java index 1abb86c353..3d378777f6 100755 --- a/integration/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpFacade.java +++ b/integration/undertow-adapter-spi/src/main/java/org/keycloak/adapters/undertow/UndertowHttpFacade.java @@ -4,8 +4,8 @@ import io.undertow.server.HttpServerExchange; import io.undertow.server.handlers.CookieImpl; import io.undertow.util.Headers; import io.undertow.util.HttpString; -import org.keycloak.adapters.HttpFacade; -import org.keycloak.util.KeycloakUriBuilder; +import org.keycloak.adapters.spi.HttpFacade; +import org.keycloak.common.util.KeycloakUriBuilder; import javax.security.cert.X509Certificate; import java.io.IOException; diff --git a/integration/undertow/src/main/java/org/keycloak/adapters/undertow/AbstractUndertowKeycloakAuthMech.java b/integration/undertow/src/main/java/org/keycloak/adapters/undertow/AbstractUndertowKeycloakAuthMech.java index 790078ff61..aded0efc1b 100755 --- a/integration/undertow/src/main/java/org/keycloak/adapters/undertow/AbstractUndertowKeycloakAuthMech.java +++ b/integration/undertow/src/main/java/org/keycloak/adapters/undertow/AbstractUndertowKeycloakAuthMech.java @@ -27,9 +27,9 @@ import io.undertow.util.StatusCodes; import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.AdapterDeploymentContext; import org.keycloak.adapters.AdapterTokenStore; -import org.keycloak.adapters.AuthChallenge; -import org.keycloak.adapters.AuthOutcome; -import org.keycloak.adapters.HttpFacade; +import org.keycloak.adapters.spi.AuthChallenge; +import org.keycloak.adapters.spi.AuthOutcome; +import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.RefreshableKeycloakSecurityContext; import org.keycloak.adapters.RequestAuthenticator; diff --git a/integration/undertow/src/main/java/org/keycloak/adapters/undertow/AbstractUndertowRequestAuthenticator.java b/integration/undertow/src/main/java/org/keycloak/adapters/undertow/AbstractUndertowRequestAuthenticator.java index 84c5fddd18..18c846c8aa 100755 --- a/integration/undertow/src/main/java/org/keycloak/adapters/undertow/AbstractUndertowRequestAuthenticator.java +++ b/integration/undertow/src/main/java/org/keycloak/adapters/undertow/AbstractUndertowRequestAuthenticator.java @@ -23,7 +23,7 @@ import io.undertow.util.Sessions; import org.keycloak.KeycloakPrincipal; import org.keycloak.adapters.AdapterTokenStore; -import org.keycloak.adapters.HttpFacade; +import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.OAuthRequestAuthenticator; import org.keycloak.adapters.RefreshableKeycloakSecurityContext; diff --git a/integration/undertow/src/main/java/org/keycloak/adapters/undertow/ServletKeycloakAuthMech.java b/integration/undertow/src/main/java/org/keycloak/adapters/undertow/ServletKeycloakAuthMech.java index bfa2cb346b..b5984a491f 100755 --- a/integration/undertow/src/main/java/org/keycloak/adapters/undertow/ServletKeycloakAuthMech.java +++ b/integration/undertow/src/main/java/org/keycloak/adapters/undertow/ServletKeycloakAuthMech.java @@ -24,7 +24,7 @@ import io.undertow.util.Headers; import org.jboss.logging.Logger; import org.keycloak.adapters.AdapterDeploymentContext; import org.keycloak.adapters.AdapterTokenStore; -import org.keycloak.adapters.HttpFacade; +import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.NodesRegistrationManagement; import org.keycloak.adapters.RequestAuthenticator; diff --git a/integration/undertow/src/main/java/org/keycloak/adapters/undertow/ServletRequestAuthenticator.java b/integration/undertow/src/main/java/org/keycloak/adapters/undertow/ServletRequestAuthenticator.java index 812a685c1e..881407d205 100755 --- a/integration/undertow/src/main/java/org/keycloak/adapters/undertow/ServletRequestAuthenticator.java +++ b/integration/undertow/src/main/java/org/keycloak/adapters/undertow/ServletRequestAuthenticator.java @@ -19,15 +19,13 @@ package org.keycloak.adapters.undertow; import io.undertow.security.api.SecurityContext; import io.undertow.server.HttpServerExchange; import io.undertow.servlet.handlers.ServletRequestContext; -import io.undertow.servlet.util.SavedRequest; import org.keycloak.KeycloakPrincipal; import org.keycloak.KeycloakSecurityContext; import org.keycloak.adapters.AdapterTokenStore; -import org.keycloak.adapters.HttpFacade; +import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.OAuthRequestAuthenticator; import org.keycloak.adapters.RefreshableKeycloakSecurityContext; -import org.keycloak.enums.TokenStore; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; diff --git a/integration/undertow/src/main/java/org/keycloak/adapters/undertow/UndertowCookieTokenStore.java b/integration/undertow/src/main/java/org/keycloak/adapters/undertow/UndertowCookieTokenStore.java index 4be2bbeca9..5dc71e516c 100755 --- a/integration/undertow/src/main/java/org/keycloak/adapters/undertow/UndertowCookieTokenStore.java +++ b/integration/undertow/src/main/java/org/keycloak/adapters/undertow/UndertowCookieTokenStore.java @@ -5,7 +5,7 @@ import org.jboss.logging.Logger; import org.keycloak.KeycloakPrincipal; import org.keycloak.adapters.AdapterTokenStore; import org.keycloak.adapters.CookieTokenStore; -import org.keycloak.adapters.HttpFacade; +import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.OidcKeycloakAccount; import org.keycloak.adapters.RefreshableKeycloakSecurityContext; diff --git a/integration/undertow/src/main/java/org/keycloak/adapters/undertow/UndertowRequestAuthenticator.java b/integration/undertow/src/main/java/org/keycloak/adapters/undertow/UndertowRequestAuthenticator.java index d3bccd475c..61f8088060 100755 --- a/integration/undertow/src/main/java/org/keycloak/adapters/undertow/UndertowRequestAuthenticator.java +++ b/integration/undertow/src/main/java/org/keycloak/adapters/undertow/UndertowRequestAuthenticator.java @@ -4,11 +4,9 @@ import io.undertow.security.api.SecurityContext; import io.undertow.server.HttpServerExchange; import org.keycloak.KeycloakPrincipal; import org.keycloak.adapters.AdapterTokenStore; -import org.keycloak.adapters.HttpFacade; +import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.RefreshableKeycloakSecurityContext; -import org.keycloak.adapters.undertow.AbstractUndertowRequestAuthenticator; -import org.keycloak.adapters.undertow.KeycloakUndertowAccount; /** * @author Bill Burke diff --git a/integration/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/SecurityInfoHelper.java b/integration/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/SecurityInfoHelper.java index 5f13cd6769..33c149b405 100755 --- a/integration/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/SecurityInfoHelper.java +++ b/integration/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/SecurityInfoHelper.java @@ -5,7 +5,7 @@ import org.jboss.security.SecurityConstants; import org.jboss.security.SecurityContextAssociation; import org.jboss.security.SimpleGroup; import org.jboss.security.SimplePrincipal; -import org.keycloak.adapters.KeycloakAccount; +import org.keycloak.adapters.spi.KeycloakAccount; import javax.security.auth.Subject; import java.security.Principal; diff --git a/integration/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/WildflyRequestAuthenticator.java b/integration/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/WildflyRequestAuthenticator.java index 7930d95317..80ed882e68 100755 --- a/integration/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/WildflyRequestAuthenticator.java +++ b/integration/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/wildfly/WildflyRequestAuthenticator.java @@ -9,11 +9,10 @@ import org.jboss.security.SecurityContextAssociation; import org.jboss.security.SimpleGroup; import org.jboss.security.SimplePrincipal; import org.keycloak.adapters.AdapterTokenStore; -import org.keycloak.adapters.HttpFacade; +import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.undertow.KeycloakUndertowAccount; import org.keycloak.adapters.undertow.ServletRequestAuthenticator; -import org.keycloak.adapters.undertow.UndertowUserSessionManagement; import javax.security.auth.Subject; import java.security.Principal; diff --git a/model/api/src/main/java/org/keycloak/models/KeycloakContext.java b/model/api/src/main/java/org/keycloak/models/KeycloakContext.java index e66927af63..cf8bc6dbf5 100755 --- a/model/api/src/main/java/org/keycloak/models/KeycloakContext.java +++ b/model/api/src/main/java/org/keycloak/models/KeycloakContext.java @@ -1,6 +1,6 @@ package org.keycloak.models; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.models.utils.RealmImporter; import javax.ws.rs.core.HttpHeaders; diff --git a/model/api/src/main/java/org/keycloak/models/RealmModel.java b/model/api/src/main/java/org/keycloak/models/RealmModel.java index 8eb13ee4a8..0737ee385b 100755 --- a/model/api/src/main/java/org/keycloak/models/RealmModel.java +++ b/model/api/src/main/java/org/keycloak/models/RealmModel.java @@ -1,6 +1,6 @@ package org.keycloak.models; -import org.keycloak.enums.SslRequired; +import org.keycloak.common.enums.SslRequired; import org.keycloak.provider.ProviderEvent; import java.security.Key; diff --git a/model/api/src/main/java/org/keycloak/models/utils/CredentialValidation.java b/model/api/src/main/java/org/keycloak/models/utils/CredentialValidation.java index 3411f59c89..7ce15d8eee 100755 --- a/model/api/src/main/java/org/keycloak/models/utils/CredentialValidation.java +++ b/model/api/src/main/java/org/keycloak/models/utils/CredentialValidation.java @@ -9,7 +9,7 @@ import org.keycloak.models.UserCredentialModel; import org.keycloak.models.UserCredentialValueModel; import org.keycloak.models.UserModel; import org.keycloak.representations.PasswordToken; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import java.io.IOException; import java.util.List; diff --git a/model/api/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java b/model/api/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java index 846269ef8f..4b630d8019 100755 --- a/model/api/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java +++ b/model/api/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java @@ -1,8 +1,6 @@ package org.keycloak.models.utils; import org.bouncycastle.openssl.PEMWriter; -import org.keycloak.constants.KerberosConstants; -import org.keycloak.constants.ServiceAccountConstants; import org.keycloak.models.ClientModel; import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; @@ -11,15 +9,14 @@ import org.keycloak.models.KeycloakSessionTask; import org.keycloak.models.KeycloakTransaction; import org.keycloak.models.ModelDuplicateException; import org.keycloak.models.RealmModel; -import org.keycloak.models.RequiredCredentialModel; import org.keycloak.models.RoleModel; import org.keycloak.models.UserCredentialModel; import org.keycloak.models.UserFederationMapperModel; import org.keycloak.models.UserFederationProviderModel; import org.keycloak.models.UserModel; import org.keycloak.representations.idm.CertificateRepresentation; -import org.keycloak.util.CertificateUtils; -import org.keycloak.util.PemUtils; +import org.keycloak.common.util.CertificateUtils; +import org.keycloak.common.util.PemUtils; import javax.crypto.spec.SecretKeySpec; import java.io.IOException; diff --git a/model/api/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java b/model/api/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java index 084d012107..732444eab1 100755 --- a/model/api/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java +++ b/model/api/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java @@ -44,7 +44,7 @@ import org.keycloak.representations.idm.UserFederationMapperRepresentation; import org.keycloak.representations.idm.UserFederationProviderRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.idm.UserSessionRepresentation; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import java.util.ArrayList; import java.util.Collection; diff --git a/model/api/src/main/java/org/keycloak/models/utils/Pbkdf2PasswordEncoder.java b/model/api/src/main/java/org/keycloak/models/utils/Pbkdf2PasswordEncoder.java index 066f424655..9558b06883 100755 --- a/model/api/src/main/java/org/keycloak/models/utils/Pbkdf2PasswordEncoder.java +++ b/model/api/src/main/java/org/keycloak/models/utils/Pbkdf2PasswordEncoder.java @@ -1,6 +1,6 @@ package org.keycloak.models.utils; -import org.keycloak.util.Base64; +import org.keycloak.common.util.Base64; import javax.crypto.SecretKeyFactory; import javax.crypto.spec.PBEKeySpec; diff --git a/model/api/src/main/java/org/keycloak/models/utils/RepresentationToModel.java b/model/api/src/main/java/org/keycloak/models/utils/RepresentationToModel.java index 0e1e40eb04..025ac8a2ab 100755 --- a/model/api/src/main/java/org/keycloak/models/utils/RepresentationToModel.java +++ b/model/api/src/main/java/org/keycloak/models/utils/RepresentationToModel.java @@ -1,9 +1,9 @@ package org.keycloak.models.utils; import org.keycloak.models.Constants; -import org.keycloak.util.Base64; +import org.keycloak.common.util.Base64; import org.jboss.logging.Logger; -import org.keycloak.enums.SslRequired; +import org.keycloak.common.enums.SslRequired; import org.keycloak.migration.MigrationProvider; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticationFlowModel; @@ -49,7 +49,7 @@ import org.keycloak.representations.idm.UserConsentRepresentation; import org.keycloak.representations.idm.UserFederationMapperRepresentation; import org.keycloak.representations.idm.UserFederationProviderRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.util.UriUtils; +import org.keycloak.common.util.UriUtils; import java.io.IOException; import java.util.ArrayList; diff --git a/model/api/src/main/java/org/keycloak/models/utils/SHAPasswordEncoder.java b/model/api/src/main/java/org/keycloak/models/utils/SHAPasswordEncoder.java index a316a485bb..ca52765e63 100755 --- a/model/api/src/main/java/org/keycloak/models/utils/SHAPasswordEncoder.java +++ b/model/api/src/main/java/org/keycloak/models/utils/SHAPasswordEncoder.java @@ -1,6 +1,6 @@ package org.keycloak.models.utils; -import org.keycloak.util.Base64; +import org.keycloak.common.util.Base64; import java.io.UnsupportedEncodingException; import java.security.MessageDigest; diff --git a/model/api/src/main/java/org/keycloak/models/utils/reflection/MethodPropertyImpl.java b/model/api/src/main/java/org/keycloak/models/utils/reflection/MethodPropertyImpl.java index 7e2952e059..ebe8ccefc0 100755 --- a/model/api/src/main/java/org/keycloak/models/utils/reflection/MethodPropertyImpl.java +++ b/model/api/src/main/java/org/keycloak/models/utils/reflection/MethodPropertyImpl.java @@ -1,6 +1,6 @@ package org.keycloak.models.utils.reflection; -import org.keycloak.util.reflections.Reflections; +import org.keycloak.common.util.reflections.Reflections; import java.beans.Introspector; import java.lang.annotation.Annotation; diff --git a/model/file/src/main/java/org/keycloak/models/file/adapter/RealmAdapter.java b/model/file/src/main/java/org/keycloak/models/file/adapter/RealmAdapter.java index 381c172b47..584348074e 100755 --- a/model/file/src/main/java/org/keycloak/models/file/adapter/RealmAdapter.java +++ b/model/file/src/main/java/org/keycloak/models/file/adapter/RealmAdapter.java @@ -17,7 +17,7 @@ package org.keycloak.models.file.adapter; import org.keycloak.connections.file.InMemoryModel; -import org.keycloak.enums.SslRequired; +import org.keycloak.common.enums.SslRequired; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticationFlowModel; import org.keycloak.models.AuthenticatorConfigModel; diff --git a/model/file/src/main/java/org/keycloak/models/file/adapter/UserAdapter.java b/model/file/src/main/java/org/keycloak/models/file/adapter/UserAdapter.java index a4442c8029..9a3379c610 100755 --- a/model/file/src/main/java/org/keycloak/models/file/adapter/UserAdapter.java +++ b/model/file/src/main/java/org/keycloak/models/file/adapter/UserAdapter.java @@ -36,7 +36,7 @@ import org.keycloak.models.entities.RoleEntity; import org.keycloak.models.entities.UserEntity; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.Pbkdf2PasswordEncoder; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import java.util.ArrayList; import java.util.Collections; diff --git a/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmAdapter.java b/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmAdapter.java index e9b92a63eb..13ec945ee7 100755 --- a/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmAdapter.java +++ b/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmAdapter.java @@ -1,7 +1,7 @@ package org.keycloak.models.cache.infinispan; import org.keycloak.Config; -import org.keycloak.enums.SslRequired; +import org.keycloak.common.enums.SslRequired; import org.keycloak.models.*; import org.keycloak.models.cache.CacheRealmProvider; import org.keycloak.models.cache.RealmCache; diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedRealm.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedRealm.java index 3aa7d383f6..18b8540e4d 100755 --- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedRealm.java +++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedRealm.java @@ -1,6 +1,6 @@ package org.keycloak.models.cache.entities; -import org.keycloak.enums.SslRequired; +import org.keycloak.common.enums.SslRequired; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticationFlowModel; import org.keycloak.models.AuthenticatorConfigModel; @@ -17,7 +17,7 @@ import org.keycloak.models.RoleModel; import org.keycloak.models.UserFederationMapperModel; import org.keycloak.models.UserFederationProviderModel; import org.keycloak.models.cache.RealmCache; -import org.keycloak.util.MultivaluedHashMap; +import org.keycloak.common.util.MultivaluedHashMap; import java.io.Serializable; import java.util.ArrayList; diff --git a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedUser.java b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedUser.java index 0083856d14..0b5fc78496 100755 --- a/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedUser.java +++ b/model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/entities/CachedUser.java @@ -4,7 +4,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.models.UserCredentialValueModel; import org.keycloak.models.UserModel; -import org.keycloak.util.MultivaluedHashMap; +import org.keycloak.common.util.MultivaluedHashMap; import java.io.Serializable; import java.util.HashSet; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/MigrationModelAdapter.java b/model/jpa/src/main/java/org/keycloak/models/jpa/MigrationModelAdapter.java index 9fcaab86f6..c219aaa858 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/MigrationModelAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/MigrationModelAdapter.java @@ -2,11 +2,8 @@ package org.keycloak.models.jpa; import org.keycloak.migration.MigrationModel; import org.keycloak.models.jpa.entities.MigrationModelEntity; -import org.keycloak.util.Time; import javax.persistence.EntityManager; -import javax.persistence.Query; -import java.util.List; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java b/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java index 9290013ddc..86f4490a03 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/RealmAdapter.java @@ -1,7 +1,7 @@ package org.keycloak.models.jpa; import org.keycloak.connections.jpa.util.JpaUtils; -import org.keycloak.enums.SslRequired; +import org.keycloak.common.enums.SslRequired; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticationFlowModel; import org.keycloak.models.AuthenticatorConfigModel; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/UserAdapter.java b/model/jpa/src/main/java/org/keycloak/models/jpa/UserAdapter.java index 9757d5bb53..b370886ccb 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/UserAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/UserAdapter.java @@ -23,8 +23,8 @@ import org.keycloak.models.jpa.entities.UserRequiredActionEntity; import org.keycloak.models.jpa.entities.UserRoleMappingEntity; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.Pbkdf2PasswordEncoder; -import org.keycloak.util.MultivaluedHashMap; -import org.keycloak.util.Time; +import org.keycloak.common.util.MultivaluedHashMap; +import org.keycloak.common.util.Time; import javax.persistence.EntityManager; import javax.persistence.TypedQuery; diff --git a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/RealmAdapter.java b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/RealmAdapter.java index b03c463792..f21744de14 100755 --- a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/RealmAdapter.java +++ b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/RealmAdapter.java @@ -4,7 +4,7 @@ import com.mongodb.DBObject; import com.mongodb.QueryBuilder; import org.keycloak.connections.mongo.api.context.MongoStoreInvocationContext; -import org.keycloak.enums.SslRequired; +import org.keycloak.common.enums.SslRequired; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticationFlowModel; import org.keycloak.models.AuthenticatorConfigModel; diff --git a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/UserAdapter.java b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/UserAdapter.java index 16c4431c20..3235eac1cc 100755 --- a/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/UserAdapter.java +++ b/model/mongo/src/main/java/org/keycloak/models/mongo/keycloak/adapters/UserAdapter.java @@ -26,7 +26,7 @@ import org.keycloak.models.mongo.keycloak.entities.MongoUserEntity; import org.keycloak.models.mongo.utils.MongoModelUtils; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.Pbkdf2PasswordEncoder; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import java.util.ArrayList; import java.util.Collections; diff --git a/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProvider.java b/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProvider.java index 627edcfe96..9ba15878a4 100755 --- a/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProvider.java +++ b/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProvider.java @@ -7,7 +7,6 @@ import org.keycloak.models.ClientModel; import org.keycloak.models.ClientSessionModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakTransaction; -import org.keycloak.models.ModelException; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; @@ -20,7 +19,6 @@ import org.keycloak.models.sessions.infinispan.entities.LoginFailureKey; import org.keycloak.models.sessions.infinispan.entities.SessionEntity; import org.keycloak.models.sessions.infinispan.entities.UserSessionEntity; import org.keycloak.models.sessions.infinispan.mapreduce.ClientSessionMapper; -import org.keycloak.models.sessions.infinispan.mapreduce.ClientSessionsOfUserSessionMapper; import org.keycloak.models.sessions.infinispan.mapreduce.FirstResultReducer; import org.keycloak.models.sessions.infinispan.mapreduce.LargestResultReducer; import org.keycloak.models.sessions.infinispan.mapreduce.SessionMapper; @@ -29,7 +27,7 @@ import org.keycloak.models.sessions.infinispan.mapreduce.UserSessionMapper; import org.keycloak.models.sessions.infinispan.mapreduce.UserSessionNoteMapper; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.RealmInfoUtil; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import java.util.Collection; import java.util.Collections; diff --git a/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/compat/MemUserSessionProvider.java b/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/compat/MemUserSessionProvider.java index 23c1286c4d..f45edf162c 100755 --- a/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/compat/MemUserSessionProvider.java +++ b/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/compat/MemUserSessionProvider.java @@ -4,7 +4,6 @@ import org.keycloak.models.ClientModel; import org.keycloak.models.ClientSessionModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ModelDuplicateException; -import org.keycloak.models.ModelException; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; @@ -17,7 +16,7 @@ import org.keycloak.models.sessions.infinispan.compat.entities.UsernameLoginFail import org.keycloak.models.sessions.infinispan.compat.entities.UsernameLoginFailureKey; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.RealmInfoUtil; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import java.util.Collections; import java.util.Comparator; diff --git a/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/initializer/OfflineUserSessionLoader.java b/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/initializer/OfflineUserSessionLoader.java index db218e2091..660a0d2259 100644 --- a/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/initializer/OfflineUserSessionLoader.java +++ b/model/sessions-infinispan/src/main/java/org/keycloak/models/sessions/infinispan/initializer/OfflineUserSessionLoader.java @@ -7,7 +7,6 @@ import org.keycloak.models.ClientSessionModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.UserSessionModel; import org.keycloak.models.session.UserSessionPersisterProvider; -import org.keycloak.util.Time; /** * @author Marek Posolda diff --git a/proxy/proxy-server/src/main/java/org/keycloak/proxy/ProxyServerBuilder.java b/proxy/proxy-server/src/main/java/org/keycloak/proxy/ProxyServerBuilder.java index b4ad9b990e..926f6bd1c6 100755 --- a/proxy/proxy-server/src/main/java/org/keycloak/proxy/ProxyServerBuilder.java +++ b/proxy/proxy-server/src/main/java/org/keycloak/proxy/ProxyServerBuilder.java @@ -23,7 +23,7 @@ import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.annotate.JsonSerialize; import org.jboss.logging.Logger; import org.keycloak.adapters.AdapterDeploymentContext; -import org.keycloak.util.FindFile; +import org.keycloak.common.util.FindFile; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.KeycloakDeploymentBuilder; import org.keycloak.adapters.NodesRegistrationManagement; @@ -31,9 +31,9 @@ import org.keycloak.adapters.undertow.UndertowAuthenticatedActionsHandler; import org.keycloak.adapters.undertow.UndertowAuthenticationMechanism; import org.keycloak.adapters.undertow.UndertowPreAuthActionsHandler; import org.keycloak.adapters.undertow.UndertowUserSessionManagement; -import org.keycloak.enums.SslRequired; +import org.keycloak.common.enums.SslRequired; import org.keycloak.representations.adapters.config.AdapterConfig; -import org.keycloak.util.CertificateUtils; +import org.keycloak.common.util.CertificateUtils; import org.keycloak.util.SystemPropertiesJsonParserFactory; import org.xnio.Option; diff --git a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/DefaultSamlDeployment.java b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/DefaultSamlDeployment.java index 4aa54d6422..26fad92c23 100755 --- a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/DefaultSamlDeployment.java +++ b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/DefaultSamlDeployment.java @@ -1,8 +1,6 @@ package org.keycloak.adapters.saml; -import org.keycloak.adapters.saml.SamlDeployment; -import org.keycloak.adapters.saml.config.IDP; -import org.keycloak.enums.SslRequired; +import org.keycloak.common.enums.SslRequired; import org.keycloak.saml.SignatureAlgorithm; import java.security.KeyPair; diff --git a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/InitiateLogin.java b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/InitiateLogin.java index c0f8dc4e76..a34fb1b847 100755 --- a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/InitiateLogin.java +++ b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/InitiateLogin.java @@ -1,8 +1,8 @@ package org.keycloak.adapters.saml; import org.jboss.logging.Logger; -import org.keycloak.adapters.AuthChallenge; -import org.keycloak.adapters.HttpFacade; +import org.keycloak.adapters.spi.AuthChallenge; +import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.saml.BaseSAML2BindingBuilder; import org.keycloak.saml.SAML2AuthnRequestBuilder; import org.keycloak.saml.SAML2NameIDPolicyBuilder; diff --git a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlAuthenticator.java b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlAuthenticator.java index b404f9b7d2..fb66a708de 100755 --- a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlAuthenticator.java +++ b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlAuthenticator.java @@ -1,10 +1,10 @@ package org.keycloak.adapters.saml; import org.jboss.logging.Logger; -import org.keycloak.VerificationException; -import org.keycloak.adapters.AuthChallenge; -import org.keycloak.adapters.AuthOutcome; -import org.keycloak.adapters.HttpFacade; +import org.keycloak.common.VerificationException; +import org.keycloak.adapters.spi.AuthChallenge; +import org.keycloak.adapters.spi.AuthOutcome; +import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.dom.saml.v2.assertion.AssertionType; import org.keycloak.dom.saml.v2.assertion.AttributeStatementType; import org.keycloak.dom.saml.v2.assertion.AttributeType; @@ -22,20 +22,17 @@ import org.keycloak.saml.SAML2LogoutResponseBuilder; import org.keycloak.saml.SAMLRequestParser; import org.keycloak.saml.SignatureAlgorithm; import org.keycloak.saml.common.constants.GeneralConstants; -import org.keycloak.saml.common.exceptions.ConfigurationException; -import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.common.util.Base64; import org.keycloak.saml.processing.api.saml.v2.sig.SAML2Signature; import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; import org.keycloak.saml.processing.core.saml.v2.util.AssertionUtil; import org.keycloak.saml.processing.web.util.PostBindingUtil; -import org.keycloak.util.KeycloakUriBuilder; -import org.keycloak.util.MultivaluedHashMap; +import org.keycloak.common.util.KeycloakUriBuilder; +import org.keycloak.common.util.MultivaluedHashMap; import org.w3c.dom.Document; import org.w3c.dom.Node; -import java.io.IOException; import java.security.PublicKey; import java.security.Signature; import java.util.HashSet; diff --git a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlConfigResolver.java b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlConfigResolver.java index 2479a2349d..919bd67242 100755 --- a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlConfigResolver.java +++ b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlConfigResolver.java @@ -16,7 +16,7 @@ */ package org.keycloak.adapters.saml; -import org.keycloak.adapters.HttpFacade.Request; +import org.keycloak.adapters.spi.HttpFacade.Request; /** * On multi-tenant scenarios, Keycloak will defer the resolution of a diff --git a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlDeployment.java b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlDeployment.java index 258f14bca3..072844738c 100755 --- a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlDeployment.java +++ b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlDeployment.java @@ -1,6 +1,6 @@ package org.keycloak.adapters.saml; -import org.keycloak.enums.SslRequired; +import org.keycloak.common.enums.SslRequired; import org.keycloak.saml.SignatureAlgorithm; import java.security.KeyPair; diff --git a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlDeploymentContext.java b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlDeploymentContext.java index cb8ea7794b..f9c67263d5 100755 --- a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlDeploymentContext.java +++ b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlDeploymentContext.java @@ -1,6 +1,6 @@ package org.keycloak.adapters.saml; -import org.keycloak.adapters.HttpFacade; +import org.keycloak.adapters.spi.HttpFacade; /** * @author Bill Burke diff --git a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlPrincipal.java b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlPrincipal.java index 68b23dafdb..ef1599f803 100755 --- a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlPrincipal.java +++ b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlPrincipal.java @@ -1,6 +1,6 @@ package org.keycloak.adapters.saml; -import org.keycloak.util.MultivaluedHashMap; +import org.keycloak.common.util.MultivaluedHashMap; import java.io.Serializable; import java.security.Principal; diff --git a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlSession.java b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlSession.java index 201c46445f..57a4199569 100755 --- a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlSession.java +++ b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlSession.java @@ -1,9 +1,8 @@ package org.keycloak.adapters.saml; -import org.keycloak.adapters.KeycloakAccount; +import org.keycloak.adapters.spi.KeycloakAccount; import java.io.Serializable; -import java.security.Principal; import java.util.Set; /** diff --git a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlSessionStore.java b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlSessionStore.java index 6b6a83ab69..da200264ac 100755 --- a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlSessionStore.java +++ b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlSessionStore.java @@ -1,6 +1,6 @@ package org.keycloak.adapters.saml; -import org.keycloak.adapters.AdapterSessionStore; +import org.keycloak.adapters.spi.AdapterSessionStore; import java.util.List; diff --git a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlUtil.java b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlUtil.java index e0ea5ecb97..d3d9a0f6eb 100755 --- a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlUtil.java +++ b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/SamlUtil.java @@ -1,6 +1,6 @@ package org.keycloak.adapters.saml; -import org.keycloak.adapters.HttpFacade; +import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.saml.BaseSAML2BindingBuilder; import org.keycloak.saml.common.exceptions.ConfigurationException; import org.keycloak.saml.common.exceptions.ProcessingException; diff --git a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/config/SP.java b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/config/SP.java index fadfe21743..f37f930fea 100755 --- a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/config/SP.java +++ b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/config/SP.java @@ -1,8 +1,5 @@ package org.keycloak.adapters.saml.config; -import org.keycloak.adapters.saml.SamlDeployment; -import org.keycloak.enums.SslRequired; - import java.io.Serializable; import java.util.List; import java.util.Set; diff --git a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/config/parsers/DeploymentBuilder.java b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/config/parsers/DeploymentBuilder.java index 0e92bb703c..b200b61cb2 100755 --- a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/config/parsers/DeploymentBuilder.java +++ b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/config/parsers/DeploymentBuilder.java @@ -5,10 +5,10 @@ import org.keycloak.adapters.saml.SamlDeployment; import org.keycloak.adapters.saml.config.Key; import org.keycloak.adapters.saml.config.KeycloakSamlAdapter; import org.keycloak.adapters.saml.config.SP; -import org.keycloak.enums.SslRequired; +import org.keycloak.common.enums.SslRequired; import org.keycloak.saml.SignatureAlgorithm; import org.keycloak.saml.common.exceptions.ParsingException; -import org.keycloak.util.PemUtils; +import org.keycloak.common.util.PemUtils; import java.io.File; import java.io.FileInputStream; diff --git a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/config/parsers/SPXmlParser.java b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/config/parsers/SPXmlParser.java index ef67c45791..3446f20759 100755 --- a/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/config/parsers/SPXmlParser.java +++ b/saml/client-adapter/core/src/main/java/org/keycloak/adapters/saml/config/parsers/SPXmlParser.java @@ -6,7 +6,7 @@ import org.keycloak.adapters.saml.config.SP; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.parsers.AbstractParser; import org.keycloak.saml.common.util.StaxParserUtil; -import org.keycloak.util.StringPropertyReplacer; +import org.keycloak.common.util.StringPropertyReplacer; import javax.xml.namespace.QName; import javax.xml.stream.XMLEventReader; diff --git a/saml/client-adapter/jetty/jetty-core/src/main/java/org/keycloak/adapters/saml/jetty/AbstractSamlAuthenticator.java b/saml/client-adapter/jetty/jetty-core/src/main/java/org/keycloak/adapters/saml/jetty/AbstractSamlAuthenticator.java index ec97fc9c0e..60cea893ee 100755 --- a/saml/client-adapter/jetty/jetty-core/src/main/java/org/keycloak/adapters/saml/jetty/AbstractSamlAuthenticator.java +++ b/saml/client-adapter/jetty/jetty-core/src/main/java/org/keycloak/adapters/saml/jetty/AbstractSamlAuthenticator.java @@ -13,14 +13,14 @@ import org.eclipse.jetty.server.UserIdentity; import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.util.URIUtil; import org.jboss.logging.Logger; -import org.keycloak.adapters.AdapterSessionStore; -import org.keycloak.adapters.AuthChallenge; -import org.keycloak.adapters.AuthOutcome; -import org.keycloak.adapters.HttpFacade; -import org.keycloak.adapters.InMemorySessionIdMapper; -import org.keycloak.adapters.SessionIdMapper; -import org.keycloak.adapters.jetty.core.JettyHttpFacade; -import org.keycloak.adapters.jetty.core.JettyUserSessionManagement; +import org.keycloak.adapters.spi.AdapterSessionStore; +import org.keycloak.adapters.spi.AuthChallenge; +import org.keycloak.adapters.spi.AuthOutcome; +import org.keycloak.adapters.spi.HttpFacade; +import org.keycloak.adapters.spi.InMemorySessionIdMapper; +import org.keycloak.adapters.spi.SessionIdMapper; +import org.keycloak.adapters.jetty.spi.JettyHttpFacade; +import org.keycloak.adapters.jetty.spi.JettyUserSessionManagement; import org.keycloak.adapters.saml.AdapterConstants; import org.keycloak.adapters.saml.SamlAuthenticator; import org.keycloak.adapters.saml.SamlConfigResolver; diff --git a/saml/client-adapter/jetty/jetty-core/src/main/java/org/keycloak/adapters/saml/jetty/JettySamlSessionStore.java b/saml/client-adapter/jetty/jetty-core/src/main/java/org/keycloak/adapters/saml/jetty/JettySamlSessionStore.java index e272576765..d86184b8ae 100755 --- a/saml/client-adapter/jetty/jetty-core/src/main/java/org/keycloak/adapters/saml/jetty/JettySamlSessionStore.java +++ b/saml/client-adapter/jetty/jetty-core/src/main/java/org/keycloak/adapters/saml/jetty/JettySamlSessionStore.java @@ -1,22 +1,16 @@ package org.keycloak.adapters.saml.jetty; -import org.eclipse.jetty.security.DefaultUserIdentity; -import org.eclipse.jetty.server.Authentication; import org.eclipse.jetty.server.Request; -import org.eclipse.jetty.server.SessionManager; -import org.eclipse.jetty.server.UserIdentity; import org.jboss.logging.Logger; -import org.keycloak.adapters.AdapterSessionStore; -import org.keycloak.adapters.HttpFacade; -import org.keycloak.adapters.SessionIdMapper; -import org.keycloak.adapters.jetty.core.JettyUserSessionManagement; +import org.keycloak.adapters.spi.AdapterSessionStore; +import org.keycloak.adapters.spi.HttpFacade; +import org.keycloak.adapters.spi.SessionIdMapper; +import org.keycloak.adapters.jetty.spi.JettyUserSessionManagement; import org.keycloak.adapters.saml.SamlSession; import org.keycloak.adapters.saml.SamlSessionStore; -import javax.security.auth.Subject; import javax.servlet.http.HttpSession; -import java.io.IOException; -import java.util.HashSet; + import java.util.LinkedList; import java.util.List; import java.util.Set; diff --git a/saml/client-adapter/jetty/jetty8.1/src/main/java/org/keycloak/adapters/saml/jetty/JettyAdapterSessionStore.java b/saml/client-adapter/jetty/jetty8.1/src/main/java/org/keycloak/adapters/saml/jetty/JettyAdapterSessionStore.java index 7fa03013ab..7ff2269aa1 100755 --- a/saml/client-adapter/jetty/jetty8.1/src/main/java/org/keycloak/adapters/saml/jetty/JettyAdapterSessionStore.java +++ b/saml/client-adapter/jetty/jetty8.1/src/main/java/org/keycloak/adapters/saml/jetty/JettyAdapterSessionStore.java @@ -3,9 +3,9 @@ package org.keycloak.adapters.saml.jetty; import org.eclipse.jetty.security.authentication.FormAuthenticator; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.util.MultiMap; -import org.keycloak.adapters.AdapterSessionStore; -import org.keycloak.adapters.jetty.core.JettyHttpFacade; -import org.keycloak.util.MultivaluedHashMap; +import org.keycloak.adapters.spi.AdapterSessionStore; +import org.keycloak.adapters.jetty.spi.JettyHttpFacade; +import org.keycloak.common.util.MultivaluedHashMap; import javax.servlet.http.HttpSession; diff --git a/saml/client-adapter/jetty/jetty8.1/src/main/java/org/keycloak/adapters/saml/jetty/KeycloakSamlAuthenticator.java b/saml/client-adapter/jetty/jetty8.1/src/main/java/org/keycloak/adapters/saml/jetty/KeycloakSamlAuthenticator.java index 392c88b2a3..9bd669d7e1 100755 --- a/saml/client-adapter/jetty/jetty8.1/src/main/java/org/keycloak/adapters/saml/jetty/KeycloakSamlAuthenticator.java +++ b/saml/client-adapter/jetty/jetty8.1/src/main/java/org/keycloak/adapters/saml/jetty/KeycloakSamlAuthenticator.java @@ -4,7 +4,7 @@ import org.eclipse.jetty.server.AbstractHttpConnection; import org.eclipse.jetty.server.Authentication; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.UserIdentity; -import org.keycloak.adapters.AdapterSessionStore; +import org.keycloak.adapters.spi.AdapterSessionStore; import org.keycloak.adapters.saml.SamlDeployment; import javax.servlet.ServletRequest; diff --git a/saml/client-adapter/jetty/jetty9.1/src/main/java/org/keycloak/adapters/saml/jetty/JettyAdapterSessionStore.java b/saml/client-adapter/jetty/jetty9.1/src/main/java/org/keycloak/adapters/saml/jetty/JettyAdapterSessionStore.java index d7291a02f2..8495a5a8c5 100755 --- a/saml/client-adapter/jetty/jetty9.1/src/main/java/org/keycloak/adapters/saml/jetty/JettyAdapterSessionStore.java +++ b/saml/client-adapter/jetty/jetty9.1/src/main/java/org/keycloak/adapters/saml/jetty/JettyAdapterSessionStore.java @@ -4,9 +4,9 @@ import org.eclipse.jetty.http.HttpMethod; import org.eclipse.jetty.security.authentication.FormAuthenticator; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.util.MultiMap; -import org.keycloak.adapters.AdapterSessionStore; -import org.keycloak.adapters.jetty.core.JettyHttpFacade; -import org.keycloak.util.MultivaluedHashMap; +import org.keycloak.adapters.spi.AdapterSessionStore; +import org.keycloak.adapters.jetty.spi.JettyHttpFacade; +import org.keycloak.common.util.MultivaluedHashMap; import javax.servlet.http.HttpSession; diff --git a/saml/client-adapter/jetty/jetty9.1/src/main/java/org/keycloak/adapters/saml/jetty/KeycloakSamlAuthenticator.java b/saml/client-adapter/jetty/jetty9.1/src/main/java/org/keycloak/adapters/saml/jetty/KeycloakSamlAuthenticator.java index 901287f8a9..f5fdf7d807 100755 --- a/saml/client-adapter/jetty/jetty9.1/src/main/java/org/keycloak/adapters/saml/jetty/KeycloakSamlAuthenticator.java +++ b/saml/client-adapter/jetty/jetty9.1/src/main/java/org/keycloak/adapters/saml/jetty/KeycloakSamlAuthenticator.java @@ -4,7 +4,7 @@ import org.eclipse.jetty.server.Authentication; import org.eclipse.jetty.server.HttpChannel; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.UserIdentity; -import org.keycloak.adapters.AdapterSessionStore; +import org.keycloak.adapters.spi.AdapterSessionStore; import org.keycloak.adapters.saml.SamlDeployment; import javax.servlet.ServletRequest; diff --git a/saml/client-adapter/jetty/jetty9.2/src/main/java/org/keycloak/adapters/saml/jetty/JettyAdapterSessionStore.java b/saml/client-adapter/jetty/jetty9.2/src/main/java/org/keycloak/adapters/saml/jetty/JettyAdapterSessionStore.java index 9afebca867..62c9a70b56 100755 --- a/saml/client-adapter/jetty/jetty9.2/src/main/java/org/keycloak/adapters/saml/jetty/JettyAdapterSessionStore.java +++ b/saml/client-adapter/jetty/jetty9.2/src/main/java/org/keycloak/adapters/saml/jetty/JettyAdapterSessionStore.java @@ -4,9 +4,9 @@ import org.eclipse.jetty.http.HttpMethod; import org.eclipse.jetty.security.authentication.FormAuthenticator; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.util.MultiMap; -import org.keycloak.adapters.AdapterSessionStore; -import org.keycloak.adapters.jetty.core.JettyHttpFacade; -import org.keycloak.util.MultivaluedHashMap; +import org.keycloak.adapters.spi.AdapterSessionStore; +import org.keycloak.adapters.jetty.spi.JettyHttpFacade; +import org.keycloak.common.util.MultivaluedHashMap; import javax.servlet.http.HttpSession; diff --git a/saml/client-adapter/jetty/jetty9.2/src/main/java/org/keycloak/adapters/saml/jetty/KeycloakSamlAuthenticator.java b/saml/client-adapter/jetty/jetty9.2/src/main/java/org/keycloak/adapters/saml/jetty/KeycloakSamlAuthenticator.java index 75d3fc7cc2..03ea508646 100755 --- a/saml/client-adapter/jetty/jetty9.2/src/main/java/org/keycloak/adapters/saml/jetty/KeycloakSamlAuthenticator.java +++ b/saml/client-adapter/jetty/jetty9.2/src/main/java/org/keycloak/adapters/saml/jetty/KeycloakSamlAuthenticator.java @@ -4,7 +4,7 @@ import org.eclipse.jetty.server.Authentication; import org.eclipse.jetty.server.HttpChannel; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.UserIdentity; -import org.keycloak.adapters.AdapterSessionStore; +import org.keycloak.adapters.spi.AdapterSessionStore; import org.keycloak.adapters.saml.SamlDeployment; import javax.servlet.ServletRequest; diff --git a/saml/client-adapter/servlet-filter/src/main/java/org/keycloak/adapters/saml/servlet/FilterSamlSessionStore.java b/saml/client-adapter/servlet-filter/src/main/java/org/keycloak/adapters/saml/servlet/FilterSamlSessionStore.java index 2d3a7fd3da..cbd036e882 100755 --- a/saml/client-adapter/servlet-filter/src/main/java/org/keycloak/adapters/saml/servlet/FilterSamlSessionStore.java +++ b/saml/client-adapter/servlet-filter/src/main/java/org/keycloak/adapters/saml/servlet/FilterSamlSessionStore.java @@ -1,23 +1,17 @@ package org.keycloak.adapters.saml.servlet; import org.jboss.logging.Logger; -import org.keycloak.adapters.HttpFacade; -import org.keycloak.adapters.KeycloakAccount; -import org.keycloak.adapters.SessionIdMapper; +import org.keycloak.adapters.spi.HttpFacade; +import org.keycloak.adapters.spi.KeycloakAccount; +import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.adapters.saml.SamlSession; import org.keycloak.adapters.saml.SamlSessionStore; import org.keycloak.adapters.servlet.FilterSessionStore; -import org.keycloak.util.MultivaluedHashMap; -import javax.servlet.ServletInputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpSession; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.security.Principal; -import java.util.Collections; -import java.util.Enumeration; + import java.util.LinkedList; import java.util.List; import java.util.Set; diff --git a/saml/client-adapter/servlet-filter/src/main/java/org/keycloak/adapters/saml/servlet/SamlFilter.java b/saml/client-adapter/servlet-filter/src/main/java/org/keycloak/adapters/saml/servlet/SamlFilter.java index 818806683b..bce4dbc10a 100755 --- a/saml/client-adapter/servlet-filter/src/main/java/org/keycloak/adapters/saml/servlet/SamlFilter.java +++ b/saml/client-adapter/servlet-filter/src/main/java/org/keycloak/adapters/saml/servlet/SamlFilter.java @@ -1,9 +1,9 @@ package org.keycloak.adapters.saml.servlet; -import org.keycloak.adapters.AuthChallenge; -import org.keycloak.adapters.AuthOutcome; -import org.keycloak.adapters.InMemorySessionIdMapper; -import org.keycloak.adapters.SessionIdMapper; +import org.keycloak.adapters.spi.AuthChallenge; +import org.keycloak.adapters.spi.AuthOutcome; +import org.keycloak.adapters.spi.InMemorySessionIdMapper; +import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.adapters.saml.DefaultSamlDeployment; import org.keycloak.adapters.saml.SamlAuthenticator; import org.keycloak.adapters.saml.SamlDeployment; diff --git a/saml/client-adapter/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/AbstractSamlAuthenticatorValve.java b/saml/client-adapter/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/AbstractSamlAuthenticatorValve.java index cfc21a0f58..d231265623 100755 --- a/saml/client-adapter/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/AbstractSamlAuthenticatorValve.java +++ b/saml/client-adapter/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/AbstractSamlAuthenticatorValve.java @@ -7,11 +7,11 @@ import org.apache.catalina.LifecycleListener; import org.apache.catalina.authenticator.FormAuthenticator; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; -import org.keycloak.adapters.AuthChallenge; -import org.keycloak.adapters.AuthOutcome; -import org.keycloak.adapters.HttpFacade; -import org.keycloak.adapters.InMemorySessionIdMapper; -import org.keycloak.adapters.SessionIdMapper; +import org.keycloak.adapters.spi.AuthChallenge; +import org.keycloak.adapters.spi.AuthOutcome; +import org.keycloak.adapters.spi.HttpFacade; +import org.keycloak.adapters.spi.InMemorySessionIdMapper; +import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.adapters.saml.config.parsers.DeploymentBuilder; import org.keycloak.adapters.saml.config.parsers.ResourceLoader; import org.keycloak.adapters.tomcat.CatalinaHttpFacade; diff --git a/saml/client-adapter/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/CatalinaSamlAuthenticator.java b/saml/client-adapter/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/CatalinaSamlAuthenticator.java index 2beb39cf8d..b991124c4a 100755 --- a/saml/client-adapter/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/CatalinaSamlAuthenticator.java +++ b/saml/client-adapter/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/CatalinaSamlAuthenticator.java @@ -1,6 +1,6 @@ package org.keycloak.adapters.saml; -import org.keycloak.adapters.HttpFacade; +import org.keycloak.adapters.spi.HttpFacade; /** * @author Bill Burke diff --git a/saml/client-adapter/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/CatalinaSamlSessionStore.java b/saml/client-adapter/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/CatalinaSamlSessionStore.java index 4928a2627d..adbc441586 100755 --- a/saml/client-adapter/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/CatalinaSamlSessionStore.java +++ b/saml/client-adapter/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/saml/CatalinaSamlSessionStore.java @@ -5,16 +5,13 @@ import org.apache.catalina.Session; import org.apache.catalina.connector.Request; import org.apache.catalina.realm.GenericPrincipal; import org.jboss.logging.Logger; -import org.keycloak.adapters.HttpFacade; -import org.keycloak.adapters.SessionIdMapper; +import org.keycloak.adapters.spi.HttpFacade; +import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.adapters.tomcat.CatalinaUserSessionManagement; import org.keycloak.adapters.tomcat.GenericPrincipalFactory; -import org.keycloak.util.KeycloakUriBuilder; -import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import java.io.IOException; -import java.security.Principal; import java.util.LinkedList; import java.util.List; import java.util.Set; diff --git a/saml/client-adapter/undertow/src/main/java/org/keycloak/adapters/saml/undertow/AbstractSamlAuthMech.java b/saml/client-adapter/undertow/src/main/java/org/keycloak/adapters/saml/undertow/AbstractSamlAuthMech.java index 9b29618bf8..721f0c0ac4 100755 --- a/saml/client-adapter/undertow/src/main/java/org/keycloak/adapters/saml/undertow/AbstractSamlAuthMech.java +++ b/saml/client-adapter/undertow/src/main/java/org/keycloak/adapters/saml/undertow/AbstractSamlAuthMech.java @@ -24,9 +24,9 @@ import io.undertow.server.HttpServerExchange; import io.undertow.util.AttachmentKey; import io.undertow.util.Headers; import io.undertow.util.StatusCodes; -import org.keycloak.adapters.AuthChallenge; -import org.keycloak.adapters.AuthOutcome; -import org.keycloak.adapters.HttpFacade; +import org.keycloak.adapters.spi.AuthChallenge; +import org.keycloak.adapters.spi.AuthOutcome; +import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.saml.SamlDeployment; import org.keycloak.adapters.saml.SamlDeploymentContext; import org.keycloak.adapters.saml.SamlSessionStore; diff --git a/saml/client-adapter/undertow/src/main/java/org/keycloak/adapters/saml/undertow/ServletSamlAuthMech.java b/saml/client-adapter/undertow/src/main/java/org/keycloak/adapters/saml/undertow/ServletSamlAuthMech.java index 3ea9a0f672..9fe9085d06 100755 --- a/saml/client-adapter/undertow/src/main/java/org/keycloak/adapters/saml/undertow/ServletSamlAuthMech.java +++ b/saml/client-adapter/undertow/src/main/java/org/keycloak/adapters/saml/undertow/ServletSamlAuthMech.java @@ -4,9 +4,9 @@ import io.undertow.security.api.SecurityContext; import io.undertow.server.HttpServerExchange; import io.undertow.servlet.handlers.ServletRequestContext; import io.undertow.util.Headers; -import org.keycloak.adapters.HttpFacade; -import org.keycloak.adapters.InMemorySessionIdMapper; -import org.keycloak.adapters.SessionIdMapper; +import org.keycloak.adapters.spi.HttpFacade; +import org.keycloak.adapters.spi.InMemorySessionIdMapper; +import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.adapters.saml.SamlDeployment; import org.keycloak.adapters.saml.SamlDeploymentContext; import org.keycloak.adapters.saml.SamlSessionStore; diff --git a/saml/client-adapter/undertow/src/main/java/org/keycloak/adapters/saml/undertow/ServletSamlSessionStore.java b/saml/client-adapter/undertow/src/main/java/org/keycloak/adapters/saml/undertow/ServletSamlSessionStore.java index 1f32666dc3..8afcc1f40e 100755 --- a/saml/client-adapter/undertow/src/main/java/org/keycloak/adapters/saml/undertow/ServletSamlSessionStore.java +++ b/saml/client-adapter/undertow/src/main/java/org/keycloak/adapters/saml/undertow/ServletSamlSessionStore.java @@ -3,23 +3,20 @@ package org.keycloak.adapters.saml.undertow; import io.undertow.security.api.SecurityContext; import io.undertow.security.idm.Account; import io.undertow.server.HttpServerExchange; -import io.undertow.server.session.Session; import io.undertow.server.session.SessionManager; import io.undertow.servlet.handlers.ServletRequestContext; import io.undertow.servlet.spec.HttpSessionImpl; import io.undertow.servlet.util.SavedRequest; -import io.undertow.util.Sessions; import org.jboss.logging.Logger; -import org.keycloak.adapters.SessionIdMapper; +import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.adapters.saml.SamlSession; import org.keycloak.adapters.saml.SamlSessionStore; import org.keycloak.adapters.undertow.UndertowUserSessionManagement; -import org.keycloak.util.KeycloakUriBuilder; +import org.keycloak.common.util.KeycloakUriBuilder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import java.security.Principal; -import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Set; diff --git a/saml/client-adapter/undertow/src/main/java/org/keycloak/adapters/saml/undertow/UndertowSamlAuthenticator.java b/saml/client-adapter/undertow/src/main/java/org/keycloak/adapters/saml/undertow/UndertowSamlAuthenticator.java index dfb2843e82..eac0cf7d83 100755 --- a/saml/client-adapter/undertow/src/main/java/org/keycloak/adapters/saml/undertow/UndertowSamlAuthenticator.java +++ b/saml/client-adapter/undertow/src/main/java/org/keycloak/adapters/saml/undertow/UndertowSamlAuthenticator.java @@ -2,8 +2,7 @@ package org.keycloak.adapters.saml.undertow; import io.undertow.security.api.SecurityContext; import io.undertow.security.idm.Account; -import io.undertow.server.HttpServerExchange; -import org.keycloak.adapters.HttpFacade; +import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.saml.SamlAuthenticator; import org.keycloak.adapters.saml.SamlDeployment; import org.keycloak.adapters.saml.SamlSession; diff --git a/saml/client-adapter/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/SecurityInfoHelper.java b/saml/client-adapter/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/SecurityInfoHelper.java index b01cb1cce3..7170ac6d03 100755 --- a/saml/client-adapter/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/SecurityInfoHelper.java +++ b/saml/client-adapter/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/SecurityInfoHelper.java @@ -5,7 +5,7 @@ import org.jboss.security.SecurityConstants; import org.jboss.security.SecurityContextAssociation; import org.jboss.security.SimpleGroup; import org.jboss.security.SimplePrincipal; -import org.keycloak.adapters.KeycloakAccount; +import org.keycloak.adapters.spi.KeycloakAccount; import javax.security.auth.Subject; import java.security.Principal; diff --git a/saml/client-adapter/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/WildflySamlAuthMech.java b/saml/client-adapter/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/WildflySamlAuthMech.java index f8cfd3e85a..e532233092 100755 --- a/saml/client-adapter/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/WildflySamlAuthMech.java +++ b/saml/client-adapter/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/WildflySamlAuthMech.java @@ -2,7 +2,7 @@ package org.keycloak.adapters.saml.wildfly; import io.undertow.security.api.SecurityContext; import io.undertow.server.HttpServerExchange; -import org.keycloak.adapters.HttpFacade; +import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.saml.SamlDeployment; import org.keycloak.adapters.saml.SamlDeploymentContext; import org.keycloak.adapters.saml.SamlSessionStore; diff --git a/saml/client-adapter/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/WildflySamlSessionStore.java b/saml/client-adapter/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/WildflySamlSessionStore.java index c6cd812379..45513337a4 100755 --- a/saml/client-adapter/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/WildflySamlSessionStore.java +++ b/saml/client-adapter/wildfly/wildfly-adapter/src/main/java/org/keycloak/adapters/saml/wildfly/WildflySamlSessionStore.java @@ -2,7 +2,7 @@ package org.keycloak.adapters.saml.wildfly; import io.undertow.security.api.SecurityContext; import io.undertow.server.HttpServerExchange; -import org.keycloak.adapters.SessionIdMapper; +import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.adapters.saml.SamlSession; import org.keycloak.adapters.saml.undertow.ServletSamlSessionStore; import org.keycloak.adapters.undertow.UndertowUserSessionManagement; diff --git a/saml/saml-core/src/main/java/org/keycloak/saml/BaseSAML2BindingBuilder.java b/saml/saml-core/src/main/java/org/keycloak/saml/BaseSAML2BindingBuilder.java index 9ca97f8e46..d6d0910e94 100755 --- a/saml/saml-core/src/main/java/org/keycloak/saml/BaseSAML2BindingBuilder.java +++ b/saml/saml-core/src/main/java/org/keycloak/saml/BaseSAML2BindingBuilder.java @@ -11,7 +11,7 @@ import org.keycloak.saml.processing.core.saml.v2.util.DocumentUtil; import org.keycloak.saml.processing.core.util.XMLEncryptionUtil; import org.keycloak.saml.processing.web.util.PostBindingUtil; import org.keycloak.saml.processing.web.util.RedirectBindingUtil; -import org.keycloak.util.KeycloakUriBuilder; +import org.keycloak.common.util.KeycloakUriBuilder; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -29,7 +29,7 @@ import java.security.Signature; import java.security.cert.X509Certificate; import static org.keycloak.saml.common.util.StringUtil.isNotNull; -import static org.keycloak.util.HtmlUtils.escapeAttribute; +import static org.keycloak.common.util.HtmlUtils.escapeAttribute; /** * @author Bill Burke diff --git a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/SamlProtocolUtils.java b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/SamlProtocolUtils.java index d9d937e88d..d625f2a740 100755 --- a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/SamlProtocolUtils.java +++ b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/SamlProtocolUtils.java @@ -1,13 +1,13 @@ package org.keycloak.protocol.saml; -import org.keycloak.VerificationException; +import org.keycloak.common.VerificationException; import org.keycloak.models.ClientModel; import org.keycloak.saml.SignatureAlgorithm; import org.keycloak.saml.common.constants.GeneralConstants; import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.processing.api.saml.v2.sig.SAML2Signature; import org.keycloak.saml.processing.web.util.RedirectBindingUtil; -import org.keycloak.util.PemUtils; +import org.keycloak.common.util.PemUtils; import org.w3c.dom.Document; import javax.ws.rs.core.MultivaluedMap; diff --git a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/SamlService.java b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/SamlService.java index 6aae844da6..1e3f5db0eb 100755 --- a/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/SamlService.java +++ b/saml/saml-protocol/src/main/java/org/keycloak/protocol/saml/SamlService.java @@ -3,8 +3,8 @@ package org.keycloak.protocol.saml; import org.jboss.logging.Logger; import org.jboss.resteasy.spi.HttpRequest; import org.jboss.resteasy.spi.HttpResponse; -import org.keycloak.ClientConnection; -import org.keycloak.VerificationException; +import org.keycloak.common.ClientConnection; +import org.keycloak.common.VerificationException; import org.keycloak.authentication.AuthenticationProcessor; import org.keycloak.dom.saml.v2.SAML2Object; import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; @@ -39,7 +39,7 @@ import org.keycloak.services.managers.ClientSessionCode; import org.keycloak.services.messages.Messages; import org.keycloak.services.resources.LoginActionsService; import org.keycloak.services.resources.RealmsResource; -import org.keycloak.util.StreamUtil; +import org.keycloak.common.util.StreamUtil; import javax.ws.rs.Consumes; import javax.ws.rs.FormParam; diff --git a/services/src/main/java/org/keycloak/authentication/AbstractAuthenticationFlowContext.java b/services/src/main/java/org/keycloak/authentication/AbstractAuthenticationFlowContext.java index 9b80702f65..ba5c72098d 100755 --- a/services/src/main/java/org/keycloak/authentication/AbstractAuthenticationFlowContext.java +++ b/services/src/main/java/org/keycloak/authentication/AbstractAuthenticationFlowContext.java @@ -4,7 +4,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import org.jboss.resteasy.spi.HttpRequest; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.events.EventBuilder; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticatorConfigModel; diff --git a/services/src/main/java/org/keycloak/authentication/AuthenticationProcessor.java b/services/src/main/java/org/keycloak/authentication/AuthenticationProcessor.java index 2d7f0ebc9c..951bb94bf1 100755 --- a/services/src/main/java/org/keycloak/authentication/AuthenticationProcessor.java +++ b/services/src/main/java/org/keycloak/authentication/AuthenticationProcessor.java @@ -2,7 +2,7 @@ package org.keycloak.authentication; import org.jboss.logging.Logger; import org.jboss.resteasy.spi.HttpRequest; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.OAuth2Constants; import org.keycloak.authentication.authenticators.browser.AbstractUsernameFormAuthenticator; import org.keycloak.authentication.authenticators.client.ClientAuthUtil; @@ -28,7 +28,7 @@ import org.keycloak.services.managers.BruteForceProtector; import org.keycloak.services.managers.ClientSessionCode; import org.keycloak.services.messages.Messages; import org.keycloak.services.resources.LoginActionsService; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; diff --git a/services/src/main/java/org/keycloak/authentication/DefaultAuthenticationFlow.java b/services/src/main/java/org/keycloak/authentication/DefaultAuthenticationFlow.java index e4b6dc2e96..ab27bbb9f5 100755 --- a/services/src/main/java/org/keycloak/authentication/DefaultAuthenticationFlow.java +++ b/services/src/main/java/org/keycloak/authentication/DefaultAuthenticationFlow.java @@ -1,19 +1,14 @@ package org.keycloak.authentication; -import org.keycloak.OAuth2Constants; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticationFlowModel; import org.keycloak.models.ClientSessionModel; import org.keycloak.models.UserModel; -import org.keycloak.services.managers.ClientSessionCode; -import org.keycloak.services.resources.LoginActionsService; -import org.keycloak.util.Time; -import org.omg.PortableInterceptor.SUCCESSFUL; import static org.keycloak.authentication.FlowStatus.*; import javax.ws.rs.core.Response; -import java.net.URI; + import java.util.Iterator; import java.util.List; diff --git a/services/src/main/java/org/keycloak/authentication/FormAuthenticationFlow.java b/services/src/main/java/org/keycloak/authentication/FormAuthenticationFlow.java index 9fb9b1ba2a..5ee8bbe748 100755 --- a/services/src/main/java/org/keycloak/authentication/FormAuthenticationFlow.java +++ b/services/src/main/java/org/keycloak/authentication/FormAuthenticationFlow.java @@ -1,7 +1,7 @@ package org.keycloak.authentication; import org.jboss.resteasy.spi.HttpRequest; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.OAuth2Constants; import org.keycloak.events.EventBuilder; import org.keycloak.login.LoginFormsProvider; diff --git a/services/src/main/java/org/keycloak/authentication/FormContext.java b/services/src/main/java/org/keycloak/authentication/FormContext.java index efb1f70a1c..6c11f50368 100755 --- a/services/src/main/java/org/keycloak/authentication/FormContext.java +++ b/services/src/main/java/org/keycloak/authentication/FormContext.java @@ -1,7 +1,7 @@ package org.keycloak.authentication; import org.jboss.resteasy.spi.HttpRequest; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.events.EventBuilder; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticatorConfigModel; @@ -9,7 +9,6 @@ import org.keycloak.models.ClientSessionModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; -import org.keycloak.services.managers.BruteForceProtector; import javax.ws.rs.core.UriInfo; diff --git a/services/src/main/java/org/keycloak/authentication/RequiredActionContext.java b/services/src/main/java/org/keycloak/authentication/RequiredActionContext.java index cc37f89e91..e7439c2c8f 100755 --- a/services/src/main/java/org/keycloak/authentication/RequiredActionContext.java +++ b/services/src/main/java/org/keycloak/authentication/RequiredActionContext.java @@ -1,7 +1,7 @@ package org.keycloak.authentication; import org.jboss.resteasy.spi.HttpRequest; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.events.EventBuilder; import org.keycloak.login.LoginFormsProvider; import org.keycloak.models.ClientSessionModel; diff --git a/services/src/main/java/org/keycloak/authentication/RequiredActionContextResult.java b/services/src/main/java/org/keycloak/authentication/RequiredActionContextResult.java index f2ada5d11c..166a032031 100755 --- a/services/src/main/java/org/keycloak/authentication/RequiredActionContextResult.java +++ b/services/src/main/java/org/keycloak/authentication/RequiredActionContextResult.java @@ -1,7 +1,7 @@ package org.keycloak.authentication; import org.jboss.resteasy.spi.HttpRequest; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.OAuth2Constants; import org.keycloak.events.EventBuilder; import org.keycloak.login.LoginFormsProvider; @@ -12,7 +12,7 @@ import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; import org.keycloak.services.managers.ClientSessionCode; import org.keycloak.services.resources.LoginActionsService; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/SpnegoAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/SpnegoAuthenticator.java index da2b0aedb2..091c14d14c 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/SpnegoAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/SpnegoAuthenticator.java @@ -5,7 +5,7 @@ import org.jboss.resteasy.spi.HttpRequest; import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.Authenticator; -import org.keycloak.constants.KerberosConstants; +import org.keycloak.common.constants.KerberosConstants; import org.keycloak.events.Errors; import org.keycloak.login.LoginFormsProvider; import org.keycloak.models.CredentialValidationOutput; diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/UpdatePassword.java b/services/src/main/java/org/keycloak/authentication/requiredactions/UpdatePassword.java index d336fb98e2..a28195e67c 100755 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/UpdatePassword.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/UpdatePassword.java @@ -7,19 +7,15 @@ import org.keycloak.authentication.RequiredActionFactory; import org.keycloak.authentication.RequiredActionProvider; import org.keycloak.events.EventBuilder; import org.keycloak.events.EventType; -import org.keycloak.login.LoginFormsProvider; -import org.keycloak.models.ClientSessionModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.ModelException; import org.keycloak.models.UserCredentialModel; import org.keycloak.models.UserCredentialValueModel; import org.keycloak.models.UserModel; -import org.keycloak.models.UserSessionModel; -import org.keycloak.services.managers.ClientSessionCode; import org.keycloak.services.messages.Messages; import org.keycloak.services.validation.Validation; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/VerifyEmail.java b/services/src/main/java/org/keycloak/authentication/requiredactions/VerifyEmail.java index 1a593cb867..01ddcffa7e 100755 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/VerifyEmail.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/VerifyEmail.java @@ -8,18 +8,13 @@ import org.keycloak.authentication.RequiredActionProvider; import org.keycloak.events.Details; import org.keycloak.events.EventType; import org.keycloak.login.LoginFormsProvider; -import org.keycloak.models.ClientSessionModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.models.UserCredentialModel; -import org.keycloak.models.UserCredentialValueModel; import org.keycloak.models.UserModel; import org.keycloak.services.resources.LoginActionsService; import org.keycloak.services.validation.Validation; -import org.keycloak.util.Time; import javax.ws.rs.core.Response; -import java.util.concurrent.TimeUnit; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/protocol/RestartLoginCookie.java b/services/src/main/java/org/keycloak/protocol/RestartLoginCookie.java index d6336d3093..5e2fd48155 100755 --- a/services/src/main/java/org/keycloak/protocol/RestartLoginCookie.java +++ b/services/src/main/java/org/keycloak/protocol/RestartLoginCookie.java @@ -2,11 +2,10 @@ package org.keycloak.protocol; import org.codehaus.jackson.annotate.JsonProperty; import org.jboss.logging.Logger; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.jose.jws.JWSBuilder; import org.keycloak.jose.jws.JWSInput; import org.keycloak.jose.jws.crypto.HMACProvider; -import org.keycloak.jose.jws.crypto.RSAProvider; import org.keycloak.models.ClientModel; import org.keycloak.models.ClientSessionModel; import org.keycloak.models.KeycloakSession; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocolFactory.java b/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocolFactory.java index c600322719..b9211ad79f 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocolFactory.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocolFactory.java @@ -16,7 +16,7 @@ */ package org.keycloak.protocol.oidc; -import org.keycloak.constants.KerberosConstants; +import org.keycloak.common.constants.KerberosConstants; import org.keycloak.events.EventBuilder; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java b/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java index a2acde95c6..17d5b230f4 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java @@ -1,7 +1,7 @@ package org.keycloak.protocol.oidc; import org.jboss.logging.Logger; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.events.Details; @@ -34,7 +34,7 @@ import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.managers.ClientSessionCode; import org.keycloak.services.managers.UserSessionManager; import org.keycloak.util.TokenUtil; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/AuthorizationEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/AuthorizationEndpoint.java index da13ae6334..8193140a9a 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/AuthorizationEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/AuthorizationEndpoint.java @@ -2,7 +2,7 @@ package org.keycloak.protocol.oidc.endpoints; import org.jboss.logging.Logger; import org.jboss.resteasy.spi.HttpRequest; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.OAuth2Constants; import org.keycloak.authentication.AuthenticationProcessor; import org.keycloak.constants.AdapterConstants; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LoginStatusIframeEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LoginStatusIframeEndpoint.java index 17c3bdbda6..abea5656a9 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LoginStatusIframeEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LoginStatusIframeEndpoint.java @@ -6,8 +6,8 @@ import org.keycloak.Config; import org.keycloak.models.ClientModel; import org.keycloak.models.RealmModel; import org.keycloak.protocol.oidc.utils.RedirectUtils; -import org.keycloak.util.StreamUtil; -import org.keycloak.util.UriUtils; +import org.keycloak.common.util.StreamUtil; +import org.keycloak.common.util.UriUtils; import javax.ws.rs.GET; import javax.ws.rs.Produces; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LogoutEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LogoutEndpoint.java index bec6aafd35..9b862eff8f 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LogoutEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LogoutEndpoint.java @@ -3,7 +3,7 @@ package org.keycloak.protocol.oidc.endpoints; import org.jboss.logging.Logger; import org.jboss.resteasy.annotations.cache.NoCache; import org.jboss.resteasy.spi.HttpRequest; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.events.Details; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenEndpoint.java index d836abd930..1fb3e4a727 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenEndpoint.java @@ -2,12 +2,12 @@ package org.keycloak.protocol.oidc.endpoints; import org.jboss.logging.Logger; import org.jboss.resteasy.spi.HttpRequest; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.authentication.AuthenticationProcessor; import org.keycloak.constants.AdapterConstants; -import org.keycloak.constants.ServiceAccountConstants; +import org.keycloak.common.constants.ServiceAccountConstants; import org.keycloak.events.Details; import org.keycloak.events.Errors; import org.keycloak.events.EventBuilder; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/UserInfoEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/UserInfoEndpoint.java index 096252a2f7..eb8f84859b 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/UserInfoEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/UserInfoEndpoint.java @@ -20,10 +20,10 @@ package org.keycloak.protocol.oidc.endpoints; import org.jboss.resteasy.annotations.cache.NoCache; import org.jboss.resteasy.spi.HttpRequest; import org.jboss.resteasy.spi.HttpResponse; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.OAuthErrorException; import org.keycloak.RSATokenVerifier; -import org.keycloak.VerificationException; +import org.keycloak.common.VerificationException; import org.keycloak.events.Details; import org.keycloak.events.EventBuilder; import org.keycloak.events.EventType; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/ValidateTokenEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/ValidateTokenEndpoint.java index 1e074b8070..2a375e77ca 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/ValidateTokenEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/ValidateTokenEndpoint.java @@ -2,7 +2,7 @@ package org.keycloak.protocol.oidc.endpoints; import org.jboss.logging.Logger; import org.jboss.resteasy.annotations.cache.NoCache; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.RSATokenVerifier; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/utils/WebOriginsUtils.java b/services/src/main/java/org/keycloak/protocol/oidc/utils/WebOriginsUtils.java index 5684ef6b47..1dadfea4c7 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/utils/WebOriginsUtils.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/utils/WebOriginsUtils.java @@ -1,7 +1,7 @@ package org.keycloak.protocol.oidc.utils; import org.keycloak.models.ClientModel; -import org.keycloak.util.UriUtils; +import org.keycloak.common.util.UriUtils; import javax.ws.rs.core.UriInfo; import java.util.Set; diff --git a/services/src/main/java/org/keycloak/services/DefaultKeycloakContext.java b/services/src/main/java/org/keycloak/services/DefaultKeycloakContext.java index ec866eb2df..a78f99e43e 100755 --- a/services/src/main/java/org/keycloak/services/DefaultKeycloakContext.java +++ b/services/src/main/java/org/keycloak/services/DefaultKeycloakContext.java @@ -1,7 +1,7 @@ package org.keycloak.services; import org.jboss.resteasy.spi.ResteasyProviderFactory; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.models.*; import org.keycloak.models.utils.RealmImporter; import org.keycloak.services.managers.RealmManager; diff --git a/services/src/main/java/org/keycloak/services/Urls.java b/services/src/main/java/org/keycloak/services/Urls.java index cb7292b6f9..cac365e6c5 100755 --- a/services/src/main/java/org/keycloak/services/Urls.java +++ b/services/src/main/java/org/keycloak/services/Urls.java @@ -22,7 +22,7 @@ package org.keycloak.services; import org.keycloak.OAuth2Constants; -import org.keycloak.Version; +import org.keycloak.common.Version; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.protocol.oidc.OIDCLoginProtocolService; import org.keycloak.services.resources.AccountService; diff --git a/services/src/main/java/org/keycloak/services/filters/ClientConnectionFilter.java b/services/src/main/java/org/keycloak/services/filters/ClientConnectionFilter.java index c7c85fb0c0..8a2ce95f83 100755 --- a/services/src/main/java/org/keycloak/services/filters/ClientConnectionFilter.java +++ b/services/src/main/java/org/keycloak/services/filters/ClientConnectionFilter.java @@ -1,7 +1,7 @@ package org.keycloak.services.filters; import org.jboss.resteasy.spi.ResteasyProviderFactory; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import javax.servlet.Filter; import javax.servlet.FilterChain; diff --git a/services/src/main/java/org/keycloak/services/filters/KeycloakSessionServletFilter.java b/services/src/main/java/org/keycloak/services/filters/KeycloakSessionServletFilter.java index 431421ed7a..84684bde31 100755 --- a/services/src/main/java/org/keycloak/services/filters/KeycloakSessionServletFilter.java +++ b/services/src/main/java/org/keycloak/services/filters/KeycloakSessionServletFilter.java @@ -1,7 +1,7 @@ package org.keycloak.services.filters; import org.jboss.resteasy.spi.ResteasyProviderFactory; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.KeycloakTransaction; diff --git a/services/src/main/java/org/keycloak/services/managers/AppAuthManager.java b/services/src/main/java/org/keycloak/services/managers/AppAuthManager.java index 3865027ef7..111486a0e5 100755 --- a/services/src/main/java/org/keycloak/services/managers/AppAuthManager.java +++ b/services/src/main/java/org/keycloak/services/managers/AppAuthManager.java @@ -2,7 +2,7 @@ package org.keycloak.services.managers; import org.jboss.logging.Logger; import org.jboss.resteasy.spi.UnauthorizedException; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.models.KeycloakContext; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; diff --git a/services/src/main/java/org/keycloak/services/managers/ApplianceBootstrap.java b/services/src/main/java/org/keycloak/services/managers/ApplianceBootstrap.java index d3569650a2..5178cec882 100755 --- a/services/src/main/java/org/keycloak/services/managers/ApplianceBootstrap.java +++ b/services/src/main/java/org/keycloak/services/managers/ApplianceBootstrap.java @@ -2,7 +2,7 @@ package org.keycloak.services.managers; import org.jboss.logging.Logger; import org.keycloak.Config; -import org.keycloak.enums.SslRequired; +import org.keycloak.common.enums.SslRequired; import org.keycloak.models.AdminRoles; import org.keycloak.models.ClientModel; import org.keycloak.models.Constants; diff --git a/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java b/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java index f31d1ff8c8..ea47ddc781 100755 --- a/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java +++ b/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java @@ -19,9 +19,9 @@ package org.keycloak.services.managers; import org.jboss.logging.Logger; import org.jboss.resteasy.specimpl.MultivaluedMapImpl; import org.jboss.resteasy.spi.HttpRequest; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.RSATokenVerifier; -import org.keycloak.VerificationException; +import org.keycloak.common.VerificationException; import org.keycloak.authentication.RequiredActionContext; import org.keycloak.authentication.RequiredActionContextResult; import org.keycloak.authentication.RequiredActionFactory; @@ -44,7 +44,7 @@ import org.keycloak.services.messages.Messages; import org.keycloak.services.resources.IdentityBrokerService; import org.keycloak.services.resources.RealmsResource; import org.keycloak.services.util.CookieHelper; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import javax.ws.rs.core.*; import java.net.URI; diff --git a/services/src/main/java/org/keycloak/services/managers/BruteForceProtector.java b/services/src/main/java/org/keycloak/services/managers/BruteForceProtector.java index 75e12c2ec4..8107462524 100755 --- a/services/src/main/java/org/keycloak/services/managers/BruteForceProtector.java +++ b/services/src/main/java/org/keycloak/services/managers/BruteForceProtector.java @@ -2,7 +2,7 @@ package org.keycloak.services.managers; import org.jboss.logging.Logger; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel; diff --git a/services/src/main/java/org/keycloak/services/managers/ClientManager.java b/services/src/main/java/org/keycloak/services/managers/ClientManager.java index edad00273c..126b028802 100755 --- a/services/src/main/java/org/keycloak/services/managers/ClientManager.java +++ b/services/src/main/java/org/keycloak/services/managers/ClientManager.java @@ -5,7 +5,7 @@ import org.codehaus.jackson.annotate.JsonPropertyOrder; import org.jboss.logging.Logger; import org.keycloak.authentication.ClientAuthenticator; import org.keycloak.authentication.ClientAuthenticatorFactory; -import org.keycloak.constants.ServiceAccountConstants; +import org.keycloak.common.constants.ServiceAccountConstants; import org.keycloak.models.ClientModel; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; @@ -16,12 +16,10 @@ import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.protocol.oidc.mappers.UserSessionNoteMapper; import org.keycloak.representations.adapters.config.BaseRealmConfig; -import org.keycloak.representations.idm.CredentialRepresentation; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import java.net.URI; import java.util.Collections; -import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; diff --git a/services/src/main/java/org/keycloak/services/managers/ClientSessionCode.java b/services/src/main/java/org/keycloak/services/managers/ClientSessionCode.java index 672bb2ad71..b994ef8745 100755 --- a/services/src/main/java/org/keycloak/services/managers/ClientSessionCode.java +++ b/services/src/main/java/org/keycloak/services/managers/ClientSessionCode.java @@ -5,9 +5,8 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; -import org.keycloak.models.UserModel.RequiredAction; -import org.keycloak.util.Base64Url; -import org.keycloak.util.Time; +import org.keycloak.common.util.Base64Url; +import org.keycloak.common.util.Time; import javax.crypto.Mac; import java.security.Key; diff --git a/services/src/main/java/org/keycloak/services/managers/RealmManager.java b/services/src/main/java/org/keycloak/services/managers/RealmManager.java index d60d2effc7..688c242f9a 100755 --- a/services/src/main/java/org/keycloak/services/managers/RealmManager.java +++ b/services/src/main/java/org/keycloak/services/managers/RealmManager.java @@ -18,7 +18,7 @@ package org.keycloak.services.managers; import org.jboss.logging.Logger; import org.keycloak.Config; -import org.keycloak.enums.SslRequired; +import org.keycloak.common.enums.SslRequired; import org.keycloak.models.session.UserSessionPersisterProvider; import org.keycloak.models.utils.RealmImporter; import org.keycloak.models.AccountRoles; diff --git a/services/src/main/java/org/keycloak/services/managers/ResourceAdminManager.java b/services/src/main/java/org/keycloak/services/managers/ResourceAdminManager.java index fd8b4c30ff..f9f63c04dd 100755 --- a/services/src/main/java/org/keycloak/services/managers/ResourceAdminManager.java +++ b/services/src/main/java/org/keycloak/services/managers/ResourceAdminManager.java @@ -16,10 +16,10 @@ import org.keycloak.representations.adapters.action.LogoutAction; import org.keycloak.representations.adapters.action.PushNotBeforeAction; import org.keycloak.representations.adapters.action.TestAvailabilityAction; import org.keycloak.services.util.ResolveRelative; -import org.keycloak.util.KeycloakUriBuilder; -import org.keycloak.util.MultivaluedHashMap; -import org.keycloak.util.StringPropertyReplacer; -import org.keycloak.util.Time; +import org.keycloak.common.util.KeycloakUriBuilder; +import org.keycloak.common.util.MultivaluedHashMap; +import org.keycloak.common.util.StringPropertyReplacer; +import org.keycloak.common.util.Time; import javax.ws.rs.core.UriBuilder; import java.io.IOException; diff --git a/services/src/main/java/org/keycloak/services/managers/UserSessionManager.java b/services/src/main/java/org/keycloak/services/managers/UserSessionManager.java index 2f18d24e95..99516a2131 100644 --- a/services/src/main/java/org/keycloak/services/managers/UserSessionManager.java +++ b/services/src/main/java/org/keycloak/services/managers/UserSessionManager.java @@ -16,7 +16,7 @@ import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; import org.keycloak.models.session.UserSessionPersisterProvider; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; /** * diff --git a/services/src/main/java/org/keycloak/services/managers/UsersSyncManager.java b/services/src/main/java/org/keycloak/services/managers/UsersSyncManager.java index bf29b78e2e..7b062318a5 100755 --- a/services/src/main/java/org/keycloak/services/managers/UsersSyncManager.java +++ b/services/src/main/java/org/keycloak/services/managers/UsersSyncManager.java @@ -11,7 +11,7 @@ import org.keycloak.models.UserFederationProviderModel; import org.keycloak.models.UserFederationSyncResult; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.timer.TimerProvider; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import java.util.List; diff --git a/services/src/main/java/org/keycloak/services/resources/AbstractSecuredLocalService.java b/services/src/main/java/org/keycloak/services/resources/AbstractSecuredLocalService.java index 2d1472b4ed..832331dd93 100755 --- a/services/src/main/java/org/keycloak/services/resources/AbstractSecuredLocalService.java +++ b/services/src/main/java/org/keycloak/services/resources/AbstractSecuredLocalService.java @@ -4,19 +4,18 @@ import org.jboss.logging.Logger; import org.jboss.resteasy.spi.BadRequestException; import org.jboss.resteasy.spi.HttpRequest; import org.keycloak.AbstractOAuthClient; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.OAuth2Constants; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.protocol.oidc.OIDCLoginProtocolService; import org.keycloak.services.ForbiddenException; -import org.keycloak.services.Urls; import org.keycloak.services.managers.AppAuthManager; import org.keycloak.services.managers.Auth; import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.util.CookieHelper; -import org.keycloak.util.UriUtils; +import org.keycloak.common.util.UriUtils; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/services/src/main/java/org/keycloak/services/resources/AccountService.java b/services/src/main/java/org/keycloak/services/resources/AccountService.java index f130e50688..dc5fa8d9b6 100755 --- a/services/src/main/java/org/keycloak/services/resources/AccountService.java +++ b/services/src/main/java/org/keycloak/services/resources/AccountService.java @@ -60,7 +60,7 @@ import org.keycloak.services.managers.UserSessionManager; import org.keycloak.services.messages.Messages; import org.keycloak.services.util.ResolveRelative; import org.keycloak.services.validation.Validation; -import org.keycloak.util.UriUtils; +import org.keycloak.common.util.UriUtils; import javax.ws.rs.Consumes; import javax.ws.rs.GET; diff --git a/services/src/main/java/org/keycloak/services/resources/ClientsManagementService.java b/services/src/main/java/org/keycloak/services/resources/ClientsManagementService.java index 4e7d7de30c..ddb301df7c 100755 --- a/services/src/main/java/org/keycloak/services/resources/ClientsManagementService.java +++ b/services/src/main/java/org/keycloak/services/resources/ClientsManagementService.java @@ -4,7 +4,7 @@ import org.jboss.logging.Logger; import org.jboss.resteasy.spi.BadRequestException; import org.jboss.resteasy.spi.HttpRequest; import org.jboss.resteasy.spi.UnauthorizedException; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.OAuth2Constants; import org.keycloak.constants.AdapterConstants; import org.keycloak.events.Details; @@ -16,7 +16,7 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.protocol.oidc.utils.AuthorizeClientUtil; import org.keycloak.services.ForbiddenException; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import javax.ws.rs.HeaderParam; import javax.ws.rs.POST; diff --git a/services/src/main/java/org/keycloak/services/resources/Cors.java b/services/src/main/java/org/keycloak/services/resources/Cors.java index dc53a5b50c..09b3ea7ba0 100755 --- a/services/src/main/java/org/keycloak/services/resources/Cors.java +++ b/services/src/main/java/org/keycloak/services/resources/Cors.java @@ -5,7 +5,7 @@ import org.jboss.resteasy.spi.HttpRequest; import org.jboss.resteasy.spi.HttpResponse; import org.keycloak.models.ClientModel; import org.keycloak.representations.AccessToken; -import org.keycloak.util.CollectionUtil; +import org.keycloak.common.util.CollectionUtil; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.ResponseBuilder; diff --git a/services/src/main/java/org/keycloak/services/resources/IdentityBrokerService.java b/services/src/main/java/org/keycloak/services/resources/IdentityBrokerService.java index e6be392f3a..a171bdb376 100755 --- a/services/src/main/java/org/keycloak/services/resources/IdentityBrokerService.java +++ b/services/src/main/java/org/keycloak/services/resources/IdentityBrokerService.java @@ -20,7 +20,7 @@ package org.keycloak.services.resources; import org.jboss.logging.Logger; import org.jboss.resteasy.spi.HttpRequest; import org.jboss.resteasy.spi.ResteasyProviderFactory; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.authentication.AuthenticationProcessor; import org.keycloak.broker.provider.AuthenticationRequest; import org.keycloak.broker.provider.BrokeredIdentityContext; @@ -45,14 +45,12 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; -import org.keycloak.models.utils.DefaultAuthenticationFlows; import org.keycloak.models.utils.FormMessage; import org.keycloak.protocol.oidc.TokenManager; import org.keycloak.provider.ProviderFactory; import org.keycloak.representations.AccessToken; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.services.managers.AppAuthManager; -import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.managers.AuthenticationManager.AuthResult; import org.keycloak.services.managers.BruteForceProtector; import org.keycloak.services.managers.ClientSessionCode; @@ -62,7 +60,7 @@ import org.keycloak.services.ErrorPage; import org.keycloak.services.Urls; import org.keycloak.services.validation.Validation; import org.keycloak.social.SocialIdentityProvider; -import org.keycloak.util.ObjectUtil; +import org.keycloak.common.util.ObjectUtil; import javax.ws.rs.*; import javax.ws.rs.core.Context; diff --git a/services/src/main/java/org/keycloak/services/resources/JsResource.java b/services/src/main/java/org/keycloak/services/resources/JsResource.java index 1b0128805a..733c95ec22 100755 --- a/services/src/main/java/org/keycloak/services/resources/JsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/JsResource.java @@ -1,7 +1,7 @@ package org.keycloak.services.resources; import org.keycloak.Config; -import org.keycloak.Version; +import org.keycloak.common.Version; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java b/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java index 6ea2ecbdae..83b8d6e68e 100755 --- a/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java +++ b/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java @@ -26,7 +26,7 @@ import org.keycloak.services.util.JsonConfigProvider; import org.keycloak.services.util.ObjectMapperResolver; import org.keycloak.timer.TimerProvider; import org.keycloak.util.JsonSerialization; -import org.keycloak.util.SystemEnvProperties; +import org.keycloak.common.util.SystemEnvProperties; import javax.servlet.ServletContext; import javax.ws.rs.core.Application; diff --git a/services/src/main/java/org/keycloak/services/resources/LoginActionsService.java b/services/src/main/java/org/keycloak/services/resources/LoginActionsService.java index 6e525341ce..46bc55393e 100755 --- a/services/src/main/java/org/keycloak/services/resources/LoginActionsService.java +++ b/services/src/main/java/org/keycloak/services/resources/LoginActionsService.java @@ -23,7 +23,7 @@ package org.keycloak.services.resources; import org.jboss.logging.Logger; import org.jboss.resteasy.spi.HttpRequest; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.OAuth2Constants; import org.keycloak.authentication.AuthenticationProcessor; import org.keycloak.authentication.RequiredActionContext; @@ -31,8 +31,6 @@ import org.keycloak.authentication.RequiredActionContextResult; import org.keycloak.authentication.RequiredActionFactory; import org.keycloak.authentication.RequiredActionProvider; import org.keycloak.authentication.authenticators.browser.AbstractUsernameFormAuthenticator; -import org.keycloak.email.EmailException; -import org.keycloak.email.EmailProvider; import org.keycloak.events.Details; import org.keycloak.events.Errors; import org.keycloak.events.EventBuilder; @@ -43,32 +41,24 @@ import org.keycloak.models.ClientModel; import org.keycloak.models.ClientSessionModel; import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.ModelException; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.models.UserConsentModel; -import org.keycloak.models.UserCredentialModel; import org.keycloak.models.UserModel; import org.keycloak.models.UserModel.RequiredAction; import org.keycloak.models.UserSessionModel; -import org.keycloak.models.utils.CredentialValidation; import org.keycloak.models.utils.FormMessage; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.protocol.LoginProtocol; import org.keycloak.protocol.RestartLoginCookie; import org.keycloak.protocol.oidc.OIDCLoginProtocol; -import org.keycloak.protocol.oidc.TokenManager; -import org.keycloak.protocol.oidc.utils.RedirectUtils; import org.keycloak.services.ErrorPage; -import org.keycloak.services.ErrorResponse; import org.keycloak.services.Urls; import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.managers.ClientSessionCode; import org.keycloak.services.messages.Messages; import org.keycloak.services.util.CookieHelper; -import org.keycloak.services.validation.Validation; -import org.keycloak.util.Time; import javax.ws.rs.Consumes; import javax.ws.rs.GET; @@ -86,8 +76,6 @@ import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; import javax.ws.rs.ext.Providers; import java.net.URI; -import java.util.List; -import java.util.concurrent.TimeUnit; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/services/resources/RealmsResource.java b/services/src/main/java/org/keycloak/services/resources/RealmsResource.java index 73aaca64f7..f18f000fd2 100755 --- a/services/src/main/java/org/keycloak/services/resources/RealmsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/RealmsResource.java @@ -3,7 +3,7 @@ package org.keycloak.services.resources; import org.jboss.logging.Logger; import org.jboss.resteasy.spi.NotFoundException; import org.jboss.resteasy.spi.ResteasyProviderFactory; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.events.EventBuilder; import org.keycloak.models.ClientModel; import org.keycloak.models.Constants; diff --git a/services/src/main/java/org/keycloak/services/resources/ThemeResource.java b/services/src/main/java/org/keycloak/services/resources/ThemeResource.java index 5fe27a4117..62d5a15d1e 100755 --- a/services/src/main/java/org/keycloak/services/resources/ThemeResource.java +++ b/services/src/main/java/org/keycloak/services/resources/ThemeResource.java @@ -2,11 +2,11 @@ package org.keycloak.services.resources; import org.jboss.logging.Logger; import org.keycloak.Config; -import org.keycloak.Version; +import org.keycloak.common.Version; import org.keycloak.freemarker.Theme; import org.keycloak.freemarker.ThemeProvider; import org.keycloak.models.KeycloakSession; -import org.keycloak.util.MimeTypeUtil; +import org.keycloak.common.util.MimeTypeUtil; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/services/src/main/java/org/keycloak/services/resources/WelcomeResource.java b/services/src/main/java/org/keycloak/services/resources/WelcomeResource.java index 3feacf1f5d..7aa6b017bf 100755 --- a/services/src/main/java/org/keycloak/services/resources/WelcomeResource.java +++ b/services/src/main/java/org/keycloak/services/resources/WelcomeResource.java @@ -5,7 +5,7 @@ import org.keycloak.Config; import org.keycloak.freemarker.Theme; import org.keycloak.freemarker.ThemeProvider; import org.keycloak.models.KeycloakSession; -import org.keycloak.util.MimeTypeUtil; +import org.keycloak.common.util.MimeTypeUtil; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java b/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java index 2f845e0a8c..871bf05d6f 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java @@ -6,8 +6,8 @@ import org.jboss.resteasy.annotations.cache.NoCache; import org.jboss.resteasy.spi.HttpRequest; import org.jboss.resteasy.spi.HttpResponse; import org.jboss.resteasy.spi.NotFoundException; -import org.keycloak.ClientConnection; -import org.keycloak.Version; +import org.keycloak.common.ClientConnection; +import org.keycloak.common.Version; import org.keycloak.freemarker.BrowserSecurityHeaderSetup; import org.keycloak.freemarker.FreeMarkerException; import org.keycloak.freemarker.FreeMarkerUtil; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/AdminEventBuilder.java b/services/src/main/java/org/keycloak/services/resources/admin/AdminEventBuilder.java index bc2bcc1b8f..637218e102 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/AdminEventBuilder.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/AdminEventBuilder.java @@ -5,25 +5,18 @@ import java.util.LinkedList; import java.util.List; import org.jboss.logging.Logger; -import org.keycloak.ClientConnection; -import org.keycloak.broker.provider.IdentityProviderFactory; +import org.keycloak.common.ClientConnection; import org.keycloak.events.EventListenerProvider; import org.keycloak.events.EventStoreProvider; import org.keycloak.events.admin.AdminEvent; import org.keycloak.events.admin.AuthDetails; import org.keycloak.events.admin.OperationType; import org.keycloak.models.ClientModel; -import org.keycloak.models.IdentityProviderMapperModel; -import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; -import org.keycloak.models.RoleModel; -import org.keycloak.models.UserFederationProviderModel; import org.keycloak.models.UserModel; -import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.util.JsonSerialization; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import javax.ws.rs.core.UriInfo; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/AdminRoot.java b/services/src/main/java/org/keycloak/services/resources/admin/AdminRoot.java index 834d957324..a7bead8ba5 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/AdminRoot.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/AdminRoot.java @@ -7,7 +7,7 @@ import org.jboss.resteasy.spi.NoLogWebApplicationException; import org.jboss.resteasy.spi.NotFoundException; import org.jboss.resteasy.spi.ResteasyProviderFactory; import org.jboss.resteasy.spi.UnauthorizedException; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.jose.jws.JWSInput; import org.keycloak.models.AdminRoles; import org.keycloak.models.ClientModel; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/AttackDetectionResource.java b/services/src/main/java/org/keycloak/services/resources/admin/AttackDetectionResource.java index 26b9956f56..3cdf9880a3 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/AttackDetectionResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/AttackDetectionResource.java @@ -2,7 +2,7 @@ package org.keycloak.services.resources.admin; import org.jboss.logging.Logger; import org.jboss.resteasy.annotations.cache.NoCache; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.events.admin.OperationType; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientAttributeCertificateResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientAttributeCertificateResource.java index c6a5feae93..6164a47be7 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientAttributeCertificateResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientAttributeCertificateResource.java @@ -12,7 +12,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.representations.idm.CertificateRepresentation; import org.keycloak.services.ErrorResponseException; -import org.keycloak.util.PemUtils; +import org.keycloak.common.util.PemUtils; import javax.ws.rs.Consumes; import javax.ws.rs.GET; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientResource.java index 0c90af9371..5d76778196 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientResource.java @@ -28,7 +28,7 @@ import org.keycloak.services.managers.ResourceAdminManager; import org.keycloak.services.resources.KeycloakApplication; import org.keycloak.services.ErrorResponse; import org.keycloak.util.JsonSerialization; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java index bd11684e30..5dd46d0056 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java @@ -5,7 +5,7 @@ import org.jboss.resteasy.annotations.cache.NoCache; import org.jboss.resteasy.spi.BadRequestException; import org.jboss.resteasy.spi.NotFoundException; import org.jboss.resteasy.spi.ResteasyProviderFactory; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.events.Event; import org.keycloak.events.EventQuery; import org.keycloak.events.EventStoreProvider; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java index 18e6df5bd0..1656fab855 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java @@ -2,11 +2,9 @@ package org.keycloak.services.resources.admin; import org.jboss.logging.Logger; import org.jboss.resteasy.annotations.cache.NoCache; -import org.jboss.resteasy.plugins.providers.multipart.InputPart; -import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; import org.jboss.resteasy.spi.NotFoundException; import org.jboss.resteasy.spi.ResteasyProviderFactory; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.models.AdminRoles; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; @@ -20,7 +18,6 @@ import org.keycloak.services.ForbiddenException; import org.keycloak.services.managers.RealmManager; import org.keycloak.services.resources.KeycloakApplication; import org.keycloak.services.ErrorResponse; -import org.keycloak.util.JsonSerialization; import javax.ws.rs.Consumes; import javax.ws.rs.GET; @@ -35,11 +32,9 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import java.io.IOException; import java.net.URI; import java.util.ArrayList; import java.util.List; -import java.util.Map; /** * Top level resource for Admin REST API diff --git a/services/src/main/java/org/keycloak/services/resources/admin/UserFederationProvidersResource.java b/services/src/main/java/org/keycloak/services/resources/admin/UserFederationProvidersResource.java index 8946c36e72..e0cbe730b4 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/UserFederationProvidersResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/UserFederationProvidersResource.java @@ -4,7 +4,7 @@ import org.jboss.logging.Logger; import org.jboss.resteasy.annotations.cache.NoCache; import org.jboss.resteasy.spi.NotFoundException; import org.jboss.resteasy.spi.ResteasyProviderFactory; -import org.keycloak.constants.KerberosConstants; +import org.keycloak.common.constants.KerberosConstants; import org.keycloak.events.admin.OperationType; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java b/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java index bd441d1d7b..5e3106781d 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java @@ -4,7 +4,7 @@ import org.jboss.logging.Logger; import org.jboss.resteasy.annotations.cache.NoCache; import org.jboss.resteasy.spi.BadRequestException; import org.jboss.resteasy.spi.NotFoundException; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.authentication.RequiredActionProvider; import org.keycloak.email.EmailException; import org.keycloak.email.EmailProvider; @@ -66,7 +66,6 @@ import javax.ws.rs.WebApplicationException; import java.net.URI; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -79,7 +78,7 @@ import org.keycloak.models.UsernameLoginFailureModel; import org.keycloak.services.managers.BruteForceProtector; import org.keycloak.services.managers.UserSessionManager; import org.keycloak.services.resources.AccountService; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; /** * Base resource for managing users diff --git a/services/src/main/java/org/keycloak/services/resources/admin/info/SystemInfoRepresentation.java b/services/src/main/java/org/keycloak/services/resources/admin/info/SystemInfoRepresentation.java index e34edc9eea..620e25eee0 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/info/SystemInfoRepresentation.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/info/SystemInfoRepresentation.java @@ -1,6 +1,6 @@ package org.keycloak.services.resources.admin.info; -import org.keycloak.Version; +import org.keycloak.common.Version; import org.keycloak.models.KeycloakSession; import java.util.Date; diff --git a/services/src/main/java/org/keycloak/services/util/CookieHelper.java b/services/src/main/java/org/keycloak/services/util/CookieHelper.java index 04fcb1deca..833189eedc 100755 --- a/services/src/main/java/org/keycloak/services/util/CookieHelper.java +++ b/services/src/main/java/org/keycloak/services/util/CookieHelper.java @@ -2,7 +2,7 @@ package org.keycloak.services.util; import org.jboss.resteasy.spi.HttpResponse; import org.jboss.resteasy.spi.ResteasyProviderFactory; -import org.keycloak.util.ServerCookie; +import org.keycloak.common.util.ServerCookie; import javax.ws.rs.core.HttpHeaders; diff --git a/services/src/main/java/org/keycloak/services/util/HttpClientBuilder.java b/services/src/main/java/org/keycloak/services/util/HttpClientBuilder.java index 23b874e724..5daab3d045 100755 --- a/services/src/main/java/org/keycloak/services/util/HttpClientBuilder.java +++ b/services/src/main/java/org/keycloak/services/util/HttpClientBuilder.java @@ -16,8 +16,8 @@ import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; import org.apache.http.params.BasicHttpParams; import org.apache.http.params.HttpConnectionParams; import org.keycloak.representations.adapters.config.AdapterConfig; -import org.keycloak.util.EnvUtil; -import org.keycloak.util.KeystoreUtil; +import org.keycloak.common.util.EnvUtil; +import org.keycloak.common.util.KeystoreUtil; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; diff --git a/services/src/main/java/org/keycloak/services/util/JsonConfigProvider.java b/services/src/main/java/org/keycloak/services/util/JsonConfigProvider.java index 6d1b8271e5..f54d238550 100755 --- a/services/src/main/java/org/keycloak/services/util/JsonConfigProvider.java +++ b/services/src/main/java/org/keycloak/services/util/JsonConfigProvider.java @@ -2,7 +2,7 @@ package org.keycloak.services.util; import org.codehaus.jackson.JsonNode; import org.keycloak.Config; -import org.keycloak.util.StringPropertyReplacer; +import org.keycloak.common.util.StringPropertyReplacer; import java.util.Properties; diff --git a/services/src/main/java/org/keycloak/services/util/LocaleHelper.java b/services/src/main/java/org/keycloak/services/util/LocaleHelper.java index 1f523d7132..0a15bf1e8a 100644 --- a/services/src/main/java/org/keycloak/services/util/LocaleHelper.java +++ b/services/src/main/java/org/keycloak/services/util/LocaleHelper.java @@ -18,12 +18,11 @@ package org.keycloak.services.util; import org.jboss.resteasy.spi.HttpResponse; import org.jboss.resteasy.spi.ResteasyProviderFactory; -import org.keycloak.models.ClientSessionModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.services.managers.AuthenticationManager; -import org.keycloak.util.ServerCookie; +import org.keycloak.common.util.ServerCookie; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.UriInfo; diff --git a/services/src/test/java/org/keycloak/test/RealmKeyGenerator.java b/services/src/test/java/org/keycloak/test/RealmKeyGenerator.java index c23889541f..65fa6bbfd9 100755 --- a/services/src/test/java/org/keycloak/test/RealmKeyGenerator.java +++ b/services/src/test/java/org/keycloak/test/RealmKeyGenerator.java @@ -2,7 +2,7 @@ package org.keycloak.test; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.openssl.PEMWriter; -import org.keycloak.util.PemUtils; +import org.keycloak.common.util.PemUtils; import java.io.IOException; import java.io.StringWriter; diff --git a/social/twitter/src/main/java/org/keycloak/social/twitter/TwitterIdentityProvider.java b/social/twitter/src/main/java/org/keycloak/social/twitter/TwitterIdentityProvider.java index d662141681..5a4b47fa3b 100755 --- a/social/twitter/src/main/java/org/keycloak/social/twitter/TwitterIdentityProvider.java +++ b/social/twitter/src/main/java/org/keycloak/social/twitter/TwitterIdentityProvider.java @@ -22,7 +22,7 @@ package org.keycloak.social.twitter; import org.jboss.logging.Logger; -import org.keycloak.ClientConnection; +import org.keycloak.common.ClientConnection; import org.keycloak.broker.oidc.OAuth2IdentityProviderConfig; import org.keycloak.broker.provider.AbstractIdentityProvider; import org.keycloak.broker.provider.AuthenticationRequest; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/servlet/MultiTenantResolver.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/servlet/MultiTenantResolver.java index 765e291467..6e16f5bfbe 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/servlet/MultiTenantResolver.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/servlet/MultiTenantResolver.java @@ -17,10 +17,10 @@ package org.keycloak.testsuite.adapter.servlet; import java.io.InputStream; -import org.keycloak.adapters.HttpFacade; import org.keycloak.adapters.KeycloakConfigResolver; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.KeycloakDeploymentBuilder; +import org.keycloak.adapters.spi.HttpFacade; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/LDAPTestConfiguration.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/LDAPTestConfiguration.java index 9d1d19ef53..06c8f5ca47 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/LDAPTestConfiguration.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/LDAPTestConfiguration.java @@ -1,7 +1,7 @@ package org.keycloak.testsuite.util; import org.jboss.logging.Logger; -import org.keycloak.constants.KerberosConstants; +import org.keycloak.common.constants.KerberosConstants; import org.keycloak.models.LDAPConstants; import org.keycloak.models.UserFederationProvider; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractDemoServletsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractDemoServletsAdapterTest.java index b423c68202..9fb8165e3c 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractDemoServletsAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractDemoServletsAdapterTest.java @@ -1,5 +1,7 @@ package org.keycloak.testsuite.adapter.servlet; +import org.keycloak.common.Version; +import org.keycloak.common.util.Time; import org.keycloak.representations.VersionRepresentation; import org.keycloak.testsuite.adapter.AbstractServletsAdapterTest; import java.net.URI; @@ -23,7 +25,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import org.junit.Test; import org.keycloak.OAuth2Constants; -import org.keycloak.Version; import org.keycloak.constants.AdapterConstants; import org.keycloak.protocol.oidc.OIDCLoginProtocolService; import org.keycloak.representations.idm.RealmRepresentation; @@ -37,7 +38,6 @@ import org.keycloak.testsuite.arquillian.jira.Jira; import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlEquals; import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWithLoginUrlOf; import org.keycloak.util.BasicAuthHelper; -import org.keycloak.util.Time; /** * diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/AssertEvents.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/AssertEvents.java index cda71acf6f..74c70ea782 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/AssertEvents.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/AssertEvents.java @@ -9,7 +9,7 @@ import org.junit.rules.TestRule; import org.junit.runners.model.Statement; import org.keycloak.Config; import org.keycloak.authentication.authenticators.client.ClientIdAndSecretAuthenticator; -import org.keycloak.constants.ServiceAccountConstants; +import org.keycloak.common.constants.ServiceAccountConstants; import org.keycloak.events.admin.AdminEvent; import org.keycloak.events.Details; import org.keycloak.events.Event; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/InfinispanCLI.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/InfinispanCLI.java index 0eabbe1ea2..0527c613c1 100644 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/InfinispanCLI.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/InfinispanCLI.java @@ -25,7 +25,7 @@ import org.keycloak.models.session.UserSessionPersisterProvider; import org.keycloak.models.sessions.infinispan.entities.SessionEntity; import org.keycloak.models.sessions.infinispan.entities.UserSessionEntity; import org.keycloak.models.utils.KeycloakModelUtils; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; /** * HOWTO USE THIS: diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/OAuthClient.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/OAuthClient.java index 2a08ca12a6..493b74e822 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/OAuthClient.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/OAuthClient.java @@ -34,7 +34,7 @@ import org.json.JSONObject; import org.junit.Assert; import org.keycloak.OAuth2Constants; import org.keycloak.RSATokenVerifier; -import org.keycloak.VerificationException; +import org.keycloak.common.VerificationException; import org.keycloak.constants.AdapterConstants; import org.keycloak.jose.jws.JWSInput; import org.keycloak.jose.jws.crypto.RSAProvider; @@ -42,7 +42,7 @@ import org.keycloak.protocol.oidc.OIDCLoginProtocolService; import org.keycloak.representations.AccessToken; import org.keycloak.representations.RefreshToken; import org.keycloak.util.BasicAuthHelper; -import org.keycloak.util.PemUtils; +import org.keycloak.common.util.PemUtils; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/AdapterTestStrategy.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/AdapterTestStrategy.java index d5f90728a2..816be92945 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/AdapterTestStrategy.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/AdapterTestStrategy.java @@ -24,7 +24,7 @@ package org.keycloak.testsuite.adapter; import org.junit.Assert; import org.junit.rules.ExternalResource; import org.keycloak.OAuth2Constants; -import org.keycloak.Version; +import org.keycloak.common.Version; import org.keycloak.representations.VersionRepresentation; import org.keycloak.admin.client.Keycloak; import org.keycloak.constants.AdapterConstants; @@ -47,7 +47,7 @@ import org.keycloak.testsuite.rule.WebResource; import org.keycloak.testsuite.rule.WebRule; import org.keycloak.testsuite.KeycloakServer; import org.keycloak.util.BasicAuthHelper; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import org.openqa.selenium.WebDriver; import javax.ws.rs.client.Client; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/CookieTokenStoreAdapterTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/CookieTokenStoreAdapterTest.java index 243a62651d..07419c21fd 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/CookieTokenStoreAdapterTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/CookieTokenStoreAdapterTest.java @@ -20,7 +20,7 @@ import org.keycloak.testsuite.rule.AbstractKeycloakRule; import org.keycloak.testsuite.rule.WebResource; import org.keycloak.testsuite.rule.WebRule; import org.keycloak.testsuite.KeycloakServer; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import org.openqa.selenium.Cookie; import org.openqa.selenium.WebDriver; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/MultiTenantResolver.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/MultiTenantResolver.java index 1acf95da7d..4e5837b4ba 100644 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/MultiTenantResolver.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/MultiTenantResolver.java @@ -17,7 +17,7 @@ package org.keycloak.testsuite.adapter; import java.io.InputStream; -import org.keycloak.adapters.HttpFacade; +import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.adapters.KeycloakConfigResolver; import org.keycloak.adapters.KeycloakDeployment; import org.keycloak.adapters.KeycloakDeploymentBuilder; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/admin/AdminAPITest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/admin/AdminAPITest.java index deda8f89b4..9e51065150 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/admin/AdminAPITest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/admin/AdminAPITest.java @@ -25,7 +25,7 @@ import org.junit.Assert; import org.junit.ClassRule; import org.junit.Test; import org.keycloak.Config; -import org.keycloak.Version; +import org.keycloak.common.Version; import org.keycloak.models.ClientModel; import org.keycloak.models.ClientSessionModel; import org.keycloak.models.Constants; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/composites/CompositeRoleTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/composites/CompositeRoleTest.java index 7178f1de10..d7e3b46dd9 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/composites/CompositeRoleTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/composites/CompositeRoleTest.java @@ -26,7 +26,7 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.keycloak.OAuth2Constants; -import org.keycloak.enums.SslRequired; +import org.keycloak.common.enums.SslRequired; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/AbstractKerberosTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/AbstractKerberosTest.java index 294fdb5060..ac858ddb16 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/AbstractKerberosTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/AbstractKerberosTest.java @@ -21,7 +21,7 @@ import org.keycloak.adapters.HttpClientBuilder; import org.keycloak.authentication.authenticators.browser.SpnegoAuthenticator; import org.keycloak.events.Details; import org.keycloak.federation.kerberos.CommonKerberosConfig; -import org.keycloak.constants.KerberosConstants; +import org.keycloak.common.constants.KerberosConstants; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.LDAPConstants; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/KerberosCredDelegServlet.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/KerberosCredDelegServlet.java index 22baba480d..0d16f69514 100644 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/KerberosCredDelegServlet.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/KerberosCredDelegServlet.java @@ -17,8 +17,8 @@ import javax.servlet.http.HttpServletResponse; import org.ietf.jgss.GSSCredential; import org.keycloak.KeycloakPrincipal; -import org.keycloak.constants.KerberosConstants; -import org.keycloak.util.KerberosSerializationUtils; +import org.keycloak.common.constants.KerberosConstants; +import org.keycloak.common.util.KerberosSerializationUtils; /** * @author Marek Posolda diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/KerberosStandaloneTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/KerberosStandaloneTest.java index 6e591c6847..b12045007a 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/KerberosStandaloneTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/KerberosStandaloneTest.java @@ -14,7 +14,7 @@ import org.junit.rules.TestRule; import org.keycloak.federation.kerberos.CommonKerberosConfig; import org.keycloak.federation.kerberos.KerberosConfig; import org.keycloak.federation.kerberos.KerberosFederationProviderFactory; -import org.keycloak.constants.KerberosConstants; +import org.keycloak.common.constants.KerberosConstants; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserFederationProviderModel; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/LDAPTestConfiguration.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/LDAPTestConfiguration.java index 6e433f2197..c3e3542885 100644 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/LDAPTestConfiguration.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/LDAPTestConfiguration.java @@ -8,7 +8,7 @@ import java.util.Map; import java.util.Properties; import org.jboss.logging.Logger; -import org.keycloak.constants.KerberosConstants; +import org.keycloak.common.constants.KerberosConstants; import org.keycloak.models.LDAPConstants; import org.keycloak.models.UserFederationProvider; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/SyncProvidersTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/SyncProvidersTest.java index 819ee41712..f4a7c6f1d8 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/SyncProvidersTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/federation/SyncProvidersTest.java @@ -7,11 +7,9 @@ import org.junit.Test; import org.junit.rules.RuleChain; import org.junit.rules.TestRule; import org.junit.runners.MethodSorters; -import org.keycloak.federation.ldap.LDAPConfig; import org.keycloak.federation.ldap.LDAPFederationProvider; import org.keycloak.federation.ldap.LDAPFederationProviderFactory; import org.keycloak.federation.ldap.idm.model.LDAPObject; -import org.keycloak.federation.ldap.mappers.UserAttributeLDAPFederationMapper; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.LDAPConstants; @@ -25,12 +23,11 @@ import org.keycloak.models.UserProvider; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.services.managers.RealmManager; import org.keycloak.services.managers.UsersSyncManager; -import org.keycloak.testsuite.rule.AbstractKeycloakRule; import org.keycloak.testsuite.rule.KeycloakRule; import org.keycloak.testsuite.rule.LDAPRule; import org.keycloak.testsuite.DummyUserFederationProviderFactory; import org.keycloak.timer.TimerProvider; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import java.util.HashMap; import java.util.Map; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/CustomFlowTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/CustomFlowTest.java index 418a3d6997..f7045539c6 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/CustomFlowTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/CustomFlowTest.java @@ -27,22 +27,15 @@ import org.junit.Rule; import org.junit.Test; import org.keycloak.OAuth2Constants; import org.keycloak.authentication.AuthenticationFlow; -import org.keycloak.authentication.authenticators.client.ClientIdAndSecretAuthenticator; import org.keycloak.events.Details; import org.keycloak.events.Errors; -import org.keycloak.events.Event; -import org.keycloak.events.EventType; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticationFlowModel; -import org.keycloak.models.BrowserSecurityHeaders; import org.keycloak.models.ClientModel; -import org.keycloak.models.PasswordPolicy; import org.keycloak.models.RealmModel; -import org.keycloak.models.UserCredentialModel; import org.keycloak.models.UserModel; import org.keycloak.representations.AccessToken; import org.keycloak.representations.RefreshToken; -import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.services.managers.ClientManager; import org.keycloak.services.managers.RealmManager; import org.keycloak.testsuite.AssertEvents; @@ -56,15 +49,8 @@ import org.keycloak.testsuite.pages.RegisterPage; import org.keycloak.testsuite.rule.KeycloakRule; import org.keycloak.testsuite.rule.WebResource; import org.keycloak.testsuite.rule.WebRule; -import org.keycloak.util.Time; import org.openqa.selenium.WebDriver; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.core.Response; -import java.util.Map; - -import static org.junit.Assert.*; import static org.junit.Assert.assertEquals; /** diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/LoginTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/LoginTest.java index de7fff48b4..950c182a3f 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/LoginTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/LoginTest.java @@ -46,7 +46,7 @@ import org.keycloak.testsuite.pages.LoginPasswordUpdatePage; import org.keycloak.testsuite.rule.KeycloakRule; import org.keycloak.testsuite.rule.WebResource; import org.keycloak.testsuite.rule.WebRule; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import org.openqa.selenium.WebDriver; import javax.ws.rs.client.Client; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java index ab47f49734..1acd654740 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java @@ -46,12 +46,11 @@ import org.keycloak.testsuite.pages.InfoPage; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.LoginPasswordResetPage; import org.keycloak.testsuite.pages.LoginPasswordUpdatePage; -import org.keycloak.testsuite.pages.ValidatePassworrdEmailResetPage; import org.keycloak.testsuite.rule.GreenMailRule; import org.keycloak.testsuite.rule.KeycloakRule; import org.keycloak.testsuite.rule.WebResource; import org.keycloak.testsuite.rule.WebRule; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import org.openqa.selenium.WebDriver; import javax.mail.MessagingException; @@ -60,8 +59,6 @@ import javax.mail.internet.MimeMessage; import java.io.IOException; import java.util.Collections; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import static org.junit.Assert.*; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsBasicAuthTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsBasicAuthTest.java index 19105bcf6c..9f04201803 100644 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsBasicAuthTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsBasicAuthTest.java @@ -19,6 +19,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExternalResource; import org.keycloak.adapters.HttpClientBuilder; +import org.keycloak.common.util.Base64; import org.keycloak.models.ClientModel; import org.keycloak.models.RealmModel; import org.keycloak.services.managers.ClientManager; @@ -138,6 +139,6 @@ public class JaxrsBasicAuthTest { private String encodeCredentials(String username, String password) { String text=username+":"+password; - return (org.keycloak.util.Base64.encodeBytes(text.getBytes())); + return (Base64.encodeBytes(text.getBytes())); } } diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsFilterTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsFilterTest.java index 5d597351e2..3f7959b95e 100644 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsFilterTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsFilterTest.java @@ -35,7 +35,7 @@ import org.keycloak.testsuite.OAuthClient; import org.keycloak.testsuite.rule.KeycloakRule; import org.keycloak.testsuite.rule.WebResource; import org.keycloak.testsuite.rule.WebRule; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import org.openqa.selenium.WebDriver; /** diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/ImportTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/model/ImportTest.java index 5d7eae7ef7..bbc840ec86 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/ImportTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/model/ImportTest.java @@ -4,7 +4,7 @@ import org.junit.Assert; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runners.MethodSorters; -import org.keycloak.constants.KerberosConstants; +import org.keycloak.common.constants.KerberosConstants; import org.keycloak.federation.ldap.mappers.FullNameLDAPFederationMapper; import org.keycloak.federation.ldap.mappers.FullNameLDAPFederationMapperFactory; import org.keycloak.models.AuthenticationFlowModel; @@ -14,8 +14,6 @@ import org.keycloak.models.FederatedIdentityModel; import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.LDAPConstants; -import org.keycloak.models.session.PersistentClientSessionModel; -import org.keycloak.models.session.PersistentUserSessionModel; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RequiredCredentialModel; @@ -33,7 +31,6 @@ import org.keycloak.protocol.oidc.mappers.UserSessionNoteMapper; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.services.managers.RealmManager; -import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/ModelTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/model/ModelTest.java index d4418b1a71..cb969de25a 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/ModelTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/model/ModelTest.java @@ -2,7 +2,7 @@ package org.keycloak.testsuite.model; import org.junit.Assert; import org.junit.Test; -import org.keycloak.enums.SslRequired; +import org.keycloak.common.enums.SslRequired; import org.keycloak.models.PasswordPolicy; import org.keycloak.models.RealmModel; import org.keycloak.models.utils.KeycloakModelUtils; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionInitializerTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionInitializerTest.java index 6508cfb88d..46487dbf6c 100644 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionInitializerTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionInitializerTest.java @@ -22,7 +22,7 @@ import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.services.managers.UserManager; import org.keycloak.services.managers.UserSessionManager; import org.keycloak.testsuite.rule.KeycloakRule; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; /** * @author Marek Posolda diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionPersisterProviderTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionPersisterProviderTest.java index 4edf9516b5..8a6fc9dcb0 100644 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionPersisterProviderTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionPersisterProviderTest.java @@ -2,7 +2,6 @@ package org.keycloak.testsuite.model; import java.util.ArrayList; import java.util.HashSet; -import java.util.LinkedList; import java.util.List; import java.util.Set; @@ -23,7 +22,7 @@ import org.keycloak.services.managers.ClientManager; import org.keycloak.services.managers.RealmManager; import org.keycloak.services.managers.UserManager; import org.keycloak.testsuite.rule.KeycloakRule; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; /** * @author Marek Posolda diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionProviderOfflineTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionProviderOfflineTest.java index dc15b44574..0d12caf21c 100644 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionProviderOfflineTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionProviderOfflineTest.java @@ -25,7 +25,7 @@ import org.keycloak.services.managers.RealmManager; import org.keycloak.services.managers.UserManager; import org.keycloak.services.managers.UserSessionManager; import org.keycloak.testsuite.rule.KeycloakRule; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; /** * @author Marek Posolda diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java index 0b099dede4..88e7597ddc 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java @@ -15,7 +15,7 @@ import org.keycloak.models.UsernameLoginFailureModel; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.services.managers.UserManager; import org.keycloak.testsuite.rule.KeycloakRule; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import java.util.Arrays; import java.util.HashSet; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/AccessTokenTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/AccessTokenTest.java index 86a1c25a9e..e191871615 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/AccessTokenTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/AccessTokenTest.java @@ -32,9 +32,8 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.keycloak.OAuth2Constants; -import org.keycloak.VerificationException; -import org.keycloak.constants.AdapterConstants; -import org.keycloak.enums.SslRequired; +import org.keycloak.common.VerificationException; +import org.keycloak.common.enums.SslRequired; import org.keycloak.events.Details; import org.keycloak.events.Errors; import org.keycloak.events.Event; @@ -63,7 +62,7 @@ import org.keycloak.testsuite.rule.KeycloakRule; import org.keycloak.testsuite.rule.WebResource; import org.keycloak.testsuite.rule.WebRule; import org.keycloak.util.BasicAuthHelper; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import org.openqa.selenium.WebDriver; import javax.ws.rs.client.Client; @@ -76,7 +75,6 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; import java.io.IOException; -import java.io.UnsupportedEncodingException; import java.net.URI; import java.util.Arrays; import java.util.HashMap; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSignedJWTTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSignedJWTTest.java index 2ce5f01053..537a297c34 100644 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSignedJWTTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSignedJWTTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.keycloak.OAuth2Constants; import org.keycloak.adapters.authentication.JWTClientCredentialsProvider; import org.keycloak.authentication.authenticators.client.JWTClientAuthenticator; -import org.keycloak.constants.ServiceAccountConstants; +import org.keycloak.common.constants.ServiceAccountConstants; import org.keycloak.constants.ServiceUrlConstants; import org.keycloak.events.Details; import org.keycloak.events.Errors; @@ -37,10 +37,10 @@ import org.keycloak.testsuite.OAuthClient; import org.keycloak.testsuite.rule.KeycloakRule; import org.keycloak.testsuite.rule.WebResource; import org.keycloak.testsuite.rule.WebRule; -import org.keycloak.util.KeycloakUriBuilder; -import org.keycloak.util.KeystoreUtil; -import org.keycloak.util.Time; -import org.keycloak.util.UriUtils; +import org.keycloak.common.util.KeycloakUriBuilder; +import org.keycloak.common.util.KeystoreUtil; +import org.keycloak.common.util.Time; +import org.keycloak.common.util.UriUtils; import org.openqa.selenium.WebDriver; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/OAuthGrantTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/OAuthGrantTest.java index 059cdd7286..9c17b59e47 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/OAuthGrantTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/OAuthGrantTest.java @@ -26,7 +26,7 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.keycloak.OAuth2Constants; -import org.keycloak.constants.KerberosConstants; +import org.keycloak.common.constants.KerberosConstants; import org.keycloak.events.Details; import org.keycloak.events.Event; import org.keycloak.events.EventType; @@ -34,10 +34,8 @@ import org.keycloak.models.ClientModel; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; -import org.keycloak.models.UserConsentModel; import org.keycloak.models.UserModel; import org.keycloak.protocol.oidc.OIDCLoginProtocol; -import org.keycloak.protocol.oidc.OIDCLoginProtocolFactory; import org.keycloak.protocol.oidc.mappers.UserSessionNoteMapper; import org.keycloak.representations.AccessToken; import org.keycloak.services.managers.RealmManager; @@ -53,7 +51,6 @@ import org.keycloak.testsuite.rule.WebRule; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; -import java.io.IOException; import java.util.Map; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/OfflineTokenTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/OfflineTokenTest.java index 4a86fec596..219fa4f325 100644 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/OfflineTokenTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/OfflineTokenTest.java @@ -19,7 +19,7 @@ import org.junit.Test; import org.keycloak.KeycloakSecurityContext; import org.keycloak.OAuth2Constants; import org.keycloak.adapters.RefreshableKeycloakSecurityContext; -import org.keycloak.constants.ServiceAccountConstants; +import org.keycloak.common.constants.ServiceAccountConstants; import org.keycloak.events.Details; import org.keycloak.events.Errors; import org.keycloak.events.Event; @@ -45,8 +45,8 @@ import org.keycloak.testsuite.rule.WebResource; import org.keycloak.testsuite.rule.WebRule; import org.keycloak.util.JsonSerialization; import org.keycloak.util.TokenUtil; -import org.keycloak.util.Time; -import org.keycloak.util.UriUtils; +import org.keycloak.common.util.Time; +import org.keycloak.common.util.UriUtils; import org.openqa.selenium.WebDriver; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/RefreshTokenTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/RefreshTokenTest.java index 742f5d6703..15f7f9305c 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/RefreshTokenTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/RefreshTokenTest.java @@ -26,11 +26,10 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.keycloak.OAuth2Constants; -import org.keycloak.enums.SslRequired; +import org.keycloak.common.enums.SslRequired; import org.keycloak.events.Details; import org.keycloak.events.Errors; import org.keycloak.events.Event; -import org.keycloak.events.EventType; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserSessionModel; @@ -47,7 +46,7 @@ import org.keycloak.testsuite.rule.KeycloakRule; import org.keycloak.testsuite.rule.WebResource; import org.keycloak.testsuite.rule.WebRule; import org.keycloak.util.BasicAuthHelper; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import org.openqa.selenium.WebDriver; import javax.ws.rs.client.Client; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/ResourceOwnerPasswordCredentialsGrantTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/ResourceOwnerPasswordCredentialsGrantTest.java index c07766d227..74e3d38261 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/ResourceOwnerPasswordCredentialsGrantTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/ResourceOwnerPasswordCredentialsGrantTest.java @@ -1,9 +1,7 @@ package org.keycloak.testsuite.oauth; import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.DefaultHttpClient; import org.junit.ClassRule; import org.junit.Rule; @@ -21,7 +19,7 @@ import org.keycloak.testsuite.OAuthClient; import org.keycloak.testsuite.rule.KeycloakRule; import org.keycloak.testsuite.rule.WebResource; import org.keycloak.testsuite.rule.WebRule; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import org.openqa.selenium.WebDriver; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/ServiceAccountTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/ServiceAccountTest.java index 5c5dc2652a..80e3349c8b 100644 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/ServiceAccountTest.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/ServiceAccountTest.java @@ -6,7 +6,7 @@ import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.keycloak.authentication.authenticators.client.ClientIdAndSecretAuthenticator; -import org.keycloak.constants.ServiceAccountConstants; +import org.keycloak.common.constants.ServiceAccountConstants; import org.keycloak.events.Details; import org.keycloak.events.Errors; import org.keycloak.models.ClientModel; diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/AbstractKeycloakRule.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/AbstractKeycloakRule.java index 8c673a0ad3..fc2dc4106d 100755 --- a/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/AbstractKeycloakRule.java +++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/rule/AbstractKeycloakRule.java @@ -12,7 +12,6 @@ import org.junit.rules.ExternalResource; import org.junit.rules.TemporaryFolder; import org.keycloak.Config; import org.keycloak.adapters.KeycloakConfigResolver; -import org.keycloak.adapters.saml.servlet.SamlFilter; import org.keycloak.adapters.servlet.KeycloakOIDCFilter; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakTransaction; @@ -25,7 +24,7 @@ import org.keycloak.services.managers.RealmManager; import org.keycloak.testsuite.Retry; import org.keycloak.testsuite.KeycloakServer; import org.keycloak.util.JsonSerialization; -import org.keycloak.util.Time; +import org.keycloak.common.util.Time; import javax.servlet.DispatcherType; import javax.servlet.Servlet; diff --git a/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/KerberosEmbeddedServer.java b/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/KerberosEmbeddedServer.java index a997ee0f2e..edda7fd2d9 100644 --- a/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/KerberosEmbeddedServer.java +++ b/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/KerberosEmbeddedServer.java @@ -30,7 +30,7 @@ import org.ietf.jgss.GSSException; import org.ietf.jgss.GSSManager; import org.ietf.jgss.GSSName; import org.jboss.logging.Logger; -import org.keycloak.util.KerberosSerializationUtils; +import org.keycloak.common.util.KerberosSerializationUtils; import sun.security.jgss.GSSNameImpl; import sun.security.jgss.krb5.Krb5NameElement; diff --git a/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/LDAPEmbeddedServer.java b/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/LDAPEmbeddedServer.java index 18a1a30ed0..4abe94dd1e 100644 --- a/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/LDAPEmbeddedServer.java +++ b/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/LDAPEmbeddedServer.java @@ -22,8 +22,8 @@ import org.apache.directory.server.ldap.LdapServer; import org.apache.directory.server.protocol.shared.transport.TcpTransport; import org.apache.directory.server.protocol.shared.transport.Transport; import org.jboss.logging.Logger; -import org.keycloak.util.FindFile; -import org.keycloak.util.StreamUtil; +import org.keycloak.common.util.FindFile; +import org.keycloak.common.util.StreamUtil; /** * @author Marek Posolda